arnekeller/ripgrep-all
1
0
Fork 0
mirror of https://github.com/FliegendeWurst/ripgrep-all.git synced 2024-11-08 14:00:37 +00:00
Code Issues Projects Releases Wiki Activity

upgrade dependencies

Browse Source
This commit is contained in:
phiresky 2022-10-26 17:21:39 +02:00
parent 9e933ca760
commit 94f06fba37
5 changed files with 820 additions and 402 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1199
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

10
Cargo.toml
View File

@ -18,15 +18,15 @@ exclude = [
[dependencies] [dependencies]
tree_magic = { package = "tree_magic_mini", version = "3.0.0" } tree_magic = { package = "tree_magic_mini", version = "3.0.0" }
regex = "1.3.9" regex = "1.3.9"
rkv = "0.17.0" rkv = "0.17"
path-clean = "0.1.0" path-clean = "0.1.0"
bincode = "1.3.1" bincode = "1.3.1"
serde = { version = "1.0.115", features = ["derive"] } serde = { version = "1.0.115", features = ["derive"] }
zstd = "0.9.0" zstd = "0.11.2"
lazy_static = "1.4.0" lazy_static = "1.4.0"
serde_json = "1.0.57" serde_json = "1.0.57"
crossbeam = "0.8.1" crossbeam = "0.8.1"
clap = { version = "2.33.3", features = ["wrap_help"] } clap = { version = "4.0.18", features = ["wrap_help"] }
log = "0.4.11" log = "0.4.11"
env_logger = "0.9.0" env_logger = "0.9.0"
xz2 = "0.1.6" xz2 = "0.1.6"
@ -36,7 +36,7 @@ tar = "0.4.30"
chrono = "0.4.15" chrono = "0.4.15"
encoding_rs = "0.8.24" encoding_rs = "0.8.24"
encoding_rs_io = "0.1.7" encoding_rs_io = "0.1.7"
rusqlite = { version = "0.25.3", features = ["vtab", "bundled"] } rusqlite = { version = "0.28.0", features = ["vtab", "bundled"] }
size_format = "1.0.2" size_format = "1.0.2"
structopt = "0.3.17" structopt = "0.3.17"
paste = "1.0.0" paste = "1.0.0"
@ -51,7 +51,7 @@ memchr = "2.3.3"
crossbeam-channel = "0.5.1" crossbeam-channel = "0.5.1"
dyn-clone = "1.0.2" dyn-clone = "1.0.2"
dyn-clonable = "0.9.0" dyn-clonable = "0.9.0"
zip = "0.5.8" zip = "0.6.3"
owning_ref = "0.4.1" owning_ref = "0.4.1"
[dev-dependencies] [dev-dependencies]

4
src/adapters/spawning.rs
View File

@ -2,7 +2,7 @@
use crate::adapted_iter::SingleAdaptedFileAsIter; use crate::adapted_iter::SingleAdaptedFileAsIter;
use super::*; use super::*;
use anyhow::*; use anyhow::Result;
use log::*; use log::*;
use std::process::Command; use std::process::Command;
@ -56,7 +56,7 @@ impl Read for ProcWaitReader {
fn read(&mut self, _buf: &mut [u8]) -> std::io::Result<usize> { fn read(&mut self, _buf: &mut [u8]) -> std::io::Result<usize> {
let status = self.proce.wait()?; let status = self.proce.wait()?;
if status.success() { if status.success() {
Ok(0) std::io::Result::Ok(0)
} else { } else {
Err(std::io::Error::new( Err(std::io::Error::new(
std::io::ErrorKind::Other, std::io::ErrorKind::Other,

4
src/config.rs
View File

@ -1,5 +1,5 @@
use crate::{adapters::custom::CustomAdapterConfig, project_dirs}; use crate::{adapters::custom::CustomAdapterConfig, project_dirs};
use anyhow::*; use anyhow::{Result, Context};
use derive_more::FromStr; use derive_more::FromStr;
use log::*; use log::*;
use schemars::JsonSchema; use schemars::JsonSchema;
@ -90,7 +90,7 @@ impl FromStr for CacheMaxBlobLen {
_ => usize::from_str(s).with_context(|| format!("Could not parse int")), _ => usize::from_str(s).with_context(|| format!("Could not parse int")),
}?)) }?))
} else { } else {
Err(format_err!("empty byte input")) Err(anyhow::format_err!("empty byte input"))
} }
} }
} }

5
src/recurse.rs
View File

@ -1,7 +1,6 @@
use crate::preproc::rga_preproc; use crate::preproc::rga_preproc;
use crate::{adapted_iter::AdaptedFilesIterBox, adapters::*}; use crate::{adapted_iter::AdaptedFilesIterBox, adapters::*};
use anyhow::*;
use std::io::Read; use std::io::Read;
pub struct RecursingConcattyReader<'a> { pub struct RecursingConcattyReader<'a> {
@ -9,12 +8,12 @@ pub struct RecursingConcattyReader<'a> {
cur: Option<ReadBox<'a>>, cur: Option<ReadBox<'a>>,
} }
impl<'a> RecursingConcattyReader<'a> { impl<'a> RecursingConcattyReader<'a> {
pub fn concat(inp: AdaptedFilesIterBox<'a>) -> Result<Box<dyn Read + 'a>> { pub fn concat(inp: AdaptedFilesIterBox<'a>) -> anyhow::Result<Box<dyn Read + 'a>> {
let mut r = RecursingConcattyReader { inp, cur: None }; let mut r = RecursingConcattyReader { inp, cur: None };
r.ascend()?; r.ascend()?;
Ok(Box::new(r)) Ok(Box::new(r))
} }
pub fn ascend(&mut self) -> Result<()> { pub fn ascend(&mut self) -> anyhow::Result<()> {
let inp = &mut self.inp; let inp = &mut self.inp;
// get next inner file from inp // get next inner file from inp
// we only need to access the inp: ReadIter when the inner reader is done, so this should be safe // we only need to access the inp: ReadIter when the inner reader is done, so this should be safe