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

minor: Sync from rust
2025-10-02 22:54:58 +00:00 · 2024-06-20 06:22:59 +00:00 · 2024-06-20 06:22:59 +00:00 · 02bdd41dc7
commit 02bdd41dc7
parent 7c52065675 0a2652390a
2 changed files with 2 additions and 1 deletions
--- 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())
                        //     &&
--- a/2
+++ b/2
@ -1 +1 @@
-6579ed89f0fcc26da71afdd11d30d63f6f812a0a
+3d5d7a24f76006b391d8a53d903ae64c1b4a52d2