Skip to content

Commit

Permalink
Rollup merge of #129086 - slanterns:is_none_or, r=dtolnay
Browse files Browse the repository at this point in the history
Stabilize `is_none_or`

Closes: rust-lang/rust#126383.

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

r? libs-api
  • Loading branch information
matthiaskrgr authored Aug 16, 2024
2 parents 26241b8 + de28f30 commit a9a9123
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion crates/hir-ty/src/display.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1462,7 +1462,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| {
IsNoneOr::is_none_or(default_parameters.get(i), |default_parameter| {
// !is_err(default_parameter.skip_binders())
// &&
arg != &default_parameter.clone().substitute(Interner, &parameters)
Expand Down

0 comments on commit a9a9123

Please sign in to comment.