uutils/coreutils
0
0
Fork 0
mirror of https://github.com/uutils/coreutils.git synced 2026-06-10 15:48:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into mktemp-set-dir-mode

Browse Source
This commit is contained in:
353fc443 aka Seagull
2022-05-17 12:51:04 +01:00
committed by GitHub
parent 2086d04996 e337826a11
commit 124312702f
39 changed files with 78 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+8 -8
View File
@@ -1021,9 +1021,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "libc"
version = "0.2.125"
version = "0.2.126"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b"
checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
[[package]]
name = "libloading"
@@ -1055,9 +1055,9 @@ dependencies = [
[[package]]
name = "lscolors"
version = "0.9.0"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e9323b3525d4efad2dead1837a105e313253bfdbad1d470994038eededa4d62"
checksum = "88e4434edeec6cd16a7e8e13569af4568a66fcd6d79abd8696db22dd95f920e6"
dependencies = [
"ansi_term",
]
@@ -1530,9 +1530,9 @@ dependencies = [
[[package]]
name = "rayon"
version = "1.5.2"
version = "1.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221"
checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d"
dependencies = [
"autocfg",
"crossbeam-deque",
@@ -1739,9 +1739,9 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
[[package]]
name = "signal-hook"
version = "0.3.13"
version = "0.3.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d"
checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d"
dependencies = [
"libc",
"signal-hook-registry",
src/uu/chmod/Cargo.toml
+1 -1
View File
@@ -16,7 +16,7 @@ path = "src/chmod.rs"
[dependencies]
clap = { version = "3.1", features = ["wrap_help", "cargo"] }
libc = "0.2.125"
libc = "0.2.126"
uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["fs", "mode"] }
[[bin]]
src/uu/cp/Cargo.toml
+1 -1
View File
@@ -21,7 +21,7 @@ path = "src/cp.rs"
[dependencies]
clap = { version = "3.1", features = ["wrap_help", "cargo"] }
filetime = "0.2"
libc = "0.2.125"
libc = "0.2.126"
quick-error = "2.0.1"
selinux = { version="0.2", optional=true }
uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["entries", "fs", "perms", "mode"] }
src/uu/dd/Cargo.toml
+1 -1
View File
@@ -22,7 +22,7 @@ libc = "0.2"
uucore = { version=">=0.0.8", package="uucore", path="../../uucore" }
[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
signal-hook = "0.3.9"
signal-hook = "0.3.14"
[[bin]]
name = "dd"
src/uu/fold/src/fold.rs
+1 -1
View File
@@ -107,7 +107,7 @@ pub fn uu_app<'a>() -> Command<'a> {
fn handle_obsolete(args: &[String]) -> (Vec<String>, Option<String>) {
for (i, arg) in args.iter().enumerate() {
let slice = &arg;
if slice.starts_with('-') && slice.chars().nth(1).map_or(false, |c| c.is_digit(10)) {
if slice.starts_with('-') && slice.chars().nth(1).map_or(false, |c| c.is_ascii_digit()) {
let mut v = args.to_vec();
v.remove(i);
return (v, Some(slice[1..].to_owned()));
src/uu/head/src/parse.rs
+1 -1
View File
@@ -20,7 +20,7 @@ pub fn parse_obsolete(src: &str) -> Option<Result<impl Iterator<Item = OsString>
let mut has_num = false;
let mut last_char = 0 as char;
for (n, c) in &mut chars {
if c.is_digit(10) {
if c.is_ascii_digit() {
has_num = true;
num_end = n;
} else {
src/uu/hostid/Cargo.toml
+1 -1
View File
@@ -16,7 +16,7 @@ path = "src/hostid.rs"
[dependencies]
clap = { version = "3.1", features = ["wrap_help", "cargo"] }
libc = "0.2.125"
libc = "0.2.126"
uucore = { version=">=0.0.11", package="uucore", path="../../uucore" }
[[bin]]
src/uu/kill/Cargo.toml
+1 -1
View File
@@ -16,7 +16,7 @@ path = "src/kill.rs"
[dependencies]
clap = { version = "3.1", features = ["wrap_help", "cargo"] }
libc = "0.2.125"
libc = "0.2.126"
uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["signals"] }
[[bin]]
src/uu/logname/Cargo.toml
+1 -1
View File
@@ -15,7 +15,7 @@ edition = "2021"
path = "src/logname.rs"
[dependencies]
libc = "0.2.125"
libc = "0.2.126"
clap = { version = "3.1", features = ["wrap_help", "cargo"] }
uucore = { version=">=0.0.11", package="uucore", path="../../uucore" }
src/uu/ls/Cargo.toml
+1 -1
View File
@@ -22,7 +22,7 @@ number_prefix = "0.4"
term_grid = "0.1.5"
termsize = "0.1.6"
glob = "0.3.0"
lscolors = { version = "0.9.0", features = ["ansi_term"] }
lscolors = { version = "0.10.0", features = ["ansi_term"] }
uucore = { version = ">=0.0.8", package = "uucore", path = "../../uucore", features = ["entries", "fs"] }
once_cell = "1.10.0"
atty = "0.2"
src/uu/ls/src/ls.rs
+3 -3
View File
@@ -28,7 +28,7 @@ use std::{
cmp::Reverse,
error::Error,
ffi::{OsStr, OsString},
fmt::Display,
fmt::{Display, Write as FmtWrite},
fs::{self, DirEntry, FileType, Metadata, ReadDir},
io::{stdout, BufWriter, ErrorKind, Stdout, Write},
path::{Path, PathBuf},
@@ -1826,7 +1826,7 @@ fn display_additional_leading_info(
} else {
"?".to_owned()
};
result.push_str(&format!("{} ", pad_left(&i, padding.inode)));
write!(result, "{} ", pad_left(&i, padding.inode)).unwrap();
}
}
@@ -1836,7 +1836,7 @@ fn display_additional_leading_info(
} else {
"?".to_owned()
};
result.push_str(&format!("{} ", pad_left(&s, padding.block_size),));
write!(result, "{} ", pad_left(&s, padding.block_size)).unwrap();
}
Ok(result)
}
src/uu/mkfifo/Cargo.toml
+1 -1
View File
@@ -16,7 +16,7 @@ path = "src/mkfifo.rs"
[dependencies]
clap = { version = "3.1", features = ["wrap_help", "cargo"] }
libc = "0.2.125"
libc = "0.2.126"
uucore = { version=">=0.0.11", package="uucore", path="../../uucore" }
[[bin]]
src/uu/mknod/Cargo.toml
+1 -1
View File
@@ -17,7 +17,7 @@ path = "src/mknod.rs"
[dependencies]
clap = { version = "3.1", features = ["wrap_help", "cargo"] }
libc = "^0.2.125"
libc = "^0.2.126"
uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["mode"] }
[[bin]]
src/uu/nice/Cargo.toml
+1 -1
View File
@@ -16,7 +16,7 @@ path = "src/nice.rs"
[dependencies]
clap = { version = "3.1", features = ["wrap_help", "cargo"] }
libc = "0.2.125"
libc = "0.2.126"
nix = { version = "0.24.1", default-features = false }
uucore = { version=">=0.0.11", package="uucore", path="../../uucore" }
src/uu/nohup/Cargo.toml
+1 -1
View File
@@ -16,7 +16,7 @@ path = "src/nohup.rs"
[dependencies]
clap = { version = "3.1", features = ["wrap_help", "cargo"] }
libc = "0.2.125"
libc = "0.2.126"
atty = "0.2"
uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["fs"] }
src/uu/nproc/Cargo.toml
+1 -1
View File
@@ -15,7 +15,7 @@ edition = "2021"
path = "src/nproc.rs"
[dependencies]
libc = "0.2.125"
libc = "0.2.126"
num_cpus = "1.10"
clap = { version = "3.1", features = ["wrap_help", "cargo"] }
uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["fs"] }
src/uu/numfmt/src/format.rs
+1 -1
View File
@@ -244,7 +244,7 @@ fn format_string(
p => format!(
"{:<padding$}",
number_with_suffix,
padding = p.abs() as usize
padding = p.unsigned_abs()
),
})
}
src/uu/od/src/od.rs
+9 -4
View File
@@ -29,6 +29,7 @@ mod prn_float;
mod prn_int;
use std::cmp;
use std::fmt::Write;
use crate::byteorder_io::*;
use crate::formatteriteminfo::*;
@@ -600,11 +601,13 @@ fn print_bytes(prefix: &str, input_decoder: &MemoryDecoder, output_info: &Output
let mut b = 0;
while b < input_decoder.length() {
output_text.push_str(&format!(
write!(
output_text,
"{:>width$}",
"",
width = f.spacing[b % output_info.byte_size_block]
));
)
.unwrap();
match f.formatter_item_info.formatter {
FormatWriter::IntWriter(func) => {
@@ -627,12 +630,14 @@ fn print_bytes(prefix: &str, input_decoder: &MemoryDecoder, output_info: &Output
let missing_spacing = output_info
.print_width_line
.saturating_sub(output_text.chars().count());
output_text.push_str(&format!(
write!(
output_text,
"{:>width$} {}",
"",
format_ascii_dump(input_decoder.get_buffer(0)),
width = missing_spacing
));
)
.unwrap();
}
if first {
src/uu/od/src/parse_formats.rs
+1 -1
View File
@@ -244,7 +244,7 @@ fn is_format_size_decimal(
return false;
}
match ch {
Some(d) if d.is_digit(10) => {
Some(d) if d.is_ascii_digit() => {
decimal_size.push(d);
true
}
src/uu/od/src/parse_inputs.rs
+1 -1
View File
@@ -10,7 +10,7 @@ pub trait CommandLineOpts {
}
/// Implementation for `getopts`
impl<'a> CommandLineOpts for ArgMatches {
impl CommandLineOpts for ArgMatches {
fn inputs(&self) -> Vec<&str> {
self.values_of(options::FILENAME)
.map(|values| values.collect())

Some files were not shown because too many files have changed in this diff Show More