From 0048e9f6bef132807b9bd2fde9f0e7582d476479 Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Thu, 6 Jun 2024 10:52:02 +0200 Subject: [PATCH 1/3] Bump itertools from 0.12.1 to 0.13.0 --- Cargo.lock | 19 ++++++++++++++----- Cargo.toml | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index eb086e514..c8726b79e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -165,7 +165,7 @@ dependencies = [ "bitflags 2.5.0", "cexpr", "clang-sys", - "itertools", + "itertools 0.12.1", "lazy_static", "lazycell", "log", @@ -1245,6 +1245,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.4" @@ -2990,7 +2999,7 @@ version = "0.0.26" dependencies = [ "chrono", "clap", - "itertools", + "itertools 0.13.0", "quick-error", "regex", "uucore", @@ -3126,7 +3135,7 @@ dependencies = [ "compare", "ctrlc", "fnv", - "itertools", + "itertools 0.13.0", "memchr", "rand", "rayon", @@ -3407,7 +3416,7 @@ name = "uu_yes" version = "0.0.26" dependencies = [ "clap", - "itertools", + "itertools 0.13.0", "nix", "uucore", ] @@ -3426,7 +3435,7 @@ dependencies = [ "dunce", "glob", "hex", - "itertools", + "itertools 0.13.0", "libc", "md-5", "memchr", diff --git a/Cargo.toml b/Cargo.toml index c7c15a0c5..316c7d5ca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -288,7 +288,7 @@ glob = "0.3.1" half = "2.4.1" hostname = "0.4" indicatif = "0.17.8" -itertools = "0.12.1" +itertools = "0.13.0" libc = "0.2.153" lscolors = { version = "0.16.0", default-features = false, features = [ "gnu_legacy", From dd5a070ecf11e5588ed54860e9ae8549eab42efe Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Thu, 6 Jun 2024 10:54:16 +0200 Subject: [PATCH 2/3] deny.toml: add itertools --- deny.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deny.toml b/deny.toml index 252f8b813..3ee9df5c1 100644 --- a/deny.toml +++ b/deny.toml @@ -102,6 +102,8 @@ skip = [ { name = "terminal_size", version = "0.2.6" }, # filetime, parking_lot_core { name = "redox_syscall", version = "0.4.1" }, + # bindgen + { name = "itertools", version = "0.12.1" }, ] # spell-checker: enable From cb160eebe9164262ec0fe9c0c11621fe1cdfe308 Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Thu, 6 Jun 2024 10:56:11 +0200 Subject: [PATCH 3/3] pr: use chunk_by instead of deprecated group_by --- src/uu/pr/src/pr.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/uu/pr/src/pr.rs b/src/uu/pr/src/pr.rs index aba71c341..41bf5d416 100644 --- a/src/uu/pr/src/pr.rs +++ b/src/uu/pr/src/pr.rs @@ -956,7 +956,7 @@ fn mpr(paths: &[&str], options: &OutputOptions) -> Result { a.group_key < b.group_key } }) - .group_by(|file_line| file_line.group_key); + .chunk_by(|file_line| file_line.group_key); let start_page = options.start_page; let mut lines = Vec::new();