Auto merge of #17460 - lnicola:sync-from-rust, r=lnicola

bors · bors · commit 02bdd41dc7eb · 2024-06-20T06:22:59.000Z
minor: Sync from rust
diff --git a/crates/hir-ty/src/display.rs b/crates/hir-ty/src/display.rs
@@ -1426,6 +1426,7 @@ fn generic_args_sans_defaults<'ga>(
                     }
                     // otherwise, if the arg is equal to the param default, hide it (unless the
                     // default is an error which can happen for the trait Self type)
+                    #[allow(unstable_name_collisions)]
                     default_parameters.get(i).is_none_or(|default_parameter| {
                         // !is_err(default_parameter.skip_binders())
                         //     &&
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-6579ed89f0fcc26da71afdd11d30d63f6f812a0a
+3d5d7a24f76006b391d8a53d903ae64c1b4a52d2

Original file line number	Diff line number	Diff line change
`@@ -1426,6 +1426,7 @@ fn generic_args_sans_defaults<'ga>(`
`1426`	`1426`	`}`
`1427`	`1427`	`// otherwise, if the arg is equal to the param default, hide it (unless the`
`1428`	`1428`	`// default is an error which can happen for the trait Self type)`
	`1429`	`+ #[allow(unstable_name_collisions)]`
`1429`	`1430`	`default_parameters.get(i).is_none_or(\|default_parameter\| {`
`1430`	`1431`	`// !is_err(default_parameter.skip_binders())`
`1431`	`1432`	`// &&`