Skip to content

Commit 6980fef

Browse files
committed
Auto merge of #126374 - workingjubilee:rollup-tz0utfr, r=workingjubilee
Rollup of 10 pull requests Successful merges: - #125674 (Rewrite `symlinked-extern`, `symlinked-rlib` and `symlinked-libraries` `run-make` tests in `rmake.rs` format) - #125688 (Walk into alias-eq nested goals even if normalization fails) - #126142 (Harmonize using root or leaf obligation in trait error reporting) - #126303 (Urls to docs in rust_hir) - #126328 (Add Option::is_none_or) - #126337 (Add test for walking order dependent opaque type behaviour) - #126353 (Move `MatchAgainstFreshVars` to old solver) - #126356 (docs(rustc): Improve discoverable of Cargo docs) - #126358 (safe transmute: support `Single` enums) - #126362 (Make `try_from_target_usize` method public) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 55fc418 + 740fe9f commit 6980fef

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

crates/hir-ty/src/display.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1387,6 +1387,7 @@ fn generic_args_sans_defaults<'ga>(
13871387
}
13881388
// otherwise, if the arg is equal to the param default, hide it (unless the
13891389
// default is an error which can happen for the trait Self type)
1390+
#[allow(unstable_name_collisions)]
13901391
default_parameters.get(i).is_none_or(|default_parameter| {
13911392
// !is_err(default_parameter.skip_binders())
13921393
// &&

0 commit comments

Comments
 (0)