language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 07:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source 
minor: Sync from rust
This commit is contained in:
bors 2024-06-20 06:22:59 +00:00
commit 02bdd41dc7
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/hir-ty/src/display.rs
View file

@ -1426,6 +1426,7 @@ fn generic_args_sans_defaults<'ga>(
} }
// otherwise, if the arg is equal to the param default, hide it (unless the // 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) // 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| { default_parameters.get(i).is_none_or(|default_parameter| {
// !is_err(default_parameter.skip_binders()) // !is_err(default_parameter.skip_binders())
// && // &&

2
rust-version
View file

@ -1 +1 @@
6579ed89f0fcc26da71afdd11d30d63f6f812a0a 3d5d7a24f76006b391d8a53d903ae64c1b4a52d2