Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 31 additions & 22 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,7 @@ dependencies = [
"color-print",
"declare_clippy_lint",
"filetime",
"itertools",
"itertools 0.12.1",
"pulldown-cmark",
"regex",
"rustc_tools_util 0.4.2",
Expand All @@ -705,7 +705,7 @@ name = "clippy_config"
version = "0.1.98"
dependencies = [
"clippy_utils",
"itertools",
"itertools 0.12.1",
"serde",
"toml 0.7.8",
"walkdir",
Expand All @@ -718,7 +718,7 @@ dependencies = [
"chrono",
"clap",
"indoc",
"itertools",
"itertools 0.12.1",
"opener",
"rustc-literal-escaper",
"walkdir",
Expand All @@ -733,7 +733,7 @@ dependencies = [
"clippy_config",
"clippy_utils",
"declare_clippy_lint",
"itertools",
"itertools 0.12.1",
"quine-mc_cluskey",
"regex-syntax",
"semver",
Expand All @@ -751,7 +751,7 @@ version = "0.0.1"
dependencies = [
"clippy_config",
"clippy_utils",
"itertools",
"itertools 0.12.1",
"regex",
"rustc-semver",
]
Expand All @@ -761,7 +761,7 @@ name = "clippy_utils"
version = "0.1.98"
dependencies = [
"arrayvec",
"itertools",
"itertools 0.12.1",
"rustc_apfloat",
"serde",
]
Expand Down Expand Up @@ -933,7 +933,7 @@ name = "coverage-dump"
version = "0.1.0"
dependencies = [
"anyhow",
"itertools",
"itertools 0.15.0",
"leb128",
"md-5",
"miniz_oxide",
Expand Down Expand Up @@ -2129,6 +2129,15 @@ dependencies = [
"either",
]

[[package]]
name = "itertools"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b4baf93f58d4425749ca49a51c50ebab072c5df6994d08fed93541c331481dc"
dependencies = [
"either",
]

[[package]]
name = "itoa"
version = "1.0.15"
Expand Down Expand Up @@ -3686,7 +3695,7 @@ dependencies = [
name = "rustc_ast_passes"
version = "0.0.0"
dependencies = [
"itertools",
"itertools 0.15.0",
"rustc_abi",
"rustc_ast",
"rustc_ast_pretty",
Expand All @@ -3706,7 +3715,7 @@ dependencies = [
name = "rustc_ast_pretty"
version = "0.0.0"
dependencies = [
"itertools",
"itertools 0.15.0",
"rustc_ast",
"rustc_lexer",
"rustc_span",
Expand Down Expand Up @@ -3750,7 +3759,7 @@ name = "rustc_borrowck"
version = "0.0.0"
dependencies = [
"either",
"itertools",
"itertools 0.15.0",
"polonius-engine",
"rustc_abi",
"rustc_data_structures",
Expand Down Expand Up @@ -3804,7 +3813,7 @@ version = "0.0.0"
dependencies = [
"bitflags",
"gimli 0.31.1",
"itertools",
"itertools 0.15.0",
"libc",
"libloading 0.9.0",
"measureme",
Expand Down Expand Up @@ -3840,7 +3849,7 @@ dependencies = [
"bitflags",
"bstr",
"find-msvc-tools",
"itertools",
"itertools 0.15.0",
"libc",
"object 0.37.3",
"pathdiff",
Expand Down Expand Up @@ -4110,7 +4119,7 @@ dependencies = [
name = "rustc_hir_analysis"
version = "0.0.0"
dependencies = [
"itertools",
"itertools 0.15.0",
"rustc_abi",
"rustc_arena",
"rustc_ast",
Expand Down Expand Up @@ -4157,7 +4166,7 @@ dependencies = [
name = "rustc_hir_typeck"
version = "0.0.0"
dependencies = [
"itertools",
"itertools 0.15.0",
"rustc_abi",
"rustc_ast",
"rustc_data_structures",
Expand Down Expand Up @@ -4435,7 +4444,7 @@ dependencies = [
name = "rustc_mir_build"
version = "0.0.0"
dependencies = [
"itertools",
"itertools 0.15.0",
"rustc_abi",
"rustc_apfloat",
"rustc_arena",
Expand Down Expand Up @@ -4479,7 +4488,7 @@ name = "rustc_mir_transform"
version = "0.0.0"
dependencies = [
"either",
"itertools",
"itertools 0.15.0",
"rustc_abi",
"rustc_arena",
"rustc_ast",
Expand Down Expand Up @@ -4684,7 +4693,7 @@ name = "rustc_resolve"
version = "0.0.0"
dependencies = [
"indexmap",
"itertools",
"itertools 0.15.0",
"pulldown-cmark",
"rustc_arena",
"rustc_ast",
Expand Down Expand Up @@ -4846,7 +4855,7 @@ checksum = "a3b75158011a63889ba12084cf1224baad7bcad50f6ee7c842f772b74aa148ed"
name = "rustc_trait_selection"
version = "0.0.0"
dependencies = [
"itertools",
"itertools 0.15.0",
"rustc_abi",
"rustc_ast",
"rustc_data_structures",
Expand Down Expand Up @@ -4880,7 +4889,7 @@ dependencies = [
name = "rustc_transmute"
version = "0.0.0"
dependencies = [
"itertools",
"itertools 0.15.0",
"rustc_abi",
"rustc_data_structures",
"rustc_hir",
Expand All @@ -4894,7 +4903,7 @@ dependencies = [
name = "rustc_ty_utils"
version = "0.0.0"
dependencies = [
"itertools",
"itertools 0.15.0",
"rustc_abi",
"rustc_data_structures",
"rustc_errors",
Expand Down Expand Up @@ -4971,7 +4980,7 @@ dependencies = [
"base64",
"expect-test",
"indexmap",
"itertools",
"itertools 0.15.0",
"minifier",
"proc-macro2",
"pulldown-cmark-escape",
Expand Down Expand Up @@ -5059,7 +5068,7 @@ dependencies = [
"dirs",
"getopts",
"ignore",
"itertools",
"itertools 0.12.1",
"regex",
"rustfmt-config_proc_macro",
"semver",
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_ast_passes/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2024"

[dependencies]
# tidy-alphabetical-start
itertools = "0.12"
itertools = "0.15"
rustc_abi = { path = "../rustc_abi" }
rustc_ast = { path = "../rustc_ast" }
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_ast_pretty/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2024"

[dependencies]
# tidy-alphabetical-start
itertools = "0.12"
itertools = "0.15"
rustc_ast = { path = "../rustc_ast" }
rustc_lexer = { path = "../rustc_lexer" }
rustc_span = { path = "../rustc_span" }
Expand Down
6 changes: 3 additions & 3 deletions compiler/rustc_ast_pretty/src/pprust/state/expr.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::fmt::Write;

use ast::{ForLoopKind, MatchKind};
use itertools::{Itertools, Position};
use itertools::Itertools;
use rustc_ast::util::classify;
use rustc_ast::util::literal::escape_byte_str_symbol;
use rustc_ast::util::parser::{self, ExprPrecedence, Fixity};
Expand Down Expand Up @@ -170,8 +170,8 @@ impl<'a> State<'a> {
}
let cb = self.cbox(0);
for (pos, field) in fields.iter().with_position() {
let is_first = matches!(pos, Position::First | Position::Only);
let is_last = matches!(pos, Position::Last | Position::Only);
let is_first = pos.is_first();
let is_last = pos.is_last();
self.maybe_print_comment(field.span.hi());
self.print_outer_attributes(&field.attrs);
if is_first {
Expand Down
4 changes: 2 additions & 2 deletions compiler/rustc_ast_pretty/src/pprust/state/item.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use ast::StaticItem;
use itertools::{Itertools, Position};
use itertools::Itertools;
use rustc_ast::{self as ast, EiiImpl, ModKind, Safety, TraitAlias};
use rustc_span::Ident;

Expand Down Expand Up @@ -923,7 +923,7 @@ impl<'a> State<'a> {
self.zerobreak();
let ib = self.ibox(0);
for (pos, use_tree) in items.iter().with_position() {
let is_last = matches!(pos, Position::Last | Position::Only);
let is_last = pos.is_last();
self.print_use_tree(&use_tree.0);
if !is_last {
self.word(",");
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_borrowck/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2024"
[dependencies]
# tidy-alphabetical-start
either = "1.5.0"
itertools = "0.12"
itertools = "0.15"
polonius-engine = "0.13.0"
rustc_abi = { path = "../rustc_abi" }
rustc_data_structures = { path = "../rustc_data_structures" }
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_codegen_llvm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ bitflags = "2.4.1"
# To avoid duplicate dependencies, this should match the version of gimli used
# by `rustc_codegen_ssa` via its `thorin-dwp` dependency.
gimli = "0.31"
itertools = "0.12"
itertools = "0.15"
libc = "0.2"
libloading = { version = "0.9.0" }
measureme = "12.0.1"
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_codegen_ssa/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ar_archive_writer = "0.5"
bitflags = "2.4.1"
bstr = "1.11.3"
find-msvc-tools = "0.1.2"
itertools = "0.12"
itertools = "0.15"
pathdiff = "0.2.0"
regex = "1.4"
rustc_abi = { path = "../rustc_abi" }
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_hir_analysis/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ doctest = false

[dependencies]
# tidy-alphabetical-start
itertools = "0.12"
itertools = "0.15"
rustc_abi = { path = "../rustc_abi" }
rustc_arena = { path = "../rustc_arena" }
rustc_ast = { path = "../rustc_ast" }
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_hir_typeck/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2024"

[dependencies]
# tidy-alphabetical-start
itertools = "0.12"
itertools = "0.15"
rustc_abi = { path = "../rustc_abi" }
rustc_ast = { path = "../rustc_ast" }
rustc_data_structures = { path = "../rustc_data_structures" }
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_mir_build/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2024"

[dependencies]
# tidy-alphabetical-start
itertools = "0.12"
itertools = "0.15"
rustc_abi = { path = "../rustc_abi" }
rustc_apfloat = "0.2.0"
rustc_arena = { path = "../rustc_arena" }
Expand Down
6 changes: 3 additions & 3 deletions compiler/rustc_mir_build/src/builder/matches/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use std::borrow::Borrow;
use std::sync::Arc;
use std::{debug_assert_matches, mem};

use itertools::{Itertools, Position};
use itertools::Itertools;
use rustc_abi::{FIRST_VARIANT, FieldIdx, VariantIdx};
use rustc_data_structures::fx::FxIndexMap;
use rustc_data_structures::stack::ensure_sufficient_stack;
Expand Down Expand Up @@ -551,9 +551,9 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
// the drop order for the first sub-branch, we lower sub-branches in reverse (#142163).
let target_block = self.cfg.start_new_block();
for (pos, sub_branch) in branch.sub_branches.into_iter().rev().with_position() {
debug_assert!(pos != Position::Only);
debug_assert!(!pos.is_exactly_one());
let schedule_drops =
if pos == Position::Last { ScheduleDrops::Yes } else { ScheduleDrops::No };
if pos.is_last() { ScheduleDrops::Yes } else { ScheduleDrops::No };
let binding_end = self.bind_and_guard_matched_candidate(
sub_branch,
fake_borrow_temps,
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_mir_transform/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2024"
[dependencies]
# tidy-alphabetical-start
either = "1"
itertools = "0.12"
itertools = "0.15"
rustc_abi = { path = "../rustc_abi" }
rustc_arena = { path = "../rustc_arena" }
rustc_ast = { path = "../rustc_ast" }
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_resolve/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2024"
[dependencies]
# tidy-alphabetical-start
indexmap = "2.4.0"
itertools = "0.12"
itertools = "0.15"
pulldown-cmark = { version = "0.11", features = [
"html",
], default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_trait_selection/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2024"

[dependencies]
# tidy-alphabetical-start
itertools = "0.12"
itertools = "0.15"
rustc_abi = { path = "../rustc_abi" }
rustc_ast = { path = "../rustc_ast" }
rustc_data_structures = { path = "../rustc_data_structures" }
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_transmute/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ tracing = "0.1"

[dev-dependencies]
# tidy-alphabetical-start
itertools = "0.12"
itertools = "0.15"
# tidy-alphabetical-end

[features]
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_ty_utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2024"

[dependencies]
# tidy-alphabetical-start
itertools = "0.12"
itertools = "0.15"
rustc_abi = { path = "../rustc_abi" }
rustc_data_structures = { path = "../rustc_data_structures" }
rustc_errors = { path = "../rustc_errors" }
Expand Down
2 changes: 1 addition & 1 deletion src/librustdoc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ arrayvec = { version = "0.7", default-features = false }
askama = { version = "0.16.0", default-features = false, features = ["alloc", "config", "derive"] }
base64 = "0.21.7"
indexmap = { version = "2", features = ["serde"] }
itertools = "0.12"
itertools = "0.15"
minifier = { version = "0.3.5", default-features = false }
proc-macro2 = "1.0.103"
pulldown-cmark-escape = { version = "0.11.0", features = ["simd"] }
Expand Down
Loading
Loading