Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #17460 - lnicola:sync-from-rust, r=lnicola
minor: Sync from rust
| -rw-r--r-- | crates/hir-ty/src/display.rs | 1 | ||||
| -rw-r--r-- | rust-version | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/crates/hir-ty/src/display.rs b/crates/hir-ty/src/display.rs index ff78fe0d54..cd31845a51 100644 --- 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 index 207ef6c5de..c605feb6ee 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -6579ed89f0fcc26da71afdd11d30d63f6f812a0a +3d5d7a24f76006b391d8a53d903ae64c1b4a52d2 |