Merge from rustc

The Miri Cronjob Bot · The Miri Cronjob Bot · commit 1ed46786494a · 2024-06-17T05:10:34.000Z
diff --git a/crates/hir-ty/src/display.rs b/crates/hir-ty/src/display.rs
@@ -1387,6 +1387,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())
                         //     &&

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