Skip to content

Commit 62cacda

Browse files
committed
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
2 parents ec837b5 + 5f7a34a commit 62cacda

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

crates/hir-ty/src/display.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1462,7 +1462,7 @@ fn generic_args_sans_defaults<'ga>(
14621462
// otherwise, if the arg is equal to the param default, hide it (unless the
14631463
// default is an error which can happen for the trait Self type)
14641464
#[allow(unstable_name_collisions)]
1465-
default_parameters.get(i).is_none_or(|default_parameter| {
1465+
IsNoneOr::is_none_or(default_parameters.get(i), |default_parameter| {
14661466
// !is_err(default_parameter.skip_binders())
14671467
// &&
14681468
arg != &default_parameter.clone().substitute(Interner, &parameters)

0 commit comments

Comments
 (0)