Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-31 23:38:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #126374 - workingjubilee:rollup-tz0utfr, r=workingjubilee

Browse source 
Rollup of 10 pull requests

Successful merges:

 - #125674 (Rewrite `symlinked-extern`, `symlinked-rlib` and `symlinked-libraries` `run-make` tests in `rmake.rs` format)
 - #125688 (Walk into alias-eq nested goals even if normalization fails)
 - #126142 (Harmonize using root or leaf obligation in trait error reporting)
 - #126303 (Urls to docs in rust_hir)
 - #126328 (Add Option::is_none_or)
 - #126337 (Add test for walking order dependent opaque type behaviour)
 - #126353 (Move `MatchAgainstFreshVars` to old solver)
 - #126356 (docs(rustc): Improve discoverable of Cargo docs)
 - #126358 (safe transmute: support `Single` enums)
 - #126362 (Make `try_from_target_usize` method public)

r? `@ghost`
`@rustbot` modify labels: rollup
This commit is contained in:
bors 2024-06-13 05:00:13 +00:00
commit 6980fef603
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1387,6 +1387,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())
// && // &&