nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #121584 - klensy:itertools-up, r=Mark-Simulacrum

Browse Source 
bump itertools to 0.12

still depend on 0.11 (temporary dupes version):
* <del>clippy</del>, https://github.com/rust-lang/rust-clippy/pull/12346
* rustfmt, sigh, https://github.com/rust-lang/rustfmt/pull/6093

https://github.com/rust-itertools/itertools/blob/v0.12.1/CHANGELOG.md

removed unused `derive_more` dep from `rustc_middle`
This commit is contained in:
Guillaume Boisseau 2024-03-09 21:40:08 +01:00 committed by GitHub
commit bc3bc2ba6b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 26 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Cargo.lock
View File

@ -784,12 +784,6 @@ dependencies = [
"windows-sys 0.52.0", "windows-sys 0.52.0",
] ]
[[package]]
name = "convert_case"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
[[package]] [[package]]
name = "core" name = "core"
version = "0.0.0" version = "0.0.0"
@ -1035,10 +1029,8 @@ version = "0.99.17"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
dependencies = [ dependencies = [
"convert_case",
"proc-macro2", "proc-macro2",
"quote", "quote",
"rustc_version",
"syn 1.0.109", "syn 1.0.109",
] ]
@ -3497,7 +3489,7 @@ dependencies = [
name = "rustc_ast_passes" name = "rustc_ast_passes"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"itertools 0.11.0", "itertools 0.12.1",
"rustc_ast", "rustc_ast",
"rustc_ast_pretty", "rustc_ast_pretty",
"rustc_attr", "rustc_attr",
@ -3517,7 +3509,7 @@ dependencies = [
name = "rustc_ast_pretty" name = "rustc_ast_pretty"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"itertools 0.11.0", "itertools 0.12.1",
"rustc_ast", "rustc_ast",
"rustc_lexer", "rustc_lexer",
"rustc_span", "rustc_span",
@ -3558,7 +3550,7 @@ name = "rustc_borrowck"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"either", "either",
"itertools 0.11.0", "itertools 0.12.1",
"polonius-engine", "polonius-engine",
"rustc_data_structures", "rustc_data_structures",
"rustc_errors", "rustc_errors",
@ -3611,7 +3603,7 @@ name = "rustc_codegen_llvm"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"bitflags 2.4.2", "bitflags 2.4.2",
"itertools 0.11.0", "itertools 0.12.1",
"libc", "libc",
"measureme", "measureme",
"object", "object",
@ -3647,7 +3639,7 @@ dependencies = [
"ar_archive_writer", "ar_archive_writer",
"bitflags 2.4.2", "bitflags 2.4.2",
"cc", "cc",
"itertools 0.11.0", "itertools 0.12.1",
"jobserver", "jobserver",
"libc", "libc",
"object", "object",
@ -3929,7 +3921,7 @@ dependencies = [
name = "rustc_hir_analysis" name = "rustc_hir_analysis"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"itertools 0.11.0", "itertools 0.12.1",
"rustc_arena", "rustc_arena",
"rustc_ast", "rustc_ast",
"rustc_attr", "rustc_attr",
@ -3968,7 +3960,7 @@ dependencies = [
name = "rustc_hir_typeck" name = "rustc_hir_typeck"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"itertools 0.11.0", "itertools 0.12.1",
"rustc_ast", "rustc_ast",
"rustc_ast_ir", "rustc_ast_ir",
"rustc_attr", "rustc_attr",
@ -4216,7 +4208,6 @@ name = "rustc_middle"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"bitflags 2.4.2", "bitflags 2.4.2",
"derive_more",
"either", "either",
"field-offset", "field-offset",
"gsgdt", "gsgdt",
@ -4254,7 +4245,7 @@ name = "rustc_mir_build"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"either", "either",
"itertools 0.11.0", "itertools 0.12.1",
"rustc_apfloat", "rustc_apfloat",
"rustc_arena", "rustc_arena",
"rustc_ast", "rustc_ast",
@ -4301,7 +4292,7 @@ name = "rustc_mir_transform"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"either", "either",
"itertools 0.11.0", "itertools 0.12.1",
"rustc_arena", "rustc_arena",
"rustc_ast", "rustc_ast",
"rustc_attr", "rustc_attr",
@ -4381,7 +4372,6 @@ dependencies = [
name = "rustc_passes" name = "rustc_passes"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"itertools 0.11.0",
"rustc_ast", "rustc_ast",
"rustc_ast_pretty", "rustc_ast_pretty",
"rustc_attr", "rustc_attr",
@ -4632,7 +4622,7 @@ name = "rustc_trait_selection"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"bitflags 2.4.2", "bitflags 2.4.2",
"itertools 0.11.0", "itertools 0.12.1",
"rustc_ast", "rustc_ast",
"rustc_ast_ir", "rustc_ast_ir",
"rustc_attr", "rustc_attr",
@ -4672,7 +4662,7 @@ dependencies = [
name = "rustc_transmute" name = "rustc_transmute"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"itertools 0.11.0", "itertools 0.12.1",
"rustc_ast_ir", "rustc_ast_ir",
"rustc_data_structures", "rustc_data_structures",
"rustc_hir", "rustc_hir",
@ -4688,7 +4678,7 @@ dependencies = [
name = "rustc_ty_utils" name = "rustc_ty_utils"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"itertools 0.11.0", "itertools 0.12.1",
"rustc_ast_ir", "rustc_ast_ir",
"rustc_data_structures", "rustc_data_structures",
"rustc_errors", "rustc_errors",
@ -4738,7 +4728,7 @@ dependencies = [
"askama", "askama",
"expect-test", "expect-test",
"indexmap", "indexmap",
"itertools 0.11.0", "itertools 0.12.1",
"minifier", "minifier",
"once_cell", "once_cell",
"regex", "regex",

2
compiler/rustc_ast_passes/Cargo.toml
View File

@ -5,7 +5,7 @@ edition = "2021"
[dependencies] [dependencies]
# tidy-alphabetical-start # tidy-alphabetical-start
itertools = "0.11" itertools = "0.12"
rustc_ast = { path = "../rustc_ast" } rustc_ast = { path = "../rustc_ast" }
rustc_ast_pretty = { path = "../rustc_ast_pretty" } rustc_ast_pretty = { path = "../rustc_ast_pretty" }
rustc_attr = { path = "../rustc_attr" } rustc_attr = { path = "../rustc_attr" }

2
compiler/rustc_ast_pretty/Cargo.toml
View File

@ -5,7 +5,7 @@ edition = "2021"
[dependencies] [dependencies]
# tidy-alphabetical-start # tidy-alphabetical-start
itertools = "0.11" itertools = "0.12"
rustc_ast = { path = "../rustc_ast" } rustc_ast = { path = "../rustc_ast" }
rustc_lexer = { path = "../rustc_lexer" } rustc_lexer = { path = "../rustc_lexer" }
rustc_span = { path = "../rustc_span" } rustc_span = { path = "../rustc_span" }

2
compiler/rustc_borrowck/Cargo.toml
View File

@ -6,7 +6,7 @@ edition = "2021"
[dependencies] [dependencies]
# tidy-alphabetical-start # tidy-alphabetical-start
either = "1.5.0" either = "1.5.0"
itertools = "0.11" itertools = "0.12"
polonius-engine = "0.13.0" polonius-engine = "0.13.0"
rustc_data_structures = { path = "../rustc_data_structures" } rustc_data_structures = { path = "../rustc_data_structures" }
rustc_errors = { path = "../rustc_errors" } rustc_errors = { path = "../rustc_errors" }

2
compiler/rustc_codegen_llvm/Cargo.toml
View File

@ -9,7 +9,7 @@ test = false
[dependencies] [dependencies]
# tidy-alphabetical-start # tidy-alphabetical-start
bitflags = "2.4.1" bitflags = "2.4.1"
itertools = "0.11" itertools = "0.12"
libc = "0.2" libc = "0.2"
measureme = "11" measureme = "11"
object = { version = "0.32.0", default-features = false, features = ["std", "read"] } object = { version = "0.32.0", default-features = false, features = ["std", "read"] }

2
compiler/rustc_codegen_ssa/Cargo.toml
View File

@ -8,7 +8,7 @@ edition = "2021"
ar_archive_writer = "0.1.5" ar_archive_writer = "0.1.5"
bitflags = "2.4.1" bitflags = "2.4.1"
cc = "1.0.90" cc = "1.0.90"
itertools = "0.11" itertools = "0.12"
jobserver = "0.1.28" jobserver = "0.1.28"
pathdiff = "0.2.0" pathdiff = "0.2.0"
regex = "1.4" regex = "1.4"

2
compiler/rustc_hir_analysis/Cargo.toml
View File

@ -9,7 +9,7 @@ doctest = false
[dependencies] [dependencies]
# tidy-alphabetical-start # tidy-alphabetical-start
itertools = "0.11" itertools = "0.12"
rustc_arena = { path = "../rustc_arena" } rustc_arena = { path = "../rustc_arena" }
rustc_ast = { path = "../rustc_ast" } rustc_ast = { path = "../rustc_ast" }
rustc_attr = { path = "../rustc_attr" } rustc_attr = { path = "../rustc_attr" }

2
compiler/rustc_hir_typeck/Cargo.toml
View File

@ -5,7 +5,7 @@ edition = "2021"
[dependencies] [dependencies]
# tidy-alphabetical-start # tidy-alphabetical-start
itertools = "0.11" itertools = "0.12"
rustc_ast = { path = "../rustc_ast" } rustc_ast = { path = "../rustc_ast" }
rustc_ast_ir = { path = "../rustc_ast_ir" } rustc_ast_ir = { path = "../rustc_ast_ir" }
rustc_attr = { path = "../rustc_attr" } rustc_attr = { path = "../rustc_attr" }

1
compiler/rustc_middle/Cargo.toml
View File

@ -6,7 +6,6 @@ edition = "2021"
[dependencies] [dependencies]
# tidy-alphabetical-start # tidy-alphabetical-start
bitflags = "2.4.1" bitflags = "2.4.1"
derive_more = "0.99.17"
either = "1.5.0" either = "1.5.0"
field-offset = "0.3.5" field-offset = "0.3.5"
gsgdt = "0.1.2" gsgdt = "0.1.2"

2
compiler/rustc_mir_build/Cargo.toml
View File

@ -6,7 +6,7 @@ edition = "2021"
[dependencies] [dependencies]
# tidy-alphabetical-start # tidy-alphabetical-start
either = "1" either = "1"
itertools = "0.11" itertools = "0.12"
rustc_apfloat = "0.2.0" rustc_apfloat = "0.2.0"
rustc_arena = { path = "../rustc_arena" } rustc_arena = { path = "../rustc_arena" }
rustc_ast = { path = "../rustc_ast" } rustc_ast = { path = "../rustc_ast" }

2
compiler/rustc_mir_transform/Cargo.toml
View File

@ -6,7 +6,7 @@ edition = "2021"
[dependencies] [dependencies]
# tidy-alphabetical-start # tidy-alphabetical-start
either = "1" either = "1"
itertools = "0.11" itertools = "0.12"
rustc_arena = { path = "../rustc_arena" } rustc_arena = { path = "../rustc_arena" }
rustc_ast = { path = "../rustc_ast" } rustc_ast = { path = "../rustc_ast" }
rustc_attr = { path = "../rustc_attr" } rustc_attr = { path = "../rustc_attr" }

1
compiler/rustc_passes/Cargo.toml
View File

@ -5,7 +5,6 @@ edition = "2021"
[dependencies] [dependencies]
# tidy-alphabetical-start # tidy-alphabetical-start
itertools = "0.11"
rustc_ast = { path = "../rustc_ast" } rustc_ast = { path = "../rustc_ast" }
rustc_ast_pretty = { path = "../rustc_ast_pretty" } rustc_ast_pretty = { path = "../rustc_ast_pretty" }
rustc_attr = { path = "../rustc_attr" } rustc_attr = { path = "../rustc_attr" }

2
compiler/rustc_trait_selection/Cargo.toml
View File

@ -6,7 +6,7 @@ edition = "2021"
[dependencies] [dependencies]
# tidy-alphabetical-start # tidy-alphabetical-start
bitflags = "2.4.1" bitflags = "2.4.1"
itertools = "0.11.0" itertools = "0.12"
rustc_ast = { path = "../rustc_ast" } rustc_ast = { path = "../rustc_ast" }
rustc_ast_ir = { path = "../rustc_ast_ir" } rustc_ast_ir = { path = "../rustc_ast_ir" }
rustc_attr = { path = "../rustc_attr" } rustc_attr = { path = "../rustc_attr" }

2
compiler/rustc_transmute/Cargo.toml
View File

@ -29,5 +29,5 @@ rustc = [
[dev-dependencies] [dev-dependencies]
# tidy-alphabetical-start # tidy-alphabetical-start
itertools = "0.11" itertools = "0.12"
# tidy-alphabetical-end # tidy-alphabetical-end

2
compiler/rustc_ty_utils/Cargo.toml
View File

@ -5,7 +5,7 @@ edition = "2021"
[dependencies] [dependencies]
# tidy-alphabetical-start # tidy-alphabetical-start
itertools = "0.11" itertools = "0.12"
rustc_ast_ir = { path = "../rustc_ast_ir" } rustc_ast_ir = { path = "../rustc_ast_ir" }
rustc_data_structures = { path = "../rustc_data_structures" } rustc_data_structures = { path = "../rustc_data_structures" }
rustc_errors = { path = "../rustc_errors" } rustc_errors = { path = "../rustc_errors" }

2
src/librustdoc/Cargo.toml
View File

@ -9,7 +9,7 @@ path = "lib.rs"
[dependencies] [dependencies]
arrayvec = { version = "0.7", default-features = false } arrayvec = { version = "0.7", default-features = false }
askama = { version = "0.12", default-features = false, features = ["config"] } askama = { version = "0.12", default-features = false, features = ["config"] }
itertools = "0.11" itertools = "0.12"
indexmap = "2" indexmap = "2"
minifier = "0.3.0" minifier = "0.3.0"
once_cell = "1.10.0" once_cell = "1.10.0"

1
src/tools/tidy/src/deps.rs
View File

@ -209,7 +209,6 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
"cc", "cc",
"cfg-if", "cfg-if",
"compiler_builtins", "compiler_builtins",
"convert_case", // dependency of derive_more
"cpufeatures", "cpufeatures",
"crc32fast", "crc32fast",
"crossbeam-channel", "crossbeam-channel",