From 896bbec76003656db74e6a3a0fe107ff0828bdce Mon Sep 17 00:00:00 2001 From: Jeffrey Finkelstein Date: Fri, 13 May 2022 22:47:56 -0400 Subject: [PATCH 1/5] all: clippy fixes --- src/uu/fold/src/fold.rs | 2 +- src/uu/head/src/parse.rs | 2 +- src/uu/ls/src/ls.rs | 6 +++--- src/uu/numfmt/src/format.rs | 2 +- src/uu/od/src/od.rs | 13 +++++++++---- src/uu/od/src/parse_formats.rs | 2 +- src/uu/od/src/parse_inputs.rs | 2 +- src/uu/ptx/src/ptx.rs | 26 +++++++++++++------------ src/uu/sort/src/sort.rs | 4 ++-- src/uu/stat/src/stat.rs | 4 ++-- src/uu/stdbuf/src/stdbuf.rs | 2 +- src/uu/tail/src/parse.rs | 2 +- src/uu/tsort/src/tsort.rs | 6 +----- src/uu/who/src/who.rs | 15 +++++++------- src/uucore/src/lib/parser/parse_size.rs | 2 +- tests/by-util/test_ls.rs | 2 +- 16 files changed, 48 insertions(+), 44 deletions(-) diff --git a/src/uu/fold/src/fold.rs b/src/uu/fold/src/fold.rs index d24d31be9..254d90d27 100644 --- a/src/uu/fold/src/fold.rs +++ b/src/uu/fold/src/fold.rs @@ -106,7 +106,7 @@ pub fn uu_app<'a>() -> Command<'a> { fn handle_obsolete(args: &[String]) -> (Vec, Option) { 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())); diff --git a/src/uu/head/src/parse.rs b/src/uu/head/src/parse.rs index ee543fe06..ea731ba29 100644 --- a/src/uu/head/src/parse.rs +++ b/src/uu/head/src/parse.rs @@ -20,7 +20,7 @@ pub fn parse_obsolete(src: &str) -> Option 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 { diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs index 17eec91ec..e189728e4 100644 --- a/src/uu/ls/src/ls.rs +++ b/src/uu/ls/src/ls.rs @@ -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}, @@ -1825,7 +1825,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(); } } @@ -1835,7 +1835,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) } diff --git a/src/uu/numfmt/src/format.rs b/src/uu/numfmt/src/format.rs index f66e1ac0a..97f00b3c8 100644 --- a/src/uu/numfmt/src/format.rs +++ b/src/uu/numfmt/src/format.rs @@ -244,7 +244,7 @@ fn format_string( p => format!( "{:width$}", "", width = f.spacing[b % output_info.byte_size_block] - )); + ) + .unwrap(); match f.formatter_item_info.formatter { FormatWriter::IntWriter(func) => { @@ -626,12 +629,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 { diff --git a/src/uu/od/src/parse_formats.rs b/src/uu/od/src/parse_formats.rs index 21971445d..f9f473dc8 100644 --- a/src/uu/od/src/parse_formats.rs +++ b/src/uu/od/src/parse_formats.rs @@ -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 } diff --git a/src/uu/od/src/parse_inputs.rs b/src/uu/od/src/parse_inputs.rs index 45e664ce3..80b0d974f 100644 --- a/src/uu/od/src/parse_inputs.rs +++ b/src/uu/od/src/parse_inputs.rs @@ -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()) diff --git a/src/uu/ptx/src/ptx.rs b/src/uu/ptx/src/ptx.rs index 2f253b580..40fe34218 100644 --- a/src/uu/ptx/src/ptx.rs +++ b/src/uu/ptx/src/ptx.rs @@ -13,7 +13,7 @@ use std::cmp; use std::collections::{BTreeSet, HashMap, HashSet}; use std::default::Default; use std::error::Error; -use std::fmt::{Display, Formatter}; +use std::fmt::{Display, Formatter, Write as FmtWrite}; use std::fs::File; use std::io::{stdin, stdout, BufRead, BufReader, BufWriter, Read, Write}; use std::num::ParseIntError; @@ -572,7 +572,7 @@ fn format_tex_line( reference: &str, ) -> String { let mut output = String::new(); - output.push_str(&format!("\\{} ", config.macro_name)); + write!(output, "\\{} ", config.macro_name).unwrap(); let all_before = if config.input_ref { let before = &line[0..word_ref.position]; let before_start_trim_offset = @@ -587,18 +587,18 @@ fn format_tex_line( let after_chars_trim_idx = (word_ref.position_end, chars_line.len()); let all_after = &chars_line[after_chars_trim_idx.0..after_chars_trim_idx.1]; let (tail, before, after, head) = get_output_chunks(all_before, keyword, all_after, config); - output.push_str(&format!( - "{5}{0}{6}{5}{1}{6}{5}{2}{6}{5}{3}{6}{5}{4}{6}", + write!( + output, + "{{{0}}}{{{1}}}{{{2}}}{{{3}}}{{{4}}}", format_tex_field(&tail), format_tex_field(&before), format_tex_field(keyword), format_tex_field(&after), format_tex_field(&head), - "{", - "}" - )); + ) + .unwrap(); if config.auto_ref || config.input_ref { - output.push_str(&format!("{}{}{}", "{", format_tex_field(reference), "}")); + write!(output, "{{{}}}", format_tex_field(reference)).unwrap(); } output } @@ -615,7 +615,7 @@ fn format_roff_line( reference: &str, ) -> String { let mut output = String::new(); - output.push_str(&format!(".{}", config.macro_name)); + write!(output, ".{}", config.macro_name).unwrap(); let all_before = if config.input_ref { let before = &line[0..word_ref.position]; let before_start_trim_offset = @@ -630,16 +630,18 @@ fn format_roff_line( let after_chars_trim_idx = (word_ref.position_end, chars_line.len()); let all_after = &chars_line[after_chars_trim_idx.0..after_chars_trim_idx.1]; let (tail, before, after, head) = get_output_chunks(all_before, keyword, all_after, config); - output.push_str(&format!( + write!( + output, " \"{}\" \"{}\" \"{}{}\" \"{}\"", format_roff_field(&tail), format_roff_field(&before), format_roff_field(keyword), format_roff_field(&after), format_roff_field(&head) - )); + ) + .unwrap(); if config.auto_ref || config.input_ref { - output.push_str(&format!(" \"{}\"", format_roff_field(reference))); + write!(output, " \"{}\"", format_roff_field(reference)).unwrap(); } output } diff --git a/src/uu/sort/src/sort.rs b/src/uu/sort/src/sort.rs index 141a7dd2c..3b423f4af 100644 --- a/src/uu/sort/src/sort.rs +++ b/src/uu/sort/src/sort.rs @@ -348,9 +348,9 @@ impl GlobalSettings { ]; let mut size_string = input.trim().to_string(); - if size_string.ends_with(|c: char| ALLOW_LIST.contains(&c) || c.is_digit(10)) { + if size_string.ends_with(|c: char| ALLOW_LIST.contains(&c) || c.is_ascii_digit()) { // b 1, K 1024 (default) - if size_string.ends_with(|c: char| c.is_digit(10)) { + if size_string.ends_with(|c: char| c.is_ascii_digit()) { size_string.push('K'); } else if size_string.ends_with('b') { size_string.pop(); diff --git a/src/uu/stat/src/stat.rs b/src/uu/stat/src/stat.rs index 41c9ae4a9..3a585b106 100644 --- a/src/uu/stat/src/stat.rs +++ b/src/uu/stat/src/stat.rs @@ -197,8 +197,8 @@ impl ScanUtil for str { pub fn group_num(s: &str) -> Cow { let is_negative = s.starts_with('-'); - assert!(is_negative || s.chars().take(1).all(|c| c.is_digit(10))); - assert!(s.chars().skip(1).all(|c| c.is_digit(10))); + assert!(is_negative || s.chars().take(1).all(|c| c.is_ascii_digit())); + assert!(s.chars().skip(1).all(|c| c.is_ascii_digit())); if s.len() < 4 { return s.into(); } diff --git a/src/uu/stdbuf/src/stdbuf.rs b/src/uu/stdbuf/src/stdbuf.rs index 816c86717..3250ea3f8 100644 --- a/src/uu/stdbuf/src/stdbuf.rs +++ b/src/uu/stdbuf/src/stdbuf.rs @@ -62,7 +62,7 @@ struct ProgramOptions { stderr: BufferType, } -impl<'a> TryFrom<&ArgMatches> for ProgramOptions { +impl TryFrom<&ArgMatches> for ProgramOptions { type Error = ProgramOptionsError; fn try_from(matches: &ArgMatches) -> Result { diff --git a/src/uu/tail/src/parse.rs b/src/uu/tail/src/parse.rs index ea9df9a02..d524adbc1 100644 --- a/src/uu/tail/src/parse.rs +++ b/src/uu/tail/src/parse.rs @@ -19,7 +19,7 @@ pub fn parse_obsolete(src: &str) -> Option 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 { diff --git a/src/uu/tsort/src/tsort.rs b/src/uu/tsort/src/tsort.rs index aecd492fe..27b0ebb56 100644 --- a/src/uu/tsort/src/tsort.rs +++ b/src/uu/tsort/src/tsort.rs @@ -50,11 +50,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { let mut line = String::new(); match reader.read_line(&mut line) { Ok(_) => { - let tokens: Vec = line - .trim_end() - .split_whitespace() - .map(|s| s.to_owned()) - .collect(); + let tokens: Vec = line.split_whitespace().map(|s| s.to_owned()).collect(); if tokens.is_empty() { break; } diff --git a/src/uu/who/src/who.rs b/src/uu/who/src/who.rs index 47d96a381..15190af07 100644 --- a/src/uu/who/src/who.rs +++ b/src/uu/who/src/who.rs @@ -15,6 +15,7 @@ use uucore::utmpx::{self, time, Utmpx}; use clap::{crate_version, Arg, Command}; use std::borrow::Cow; use std::ffi::CStr; +use std::fmt::Write; use std::os::unix::fs::MetadataExt; use std::path::PathBuf; use uucore::{format_usage, InvalidEncodingHandling}; @@ -528,24 +529,24 @@ impl Who { let mut buf = String::with_capacity(64); let msg = vec![' ', state].into_iter().collect::(); - buf.push_str(&format!("{:<8}", user)); + write!(buf, "{:<8}", user).unwrap(); if self.include_mesg { buf.push_str(&msg); } - buf.push_str(&format!(" {:<12}", line)); + write!(buf, " {:<12}", line).unwrap(); // "%b %e %H:%M" (LC_ALL=C) let time_size = 3 + 2 + 2 + 1 + 2; - buf.push_str(&format!(" {:<1$}", time, time_size)); + write!(buf, " {:<1$}", time, time_size).unwrap(); if !self.short_output { if self.include_idle { - buf.push_str(&format!(" {:<6}", idle)); + write!(buf, " {:<6}", idle).unwrap(); } - buf.push_str(&format!(" {:>10}", pid)); + write!(buf, " {:>10}", pid).unwrap(); } - buf.push_str(&format!(" {:<8}", comment)); + write!(buf, " {:<8}", comment).unwrap(); if self.include_exit { - buf.push_str(&format!(" {:<12}", exit)); + write!(buf, " {:<12}", exit).unwrap(); } println!("{}", buf.trim_end()); } diff --git a/src/uucore/src/lib/parser/parse_size.rs b/src/uucore/src/lib/parser/parse_size.rs index 28a898825..de316c3d2 100644 --- a/src/uucore/src/lib/parser/parse_size.rs +++ b/src/uucore/src/lib/parser/parse_size.rs @@ -38,7 +38,7 @@ pub fn parse_size(size: &str) -> Result { } // Get the numeric part of the size argument. For example, if the // argument is "123K", then the numeric part is "123". - let numeric_string: String = size.chars().take_while(|c| c.is_digit(10)).collect(); + let numeric_string: String = size.chars().take_while(|c| c.is_ascii_digit()).collect(); let number: u64 = if !numeric_string.is_empty() { match numeric_string.parse() { Ok(n) => n, diff --git a/tests/by-util/test_ls.rs b/tests/by-util/test_ls.rs index 72217a403..7b0390e70 100644 --- a/tests/by-util/test_ls.rs +++ b/tests/by-util/test_ls.rs @@ -2840,7 +2840,7 @@ fn test_ls_context2() { let ts = TestScenario::new(util_name!()); for c_flag in ["-Z", "--context"] { ts.ucmd() - .args(&[c_flag, &"/"]) + .args(&[c_flag, "/"]) .succeeds() .stdout_only(unwrap_or_return!(expected_result(&ts, &[c_flag, "/"])).stdout_str()); } From 9090457f029b0b168f41c3aa1660887c4c1de3b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 May 2022 07:01:00 +0000 Subject: [PATCH 2/5] build(deps): bump lscolors from 0.9.0 to 0.10.0 Bumps [lscolors](https://github.com/sharkdp/lscolors) from 0.9.0 to 0.10.0. - [Release notes](https://github.com/sharkdp/lscolors/releases) - [Commits](https://github.com/sharkdp/lscolors/compare/v0.9.0...v0.10.0) --- updated-dependencies: - dependency-name: lscolors dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- src/uu/ls/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 537e34e26..3051c2af4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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", ] diff --git a/src/uu/ls/Cargo.toml b/src/uu/ls/Cargo.toml index ec092d06a..ddb6f15d3 100644 --- a/src/uu/ls/Cargo.toml +++ b/src/uu/ls/Cargo.toml @@ -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" From a79d2263dd4a2a48569c381beb59f387809fde12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 May 2022 07:01:16 +0000 Subject: [PATCH 3/5] build(deps): bump rayon from 1.5.2 to 1.5.3 Bumps [rayon](https://github.com/rayon-rs/rayon) from 1.5.2 to 1.5.3. - [Release notes](https://github.com/rayon-rs/rayon/releases) - [Changelog](https://github.com/rayon-rs/rayon/blob/master/RELEASES.md) - [Commits](https://github.com/rayon-rs/rayon/compare/v1.5.2...v1.5.3) --- updated-dependencies: - dependency-name: rayon dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 537e34e26..ff7739f04 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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", From cd743c2fd1ce94487bcb538858c9719fa0df44cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 May 2022 07:13:42 +0000 Subject: [PATCH 4/5] build(deps): bump libc from 0.2.125 to 0.2.126 Bumps [libc](https://github.com/rust-lang/libc) from 0.2.125 to 0.2.126. - [Release notes](https://github.com/rust-lang/libc/releases) - [Commits](https://github.com/rust-lang/libc/compare/0.2.125...0.2.126) --- updated-dependencies: - dependency-name: libc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- src/uu/chmod/Cargo.toml | 2 +- src/uu/cp/Cargo.toml | 2 +- src/uu/hostid/Cargo.toml | 2 +- src/uu/kill/Cargo.toml | 2 +- src/uu/logname/Cargo.toml | 2 +- src/uu/mkfifo/Cargo.toml | 2 +- src/uu/mknod/Cargo.toml | 2 +- src/uu/nice/Cargo.toml | 2 +- src/uu/nohup/Cargo.toml | 2 +- src/uu/nproc/Cargo.toml | 2 +- src/uu/pathchk/Cargo.toml | 2 +- src/uu/rmdir/Cargo.toml | 2 +- src/uu/sync/Cargo.toml | 2 +- src/uu/tail/Cargo.toml | 2 +- src/uu/tee/Cargo.toml | 2 +- src/uu/test/Cargo.toml | 2 +- src/uu/timeout/Cargo.toml | 2 +- src/uu/tty/Cargo.toml | 2 +- src/uu/whoami/Cargo.toml | 2 +- src/uucore/Cargo.toml | 2 +- 21 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 537e34e26..405b46f4f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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" @@ -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", diff --git a/src/uu/chmod/Cargo.toml b/src/uu/chmod/Cargo.toml index df0b089fa..9a99f0d19 100644 --- a/src/uu/chmod/Cargo.toml +++ b/src/uu/chmod/Cargo.toml @@ -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]] diff --git a/src/uu/cp/Cargo.toml b/src/uu/cp/Cargo.toml index 3f3c2e317..c676204b4 100644 --- a/src/uu/cp/Cargo.toml +++ b/src/uu/cp/Cargo.toml @@ -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"] } diff --git a/src/uu/hostid/Cargo.toml b/src/uu/hostid/Cargo.toml index d29160b21..cfbdd4a2c 100644 --- a/src/uu/hostid/Cargo.toml +++ b/src/uu/hostid/Cargo.toml @@ -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]] diff --git a/src/uu/kill/Cargo.toml b/src/uu/kill/Cargo.toml index 24347a90a..7ec12979c 100644 --- a/src/uu/kill/Cargo.toml +++ b/src/uu/kill/Cargo.toml @@ -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]] diff --git a/src/uu/logname/Cargo.toml b/src/uu/logname/Cargo.toml index fe7f2f738..9da5a7c41 100644 --- a/src/uu/logname/Cargo.toml +++ b/src/uu/logname/Cargo.toml @@ -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" } diff --git a/src/uu/mkfifo/Cargo.toml b/src/uu/mkfifo/Cargo.toml index 821d67d53..6f38b055d 100644 --- a/src/uu/mkfifo/Cargo.toml +++ b/src/uu/mkfifo/Cargo.toml @@ -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]] diff --git a/src/uu/mknod/Cargo.toml b/src/uu/mknod/Cargo.toml index 88c9e3fb0..61a738c59 100644 --- a/src/uu/mknod/Cargo.toml +++ b/src/uu/mknod/Cargo.toml @@ -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]] diff --git a/src/uu/nice/Cargo.toml b/src/uu/nice/Cargo.toml index 9b6ca52bd..5f2e20bdb 100644 --- a/src/uu/nice/Cargo.toml +++ b/src/uu/nice/Cargo.toml @@ -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" } diff --git a/src/uu/nohup/Cargo.toml b/src/uu/nohup/Cargo.toml index ba38a7ecd..6e3faf37d 100644 --- a/src/uu/nohup/Cargo.toml +++ b/src/uu/nohup/Cargo.toml @@ -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"] } diff --git a/src/uu/nproc/Cargo.toml b/src/uu/nproc/Cargo.toml index f52f2d0db..89a742d0e 100644 --- a/src/uu/nproc/Cargo.toml +++ b/src/uu/nproc/Cargo.toml @@ -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"] } diff --git a/src/uu/pathchk/Cargo.toml b/src/uu/pathchk/Cargo.toml index dd8b83076..be46ac38a 100644 --- a/src/uu/pathchk/Cargo.toml +++ b/src/uu/pathchk/Cargo.toml @@ -16,7 +16,7 @@ path = "src/pathchk.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]] diff --git a/src/uu/rmdir/Cargo.toml b/src/uu/rmdir/Cargo.toml index 0894fa411..f422cecaa 100644 --- a/src/uu/rmdir/Cargo.toml +++ b/src/uu/rmdir/Cargo.toml @@ -17,7 +17,7 @@ path = "src/rmdir.rs" [dependencies] clap = { version = "3.1", features = ["wrap_help", "cargo"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore" } -libc = "0.2.125" +libc = "0.2.126" [[bin]] name = "rmdir" diff --git a/src/uu/sync/Cargo.toml b/src/uu/sync/Cargo.toml index f6e57391d..c4b30e7a2 100644 --- a/src/uu/sync/Cargo.toml +++ b/src/uu/sync/Cargo.toml @@ -16,7 +16,7 @@ path = "src/sync.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=["wide"] } winapi = { version = "0.3", features = ["errhandlingapi", "fileapi", "handleapi", "std", "winbase", "winerror"] } diff --git a/src/uu/tail/Cargo.toml b/src/uu/tail/Cargo.toml index 7006ddb67..9c4026b5f 100644 --- a/src/uu/tail/Cargo.toml +++ b/src/uu/tail/Cargo.toml @@ -16,7 +16,7 @@ path = "src/tail.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=["ringbuffer", "lines"] } [target.'cfg(windows)'.dependencies] diff --git a/src/uu/tee/Cargo.toml b/src/uu/tee/Cargo.toml index 07ee9e33b..a964f58e4 100644 --- a/src/uu/tee/Cargo.toml +++ b/src/uu/tee/Cargo.toml @@ -16,7 +16,7 @@ path = "src/tee.rs" [dependencies] clap = { version = "3.1", features = ["wrap_help", "cargo"] } -libc = "0.2.125" +libc = "0.2.126" retain_mut = "=0.1.7" # ToDO: [2021-01-01; rivy; maint/MinSRV] ~ v0.1.5 uses const generics which aren't stabilized until rust v1.51.0 uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["libc"] } diff --git a/src/uu/test/Cargo.toml b/src/uu/test/Cargo.toml index 58f891541..94cec610c 100644 --- a/src/uu/test/Cargo.toml +++ b/src/uu/test/Cargo.toml @@ -16,7 +16,7 @@ path = "src/test.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" } [target.'cfg(target_os = "redox")'.dependencies] diff --git a/src/uu/timeout/Cargo.toml b/src/uu/timeout/Cargo.toml index d285c3214..3c6efa288 100644 --- a/src/uu/timeout/Cargo.toml +++ b/src/uu/timeout/Cargo.toml @@ -16,7 +16,7 @@ path = "src/timeout.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, features = ["signal"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["process", "signals"] } diff --git a/src/uu/tty/Cargo.toml b/src/uu/tty/Cargo.toml index da6446ab0..2b80797f1 100644 --- a/src/uu/tty/Cargo.toml +++ b/src/uu/tty/Cargo.toml @@ -16,7 +16,7 @@ path = "src/tty.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"] } diff --git a/src/uu/whoami/Cargo.toml b/src/uu/whoami/Cargo.toml index 253e2ba1b..78ba91460 100644 --- a/src/uu/whoami/Cargo.toml +++ b/src/uu/whoami/Cargo.toml @@ -22,7 +22,7 @@ uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=[ winapi = { version = "0.3", features = ["lmcons"] } [target.'cfg(unix)'.dependencies] -libc = "0.2.125" +libc = "0.2.126" [[bin]] name = "whoami" diff --git a/src/uucore/Cargo.toml b/src/uucore/Cargo.toml index 7a350146e..581ec7862 100644 --- a/src/uucore/Cargo.toml +++ b/src/uucore/Cargo.toml @@ -31,7 +31,7 @@ time = { version="<= 0.3", optional=true, features = ["formatting", "local-offse data-encoding = { version="2.1", optional=true } data-encoding-macro = { version="0.1.12", optional=true } z85 = { version="3.0.5", optional=true } -libc = { version="0.2.125", optional=true } +libc = { version="0.2.126", optional=true } once_cell = "1.10.0" os_display = "0.1.3" From 8d0572a3ba225157e49250b40dec3cdb681bfda5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 May 2022 07:13:56 +0000 Subject: [PATCH 5/5] build(deps): bump signal-hook from 0.3.13 to 0.3.14 Bumps [signal-hook](https://github.com/vorner/signal-hook) from 0.3.13 to 0.3.14. - [Release notes](https://github.com/vorner/signal-hook/releases) - [Changelog](https://github.com/vorner/signal-hook/blob/master/CHANGELOG.md) - [Commits](https://github.com/vorner/signal-hook/compare/v0.3.13...v0.3.14) --- updated-dependencies: - dependency-name: signal-hook dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- src/uu/dd/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 537e34e26..bac656436 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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", diff --git a/src/uu/dd/Cargo.toml b/src/uu/dd/Cargo.toml index c805685ad..a2acea608 100644 --- a/src/uu/dd/Cargo.toml +++ b/src/uu/dd/Cargo.toml @@ -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"