Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #129162 - matthiaskrgr:rollup-r0oxdev, r=matthiaskrgr
Rollup of 6 pull requests
Successful merges:
- #128990 (Re-enable more debuginfo tests on freebsd)
- #129042 (Special-case alias ty during the delayed bug emission in `try_from_lit`)
- #129086 (Stabilize `is_none_or`)
- #129149 (Migrate `validate_json.py` script to rust in `run-make/rustdoc-map-file` test)
- #129154 (Fix wrong source location for some incorrect macro definitions)
- #129161 (Stabilize std::thread::Builder::spawn_unchecked)
r? `@ghost`
`@rustbot` modify labels: rollup
| -rw-r--r-- | crates/hir-ty/src/display.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/hir-ty/src/display.rs b/crates/hir-ty/src/display.rs index 7c481958d1..f406666ae5 100644 --- a/crates/hir-ty/src/display.rs +++ b/crates/hir-ty/src/display.rs @@ -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, ¶meters) |