mirror of
https://github.com/uutils/coreutils
synced 2024-11-17 10:18:11 +00:00
Merge pull request #2576 from sylvestre/bump-crates
bump a few crates to simplify Debian packaging
This commit is contained in:
Sylvestre Ledru
GitHub
commit
724f67c5d0
10 changed files with 84 additions and 36 deletions
82
Cargo.lock
generated
82
Cargo.lock
generated
|
|
@ -8,6 +8,12 @@ version = "0.11.4"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
|
||||
|
||||
[[package]]
|
||||
name = "ahash"
|
||||
version = "0.4.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
|
||||
|
||||
[[package]]
|
||||
name = "aho-corasick"
|
||||
version = "0.7.18"
|
||||
|
|
@ -234,7 +240,7 @@ version = "1.2.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "853eda514c284c2287f4bf20ae614f8781f40a81d32ecda6e91449304dfe077c"
|
||||
dependencies = [
|
||||
"glob 0.3.0",
|
||||
"glob",
|
||||
"libc",
|
||||
"libloading",
|
||||
]
|
||||
|
|
@ -294,7 +300,7 @@ dependencies = [
|
|||
"clap",
|
||||
"conv",
|
||||
"filetime",
|
||||
"glob 0.3.0",
|
||||
"glob",
|
||||
"lazy_static",
|
||||
"libc",
|
||||
"nix 0.20.0",
|
||||
|
|
@ -652,6 +658,15 @@ dependencies = [
|
|||
"generic-array",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dlv-list"
|
||||
version = "0.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "68df3f2b690c1b86e65ef7830956aededf3cb0a16f898f79b9a6f421a7b6211b"
|
||||
dependencies = [
|
||||
"rand 0.8.4",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dns-lookup"
|
||||
version = "1.0.5"
|
||||
|
|
@ -804,12 +819,6 @@ dependencies = [
|
|||
"wasi 0.10.2+wasi-snapshot-preview1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "glob"
|
||||
version = "0.2.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
|
||||
|
||||
[[package]]
|
||||
name = "glob"
|
||||
version = "0.3.0"
|
||||
|
|
@ -835,6 +844,15 @@ version = "1.7.1"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3"
|
||||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "heck"
|
||||
version = "0.3.3"
|
||||
|
|
@ -893,9 +911,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "ioctl-sys"
|
||||
version = "0.5.2"
|
||||
version = "0.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5e2c4b26352496eaaa8ca7cfa9bd99e93419d3f7983dc6e99c2a35fe9e33504a"
|
||||
checksum = "1c429fffa658f288669529fc26565f728489a2e39bc7b24a428aaaf51355182e"
|
||||
|
||||
[[package]]
|
||||
name = "itertools"
|
||||
|
|
@ -1066,6 +1084,18 @@ dependencies = [
|
|||
"void",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "nix"
|
||||
version = "0.19.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cc",
|
||||
"cfg-if 1.0.0",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "nix"
|
||||
version = "0.20.0"
|
||||
|
|
@ -1185,6 +1215,16 @@ dependencies = [
|
|||
"pkg-config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ordered-multimap"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1c672c7ad9ec066e428c00eb917124a06f08db19e2584de982cc34b1f4c12485"
|
||||
dependencies = [
|
||||
"dlv-list",
|
||||
"hashbrown",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ouroboros"
|
||||
version = "0.10.1"
|
||||
|
|
@ -1604,9 +1644,13 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "rust-ini"
|
||||
version = "0.13.0"
|
||||
version = "0.17.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2"
|
||||
checksum = "63471c4aa97a1cf8332a5f97709a79a4234698de6a1f5087faf66f2dae810e22"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
"ordered-multimap",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustc-hash"
|
||||
|
|
@ -2065,7 +2109,7 @@ name = "uu_chown"
|
|||
version = "0.0.7"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"glob 0.3.0",
|
||||
"glob",
|
||||
"uucore",
|
||||
"uucore_procs",
|
||||
"walkdir",
|
||||
|
|
@ -2121,7 +2165,7 @@ name = "uu_csplit"
|
|||
version = "0.0.7"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"glob 0.2.11",
|
||||
"glob",
|
||||
"regex",
|
||||
"thiserror",
|
||||
"uucore",
|
||||
|
|
@ -2181,7 +2225,7 @@ name = "uu_dircolors"
|
|||
version = "0.0.7"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"glob 0.3.0",
|
||||
"glob",
|
||||
"uucore",
|
||||
"uucore_procs",
|
||||
]
|
||||
|
|
@ -2493,7 +2537,7 @@ dependencies = [
|
|||
"atty",
|
||||
"clap",
|
||||
"crossterm",
|
||||
"nix 0.13.1",
|
||||
"nix 0.19.1",
|
||||
"redox_syscall",
|
||||
"redox_termios",
|
||||
"unicode-segmentation",
|
||||
|
|
@ -2732,7 +2776,7 @@ dependencies = [
|
|||
"clap",
|
||||
"filetime",
|
||||
"libc",
|
||||
"rand 0.5.6",
|
||||
"rand 0.7.3",
|
||||
"time",
|
||||
"uucore",
|
||||
"uucore_procs",
|
||||
|
|
@ -3064,7 +3108,7 @@ dependencies = [
|
|||
"getopts",
|
||||
"lazy_static",
|
||||
"libc",
|
||||
"nix 0.13.1",
|
||||
"nix 0.19.1",
|
||||
"platform-info",
|
||||
"termion",
|
||||
"thiserror",
|
||||
|
|
@ -3139,7 +3183,7 @@ version = "2.0.4"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "035793abb854745033f01a07647a79831eba29ec0be377205f2a25b0aa830020"
|
||||
dependencies = [
|
||||
"glob 0.3.0",
|
||||
"glob",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_p
|
|||
walkdir = "2.2"
|
||||
|
||||
[target.'cfg(target_os = "linux")'.dependencies]
|
||||
ioctl-sys = "0.5.2"
|
||||
ioctl-sys = "0.6"
|
||||
|
||||
[target.'cfg(target_os = "windows")'.dependencies]
|
||||
winapi = { version="0.3", features=["fileapi"] }
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ path = "src/csplit.rs"
|
|||
clap = { version = "2.33", features = ["wrap_help"] }
|
||||
thiserror = "1.0"
|
||||
regex = "1.0.0"
|
||||
glob = "0.2.11"
|
||||
glob = "0.3"
|
||||
uucore = { version=">=0.0.9", package="uucore", path="../../uucore", features=["entries", "fs"] }
|
||||
uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
|
||||
|
||||
|
|
|
|||
2
src/uu/env/Cargo.toml
vendored
2
src/uu/env/Cargo.toml
vendored
|
|
@ -17,7 +17,7 @@ path = "src/env.rs"
|
|||
[dependencies]
|
||||
clap = { version = "2.33", features = ["wrap_help"] }
|
||||
libc = "0.2.42"
|
||||
rust-ini = "0.13.0"
|
||||
rust-ini = "0.17.0"
|
||||
uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
|
||||
uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
|
||||
|
||||
|
|
|
|||
2
src/uu/env/src/env.rs
vendored
2
src/uu/env/src/env.rs
vendored
|
|
@ -89,7 +89,7 @@ fn load_config_file(opts: &mut Options) -> Result<(), i32> {
|
|||
|
||||
for (_, prop) in &conf {
|
||||
// ignore all INI section lines (treat them as comments)
|
||||
for (key, value) in prop {
|
||||
for (key, value) in prop.iter() {
|
||||
env::set_var(key, value);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ redox_termios = "0.1"
|
|||
redox_syscall = "0.2"
|
||||
|
||||
[target.'cfg(all(unix, not(target_os = "fuchsia")))'.dependencies]
|
||||
nix = "<=0.13"
|
||||
nix = "0.19"
|
||||
|
||||
[[bin]]
|
||||
name = "more"
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ path = "src/shred.rs"
|
|||
clap = { version = "2.33", features = ["wrap_help"] }
|
||||
filetime = "0.2.1"
|
||||
libc = "0.2.42"
|
||||
rand = "0.5"
|
||||
rand = "0.7"
|
||||
time = "0.1.40"
|
||||
uucore = { version=">=0.0.9", package="uucore", path="../../uucore" }
|
||||
uucore_procs = { version=">=0.0.6", package="uucore_procs", path="../../uucore_procs" }
|
||||
|
|
|
|||
|
|
@ -9,7 +9,8 @@
|
|||
// spell-checker:ignore (words) writeback wipesync
|
||||
|
||||
use clap::{crate_version, App, Arg};
|
||||
use rand::{Rng, ThreadRng};
|
||||
use rand::prelude::SliceRandom;
|
||||
use rand::Rng;
|
||||
use std::cell::{Cell, RefCell};
|
||||
use std::fs;
|
||||
use std::fs::{File, OpenOptions};
|
||||
|
|
@ -119,7 +120,7 @@ struct BytesGenerator<'a> {
|
|||
block_size: usize,
|
||||
exact: bool, // if false, every block's size is block_size
|
||||
gen_type: PassType<'a>,
|
||||
rng: Option<RefCell<ThreadRng>>,
|
||||
rng: Option<RefCell<rand::rngs::ThreadRng>>,
|
||||
bytes: [u8; BLOCK_SIZE],
|
||||
}
|
||||
|
||||
|
|
@ -499,7 +500,8 @@ fn wipe_file(
|
|||
for pattern in PATTERNS.iter().take(remainder) {
|
||||
pass_sequence.push(PassType::Pattern(pattern));
|
||||
}
|
||||
rand::thread_rng().shuffle(&mut pass_sequence[..]); // randomize the order of application
|
||||
let mut rng = rand::thread_rng();
|
||||
pass_sequence.shuffle(&mut rng); // randomize the order of application
|
||||
|
||||
let n_random = 3 + n_passes / 10; // Minimum 3 random passes; ratio of 10 after
|
||||
// Evenly space random passes; ensures one at the beginning and end
|
||||
|
|
|
|||
|
|
@ -240,10 +240,12 @@ fn shuf_bytes(input: &mut Vec<&[u8]>, opts: Options) {
|
|||
});
|
||||
|
||||
let mut rng = match opts.random_source {
|
||||
Some(r) => WrappedRng::RngFile(rand::read::ReadRng::new(match File::open(&r[..]) {
|
||||
Some(r) => WrappedRng::RngFile(rand::rngs::adapter::ReadRng::new(
|
||||
match File::open(&r[..]) {
|
||||
Ok(f) => f,
|
||||
Err(e) => crash!(1, "failed to open random source '{}': {}", &r[..], e),
|
||||
})),
|
||||
},
|
||||
)),
|
||||
None => WrappedRng::RngDefault(rand::thread_rng()),
|
||||
};
|
||||
|
||||
|
|
@ -299,8 +301,8 @@ fn parse_range(input_range: &str) -> Result<(usize, usize), String> {
|
|||
}
|
||||
|
||||
enum WrappedRng {
|
||||
RngFile(rand::read::ReadRng<File>),
|
||||
RngDefault(rand::ThreadRng),
|
||||
RngFile(rand::rngs::adapter::ReadRng<File>),
|
||||
RngDefault(rand::rngs::ThreadRng),
|
||||
}
|
||||
|
||||
impl WrappedRng {
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@ path="src/lib/lib.rs"
|
|||
dns-lookup = { version="1.0.5", optional=true }
|
||||
dunce = "1.0.0"
|
||||
getopts = "<= 0.2.21"
|
||||
wild = "2.0.4"
|
||||
wild = "2.0"
|
||||
# * optional
|
||||
thiserror = { version="1.0", optional=true }
|
||||
lazy_static = { version="1.3", optional=true }
|
||||
nix = { version="<= 0.13", optional=true }
|
||||
nix = { version="<= 0.19", optional=true }
|
||||
platform-info = { version="<= 0.1", optional=true }
|
||||
time = { version="<= 0.1.43", optional=true }
|
||||
# * "problem" dependencies (pinned)
|
||||
|
|
|
|||
Loading…
Reference in a new issue