Commit df6ee909ef35c75aa58aa45af6ac071a9b8285c2 | rust

author	bors <bors@rust-lang.org> 2026-06-28 19:23:00 UTC
committer	bors <bors@rust-lang.org> 2026-06-28 19:23:00 UTC
log	df6ee909ef35c75aa58aa45af6ac071a9b8285c2
tree	8652651132ebd54baa3b015b27ca09362a928e4f
parent	2574810b228d53518cc2a13f2ee473195932a999
parent	6b1bbf97e8781080c7e6780899a1d98b5d3affb2

Auto merge of #158529 - JonathanBrouwer:rollup-rnUjpna, r=JonathanBrouwer

Rollup of 2 pull requests

Successful merges:

 - rust-lang/rust#156419 (Update itertools to 0.15)
 - rust-lang/rust#146561 (Change `Location<'_>` lifetime to `'static` in `Panic[Hook]Info`)

23 files changed, 66 insertions(+), 57 deletions(-)

Cargo.lock+31-22

...	...	@@ -687,7 +687,7 @@ dependencies = [
687	687	"color-print",
688	688	"declare_clippy_lint",
689	689	"filetime",
690		"itertools",
	690	"itertools 0.12.1",
691	691	"pulldown-cmark",
692	692	"regex",
693	693	"rustc_tools_util 0.4.2",
...	...	@@ -705,7 +705,7 @@ name = "clippy_config"
705	705	version = "0.1.98"
706	706	dependencies = [
707	707	"clippy_utils",
708		"itertools",
	708	"itertools 0.12.1",
709	709	"serde",
710	710	"toml 0.7.8",
711	711	"walkdir",
...	...	@@ -718,7 +718,7 @@ dependencies = [
718	718	"chrono",
719	719	"clap",
720	720	"indoc",
721		"itertools",
	721	"itertools 0.12.1",
722	722	"opener",
723	723	"rustc-literal-escaper",
724	724	"walkdir",
...	...	@@ -733,7 +733,7 @@ dependencies = [
733	733	"clippy_config",
734	734	"clippy_utils",
735	735	"declare_clippy_lint",
736		"itertools",
	736	"itertools 0.12.1",
737	737	"quine-mc_cluskey",
738	738	"regex-syntax",
739	739	"semver",
...	...	@@ -751,7 +751,7 @@ version = "0.0.1"
751	751	dependencies = [
752	752	"clippy_config",
753	753	"clippy_utils",
754		"itertools",
	754	"itertools 0.12.1",
755	755	"regex",
756	756	"rustc-semver",
757	757	]
...	...	@@ -761,7 +761,7 @@ name = "clippy_utils"
761	761	version = "0.1.98"
762	762	dependencies = [
763	763	"arrayvec",
764		"itertools",
	764	"itertools 0.12.1",
765	765	"rustc_apfloat",
766	766	"serde",
767	767	]
...	...	@@ -933,7 +933,7 @@ name = "coverage-dump"
933	933	version = "0.1.0"
934	934	dependencies = [
935	935	"anyhow",
936		"itertools",
	936	"itertools 0.15.0",
937	937	"leb128",
938	938	"md-5",
939	939	"miniz_oxide",
...	...	@@ -2129,6 +2129,15 @@ dependencies = [
2129	2129	"either",
2130	2130	]
2131	2131
	2132	[[package]]
	2133	name = "itertools"
	2134	version = "0.15.0"
	2135	source = "registry+https://github.com/rust-lang/crates.io-index"
	2136	checksum = "8b4baf93f58d4425749ca49a51c50ebab072c5df6994d08fed93541c331481dc"
	2137	dependencies = [
	2138	"either",
	2139	]
	2140
2132	2141	[[package]]
2133	2142	name = "itoa"
2134	2143	version = "1.0.15"
...	...	@@ -3686,7 +3695,7 @@ dependencies = [
3686	3695	name = "rustc_ast_passes"
3687	3696	version = "0.0.0"
3688	3697	dependencies = [
3689		"itertools",
	3698	"itertools 0.15.0",
3690	3699	"rustc_abi",
3691	3700	"rustc_ast",
3692	3701	"rustc_ast_pretty",
...	...	@@ -3706,7 +3715,7 @@ dependencies = [
3706	3715	name = "rustc_ast_pretty"
3707	3716	version = "0.0.0"
3708	3717	dependencies = [
3709		"itertools",
	3718	"itertools 0.15.0",
3710	3719	"rustc_ast",
3711	3720	"rustc_lexer",
3712	3721	"rustc_span",
...	...	@@ -3750,7 +3759,7 @@ name = "rustc_borrowck"
3750	3759	version = "0.0.0"
3751	3760	dependencies = [
3752	3761	"either",
3753		"itertools",
	3762	"itertools 0.15.0",
3754	3763	"polonius-engine",
3755	3764	"rustc_abi",
3756	3765	"rustc_data_structures",
...	...	@@ -3804,7 +3813,7 @@ version = "0.0.0"
3804	3813	dependencies = [
3805	3814	"bitflags",
3806	3815	"gimli 0.31.1",
3807		"itertools",
	3816	"itertools 0.15.0",
3808	3817	"libc",
3809	3818	"libloading 0.9.0",
3810	3819	"measureme",
...	...	@@ -3840,7 +3849,7 @@ dependencies = [
3840	3849	"bitflags",
3841	3850	"bstr",
3842	3851	"find-msvc-tools",
3843		"itertools",
	3852	"itertools 0.15.0",
3844	3853	"libc",
3845	3854	"object 0.37.3",
3846	3855	"pathdiff",
...	...	@@ -4110,7 +4119,7 @@ dependencies = [
4110	4119	name = "rustc_hir_analysis"
4111	4120	version = "0.0.0"
4112	4121	dependencies = [
4113		"itertools",
	4122	"itertools 0.15.0",
4114	4123	"rustc_abi",
4115	4124	"rustc_arena",
4116	4125	"rustc_ast",
...	...	@@ -4157,7 +4166,7 @@ dependencies = [
4157	4166	name = "rustc_hir_typeck"
4158	4167	version = "0.0.0"
4159	4168	dependencies = [
4160		"itertools",
	4169	"itertools 0.15.0",
4161	4170	"rustc_abi",
4162	4171	"rustc_ast",
4163	4172	"rustc_data_structures",
...	...	@@ -4436,7 +4445,7 @@ dependencies = [
4436	4445	name = "rustc_mir_build"
4437	4446	version = "0.0.0"
4438	4447	dependencies = [
4439		"itertools",
	4448	"itertools 0.15.0",
4440	4449	"rustc_abi",
4441	4450	"rustc_apfloat",
4442	4451	"rustc_arena",
...	...	@@ -4480,7 +4489,7 @@ name = "rustc_mir_transform"
4480	4489	version = "0.0.0"
4481	4490	dependencies = [
4482	4491	"either",
4483		"itertools",
	4492	"itertools 0.15.0",
4484	4493	"rustc_abi",
4485	4494	"rustc_arena",
4486	4495	"rustc_ast",
...	...	@@ -4685,7 +4694,7 @@ name = "rustc_resolve"
4685	4694	version = "0.0.0"
4686	4695	dependencies = [
4687	4696	"indexmap",
4688		"itertools",
	4697	"itertools 0.15.0",
4689	4698	"pulldown-cmark",
4690	4699	"rustc_arena",
4691	4700	"rustc_ast",
...	...	@@ -4847,7 +4856,7 @@ checksum = "a3b75158011a63889ba12084cf1224baad7bcad50f6ee7c842f772b74aa148ed"
4847	4856	name = "rustc_trait_selection"
4848	4857	version = "0.0.0"
4849	4858	dependencies = [
4850		"itertools",
	4859	"itertools 0.15.0",
4851	4860	"rustc_abi",
4852	4861	"rustc_ast",
4853	4862	"rustc_data_structures",
...	...	@@ -4881,7 +4890,7 @@ dependencies = [
4881	4890	name = "rustc_transmute"
4882	4891	version = "0.0.0"
4883	4892	dependencies = [
4884		"itertools",
	4893	"itertools 0.15.0",
4885	4894	"rustc_abi",
4886	4895	"rustc_data_structures",
4887	4896	"rustc_hir",
...	...	@@ -4895,7 +4904,7 @@ dependencies = [
4895	4904	name = "rustc_ty_utils"
4896	4905	version = "0.0.0"
4897	4906	dependencies = [
4898		"itertools",
	4907	"itertools 0.15.0",
4899	4908	"rustc_abi",
4900	4909	"rustc_data_structures",
4901	4910	"rustc_errors",
...	...	@@ -4972,7 +4981,7 @@ dependencies = [
4972	4981	"base64",
4973	4982	"expect-test",
4974	4983	"indexmap",
4975		"itertools",
	4984	"itertools 0.15.0",
4976	4985	"minifier",
4977	4986	"proc-macro2",
4978	4987	"pulldown-cmark-escape",
...	...	@@ -5060,7 +5069,7 @@ dependencies = [
5060	5069	"dirs",
5061	5070	"getopts",
5062	5071	"ignore",
5063		"itertools",
	5072	"itertools 0.12.1",
5064	5073	"regex",
5065	5074	"rustfmt-config_proc_macro",
5066	5075	"semver",

compiler/rustc_ast_passes/Cargo.toml+1-1

...	...	@@ -5,7 +5,7 @@ edition = "2024"
5	5
6	6	[dependencies]
7	7	# tidy-alphabetical-start
8		itertools = "0.12"
	8	itertools = "0.15"
9	9	rustc_abi = { path = "../rustc_abi" }
10	10	rustc_ast = { path = "../rustc_ast" }
11	11	rustc_ast_pretty = { path = "../rustc_ast_pretty" }

compiler/rustc_ast_pretty/Cargo.toml+1-1

...	...	@@ -5,7 +5,7 @@ edition = "2024"
5	5
6	6	[dependencies]
7	7	# tidy-alphabetical-start
8		itertools = "0.12"
	8	itertools = "0.15"
9	9	rustc_ast = { path = "../rustc_ast" }
10	10	rustc_lexer = { path = "../rustc_lexer" }
11	11	rustc_span = { path = "../rustc_span" }

compiler/rustc_ast_pretty/src/pprust/state/expr.rs+3-3

...	...	@@ -1,7 +1,7 @@
1	1	use std::fmt::Write;
2	2
3	3	use ast::{ForLoopKind, MatchKind};
4		use itertools::{Itertools, Position};
	4	use itertools::Itertools;
5	5	use rustc_ast::util::classify;
6	6	use rustc_ast::util::literal::escape_byte_str_symbol;
7	7	use rustc_ast::util::parser::{self, ExprPrecedence, Fixity};
...	...	@@ -170,8 +170,8 @@ impl<'a> State<'a> {
170	170	}
171	171	let cb = self.cbox(0);
172	172	for (pos, field) in fields.iter().with_position() {
173		let is_first = matches!(pos, Position::First \| Position::Only);
174		let is_last = matches!(pos, Position::Last \| Position::Only);
	173	let is_first = pos.is_first();
	174	let is_last = pos.is_last();
175	175	self.maybe_print_comment(field.span.hi());
176	176	self.print_outer_attributes(&field.attrs);
177	177	if is_first {

compiler/rustc_ast_pretty/src/pprust/state/item.rs+2-2

...	...	@@ -1,5 +1,5 @@
1	1	use ast::StaticItem;
2		use itertools::{Itertools, Position};
	2	use itertools::Itertools;
3	3	use rustc_ast::{self as ast, EiiImpl, ModKind, Safety, TraitAlias};
4	4	use rustc_span::Ident;
5	5
...	...	@@ -923,7 +923,7 @@ impl<'a> State<'a> {
923	923	self.zerobreak();
924	924	let ib = self.ibox(0);
925	925	for (pos, use_tree) in items.iter().with_position() {
926		let is_last = matches!(pos, Position::Last \| Position::Only);
	926	let is_last = pos.is_last();
927	927	self.print_use_tree(&use_tree.0);
928	928	if !is_last {
929	929	self.word(",");

compiler/rustc_borrowck/Cargo.toml+1-1

...	...	@@ -6,7 +6,7 @@ edition = "2024"
6	6	[dependencies]
7	7	# tidy-alphabetical-start
8	8	either = "1.5.0"
9		itertools = "0.12"
	9	itertools = "0.15"
10	10	polonius-engine = "0.13.0"
11	11	rustc_abi = { path = "../rustc_abi" }
12	12	rustc_data_structures = { path = "../rustc_data_structures" }

compiler/rustc_codegen_llvm/Cargo.toml+1-1

...	...	@@ -12,7 +12,7 @@ bitflags = "2.4.1"
12	12	# To avoid duplicate dependencies, this should match the version of gimli used
13	13	# by `rustc_codegen_ssa` via its `thorin-dwp` dependency.
14	14	gimli = "0.31"
15		itertools = "0.12"
	15	itertools = "0.15"
16	16	libc = "0.2"
17	17	libloading = { version = "0.9.0" }
18	18	measureme = "12.0.1"

compiler/rustc_codegen_ssa/Cargo.toml+1-1

...	...	@@ -9,7 +9,7 @@ ar_archive_writer = "0.5"
9	9	bitflags = "2.4.1"
10	10	bstr = "1.11.3"
11	11	find-msvc-tools = "0.1.2"
12		itertools = "0.12"
	12	itertools = "0.15"
13	13	pathdiff = "0.2.0"
14	14	regex = "1.4"
15	15	rustc_abi = { path = "../rustc_abi" }

compiler/rustc_hir_analysis/Cargo.toml+1-1

...	...	@@ -9,7 +9,7 @@ doctest = false
9	9
10	10	[dependencies]
11	11	# tidy-alphabetical-start
12		itertools = "0.12"
	12	itertools = "0.15"
13	13	rustc_abi = { path = "../rustc_abi" }
14	14	rustc_arena = { path = "../rustc_arena" }
15	15	rustc_ast = { path = "../rustc_ast" }

compiler/rustc_hir_typeck/Cargo.toml+1-1

...	...	@@ -5,7 +5,7 @@ edition = "2024"
5	5
6	6	[dependencies]
7	7	# tidy-alphabetical-start
8		itertools = "0.12"
	8	itertools = "0.15"
9	9	rustc_abi = { path = "../rustc_abi" }
10	10	rustc_ast = { path = "../rustc_ast" }
11	11	rustc_data_structures = { path = "../rustc_data_structures" }

compiler/rustc_mir_build/Cargo.toml+1-1

...	...	@@ -5,7 +5,7 @@ edition = "2024"
5	5
6	6	[dependencies]
7	7	# tidy-alphabetical-start
8		itertools = "0.12"
	8	itertools = "0.15"
9	9	rustc_abi = { path = "../rustc_abi" }
10	10	rustc_apfloat = "0.2.0"
11	11	rustc_arena = { path = "../rustc_arena" }

compiler/rustc_mir_build/src/builder/matches/mod.rs+3-3

...	...	@@ -9,7 +9,7 @@ use std::borrow::Borrow;
9	9	use std::sync::Arc;
10	10	use std::{debug_assert_matches, mem};
11	11
12		use itertools::{Itertools, Position};
	12	use itertools::Itertools;
13	13	use rustc_abi::{FIRST_VARIANT, FieldIdx, VariantIdx};
14	14	use rustc_data_structures::fx::FxIndexMap;
15	15	use rustc_data_structures::stack::ensure_sufficient_stack;
...	...	@@ -551,9 +551,9 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
551	551	// the drop order for the first sub-branch, we lower sub-branches in reverse (#142163).
552	552	let target_block = self.cfg.start_new_block();
553	553	for (pos, sub_branch) in branch.sub_branches.into_iter().rev().with_position() {
554		debug_assert!(pos != Position::Only);
	554	debug_assert!(!pos.is_exactly_one());
555	555	let schedule_drops =
556		if pos == Position::Last { ScheduleDrops::Yes } else { ScheduleDrops::No };
	556	if pos.is_last() { ScheduleDrops::Yes } else { ScheduleDrops::No };
557	557	let binding_end = self.bind_and_guard_matched_candidate(
558	558	sub_branch,
559	559	fake_borrow_temps,

compiler/rustc_mir_transform/Cargo.toml+1-1

...	...	@@ -6,7 +6,7 @@ edition = "2024"
6	6	[dependencies]
7	7	# tidy-alphabetical-start
8	8	either = "1"
9		itertools = "0.12"
	9	itertools = "0.15"
10	10	rustc_abi = { path = "../rustc_abi" }
11	11	rustc_arena = { path = "../rustc_arena" }
12	12	rustc_ast = { path = "../rustc_ast" }

compiler/rustc_resolve/Cargo.toml+1-1

...	...	@@ -6,7 +6,7 @@ edition = "2024"
6	6	[dependencies]
7	7	# tidy-alphabetical-start
8	8	indexmap = "2.4.0"
9		itertools = "0.12"
	9	itertools = "0.15"
10	10	pulldown-cmark = { version = "0.11", features = [
11	11	"html",
12	12	], default-features = false }

compiler/rustc_trait_selection/Cargo.toml+1-1

...	...	@@ -5,7 +5,7 @@ edition = "2024"
5	5
6	6	[dependencies]
7	7	# tidy-alphabetical-start
8		itertools = "0.12"
	8	itertools = "0.15"
9	9	rustc_abi = { path = "../rustc_abi" }
10	10	rustc_ast = { path = "../rustc_ast" }
11	11	rustc_data_structures = { path = "../rustc_data_structures" }

compiler/rustc_transmute/Cargo.toml+1-1

...	...	@@ -16,7 +16,7 @@ tracing = "0.1"
16	16
17	17	[dev-dependencies]
18	18	# tidy-alphabetical-start
19		itertools = "0.12"
	19	itertools = "0.15"
20	20	# tidy-alphabetical-end
21	21
22	22	[features]

compiler/rustc_ty_utils/Cargo.toml+1-1

...	...	@@ -5,7 +5,7 @@ edition = "2024"
5	5
6	6	[dependencies]
7	7	# tidy-alphabetical-start
8		itertools = "0.12"
	8	itertools = "0.15"
9	9	rustc_abi = { path = "../rustc_abi" }
10	10	rustc_data_structures = { path = "../rustc_data_structures" }
11	11	rustc_errors = { path = "../rustc_errors" }

library/core/src/panic/panic_info.rs+4-4

...	...	@@ -13,7 +13,7 @@ use crate::panic::Location;
13	13	#[derive(Debug)]
14	14	pub struct PanicInfo<'a> {
15	15	message: &'a fmt::Arguments<'a>,
16		location: &'a Location<'a>,
	16	location: &'static Location<'static>,
17	17	can_unwind: bool,
18	18	force_no_backtrace: bool,
19	19	}
...	...	@@ -33,7 +33,7 @@ impl<'a> PanicInfo<'a> {
33	33	#[inline]
34	34	pub(crate) fn new(
35	35	message: &'a fmt::Arguments<'a>,
36		location: &'a Location<'a>,
	36	location: &'static Location<'static>,
37	37	can_unwind: bool,
38	38	force_no_backtrace: bool,
39	39	) -> Self {
...	...	@@ -88,10 +88,10 @@ impl<'a> PanicInfo<'a> {
88	88	/// ```
89	89	#[must_use]
90	90	#[stable(feature = "panic_hooks", since = "1.10.0")]
91		pub fn location(&self) -> Option<&Location<'_>> {
	91	pub fn location(&self) -> Option<&'static Location<'static>> {
92	92	// NOTE: If this is changed to sometimes return None,
93	93	// deal with that case in std::panicking::default_hook and core::panicking::panic_fmt.
94		Some(&self.location)
	94	Some(self.location)
95	95	}
96	96
97	97	/// Returns the payload associated with the panic.

library/std/src/panic.rs+4-4

...	...	@@ -41,7 +41,7 @@ pub type PanicInfo<'a> = PanicHookInfo<'a>;
41	41	#[derive(Debug)]
42	42	pub struct PanicHookInfo<'a> {
43	43	payload: &'a (dyn Any + Send),
44		location: &'a Location<'a>,
	44	location: &'static Location<'static>,
45	45	can_unwind: bool,
46	46	force_no_backtrace: bool,
47	47	}
...	...	@@ -49,7 +49,7 @@ pub struct PanicHookInfo<'a> {
49	49	impl<'a> PanicHookInfo<'a> {
50	50	#[inline]
51	51	pub(crate) fn new(
52		location: &'a Location<'a>,
	52	location: &'static Location<'static>,
53	53	payload: &'a (dyn Any + Send),
54	54	can_unwind: bool,
55	55	force_no_backtrace: bool,
...	...	@@ -160,10 +160,10 @@ impl<'a> PanicHookInfo<'a> {
160	160	#[must_use]
161	161	#[inline]
162	162	#[stable(feature = "panic_hooks", since = "1.10.0")]
163		pub fn location(&self) -> Option<&Location<'_>> {
	163	pub fn location(&self) -> Option<&'static Location<'static>> {
164	164	// NOTE: If this is changed to sometimes return None,
165	165	// deal with that case in std::panicking::default_hook and core::panicking::panic_fmt.
166		Some(&self.location)
	166	Some(self.location)
167	167	}
168	168
169	169	/// Returns whether the panic handler is allowed to unwind the stack from

library/std/src/panicking.rs+1-1

...	...	@@ -776,7 +776,7 @@ fn payload_as_str(payload: &dyn Any) -> &str {
776	776	#[optimize(size)]
777	777	fn panic_with_hook(
778	778	payload: &mut dyn PanicPayload,
779		location: &Location<'_>,
	779	location: &'static Location<'static>,
780	780	can_unwind: bool,
781	781	force_no_backtrace: bool,
782	782	) -> ! {

src/librustdoc/Cargo.toml+1-1

...	...	@@ -13,7 +13,7 @@ arrayvec = { version = "0.7", default-features = false }
13	13	askama = { version = "0.16.0", default-features = false, features = ["alloc", "config", "derive"] }
14	14	base64 = "0.21.7"
15	15	indexmap = { version = "2", features = ["serde"] }
16		itertools = "0.12"
	16	itertools = "0.15"
17	17	minifier = { version = "0.3.5", default-features = false }
18	18	proc-macro2 = "1.0.103"
19	19	pulldown-cmark-escape = { version = "0.11.0", features = ["simd"] }

src/librustdoc/html/render/sorted_template.rs+3-3

...	...	@@ -3,7 +3,7 @@ use std::fmt::{self, Write as _};
3	3	use std::marker::PhantomData;
4	4	use std::str::FromStr;
5	5
6		use itertools::{Itertools as _, Position};
	6	use itertools::Itertools as _;
7	7	use serde::{Deserialize, Serialize};
8	8
9	9	/// Append-only templates for sorted, deduplicated lists of items.
...	...	@@ -62,7 +62,7 @@ impl<F: FileFormat> fmt::Display for SortedTemplate<F> {
62	62	write!(f, "{}", self.before)?;
63	63	for (p, fragment) in self.fragments.iter().with_position() {
64	64	let mut f = DeltaWriter { inner: &mut f, delta: 0 };
65		let sep = if matches!(p, Position::First \| Position::Only) { "" } else { F::SEPARATOR };
	65	let sep = if p.is_first() { "" } else { F::SEPARATOR };
66	66	f.write_str(sep)?;
67	67	f.write_str(fragment)?;
68	68	fragment_lengths.push(f.delta);
...	...	@@ -95,7 +95,7 @@ impl<F: FileFormat> FromStr for SortedTemplate<F> {
95	95	let (fragment, rest) =
96	96	s.split_at_checked(index).ok_or(Error("invalid fragment length: out of bounds"))?;
97	97	s = rest;
98		let sep = if matches!(p, Position::First \| Position::Only) { "" } else { F::SEPARATOR };
	98	let sep = if p.is_first() { "" } else { F::SEPARATOR };
99	99	let fragment = fragment
100	100	.strip_prefix(sep)
101	101	.ok_or(Error("invalid fragment length: expected to find separator here"))?;

src/tools/coverage-dump/Cargo.toml+1-1

...	...	@@ -7,7 +7,7 @@ edition = "2021"
7	7
8	8	[dependencies]
9	9	anyhow = "1.0.71"
10		itertools = "0.12"
	10	itertools = "0.15"
11	11	leb128 = "0.2.5"
12	12	md5 = { package = "md-5" , version = "0.10.5" }
13	13	miniz_oxide = "0.8.8"