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

Rollup merge of #129086 - slanterns:is_none_or, r=dtolnay

Browse source 
Stabilize `is_none_or`

Closes: https://github.com/rust-lang/rust/issues/126383.

`@rustbot` label: +T-libs-api

r? libs-api
This commit is contained in:
Matthias Krüger 2024-08-16 19:58:58 +02:00 • committed by GitHub
commit a9a91233de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1462,7 +1462,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)] #[allow(unstable_name_collisions)]
default_parameters.get(i).is_none_or(|default_parameter| { IsNoneOr::is_none_or(default_parameters.get(i), |default_parameter| {
// !is_err(default_parameter.skip_binders()) // !is_err(default_parameter.skip_binders())
// && // &&
arg != &default_parameter.clone().substitute(Interner, &parameters) arg != &default_parameter.clone().substitute(Interner, &parameters)