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

Merge from rustc

Browse source
This commit is contained in:
The Miri Cronjob Bot 2024-08-17 05:02:50 +00:00
commit a38f64bef8
2 changed files with 5 additions and 3 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)

6
crates/hir-ty/src/lib.rs
View file

@ -15,8 +15,10 @@ extern crate rustc_abi;
#[cfg(not(feature = "in-rust-tree"))] #[cfg(not(feature = "in-rust-tree"))]
extern crate ra_ap_rustc_abi as rustc_abi; extern crate ra_ap_rustc_abi as rustc_abi;
// Use the crates.io version unconditionally until the API settles enough that we can switch to #[cfg(feature = "in-rust-tree")]
// using the in-tree one. extern crate rustc_pattern_analysis;
#[cfg(not(feature = "in-rust-tree"))]
extern crate ra_ap_rustc_pattern_analysis as rustc_pattern_analysis; extern crate ra_ap_rustc_pattern_analysis as rustc_pattern_analysis;
mod builder; mod builder;