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

Merge ref 'caccb4d0368b' from rust-lang/rust

Browse source 
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: caccb4d0368bd918ef6668af8e13834d07040417
Filtered ref: 0f345ed05d
Upstream diff: 21a19c297d...caccb4d036

This merge was created using https://github.com/rust-lang/josh-sync.
This commit is contained in:
The rustc-josh-sync Cronjob Bot 2025-09-25 04:16:26 +00:00
commit f69f3a6e01
6 changed files with 5 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/hir-def/src/lib.rs
View file

@ -15,10 +15,6 @@ extern crate rustc_parse_format;
#[cfg(not(feature = "in-rust-tree"))] #[cfg(not(feature = "in-rust-tree"))]
extern crate ra_ap_rustc_parse_format as rustc_parse_format; extern crate ra_ap_rustc_parse_format as rustc_parse_format;
#[cfg(feature = "in-rust-tree")]
extern crate rustc_abi;
#[cfg(not(feature = "in-rust-tree"))]
extern crate ra_ap_rustc_abi as rustc_abi; extern crate ra_ap_rustc_abi as rustc_abi;
pub mod db; pub mod db;

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

@ -3,45 +3,24 @@
#![cfg_attr(feature = "in-rust-tree", feature(rustc_private))] #![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
#[cfg(feature = "in-rust-tree")] // FIXME: We used to import `rustc_*` deps from `rustc_private` with `feature = "in-rust-tree" but
extern crate rustc_index; // temporarily switched to crates.io versions due to hardships that working on them from rustc
// demands corresponding changes on rust-analyzer at the same time.
// For details, see the zulip discussion below:
// https://rust-lang.zulipchat.com/#narrow/channel/185405-t-compiler.2Frust-analyzer/topic/relying.20on.20in-tree.20.60rustc_type_ir.60.2F.60rustc_next_trait_solver.60/with/541055689
#[cfg(not(feature = "in-rust-tree"))]
extern crate ra_ap_rustc_index as rustc_index; extern crate ra_ap_rustc_index as rustc_index;
#[cfg(feature = "in-rust-tree")]
extern crate rustc_abi;
#[cfg(not(feature = "in-rust-tree"))]
extern crate ra_ap_rustc_abi as rustc_abi; extern crate ra_ap_rustc_abi as rustc_abi;
#[cfg(feature = "in-rust-tree")]
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;
#[cfg(feature = "in-rust-tree")]
extern crate rustc_ast_ir;
#[cfg(not(feature = "in-rust-tree"))]
extern crate ra_ap_rustc_ast_ir as rustc_ast_ir; extern crate ra_ap_rustc_ast_ir as rustc_ast_ir;
#[cfg(feature = "in-rust-tree")]
extern crate rustc_type_ir;
#[cfg(not(feature = "in-rust-tree"))]
extern crate ra_ap_rustc_type_ir as rustc_type_ir; extern crate ra_ap_rustc_type_ir as rustc_type_ir;
#[cfg(feature = "in-rust-tree")]
extern crate rustc_next_trait_solver;
#[cfg(not(feature = "in-rust-tree"))]
extern crate ra_ap_rustc_next_trait_solver as rustc_next_trait_solver; extern crate ra_ap_rustc_next_trait_solver as rustc_next_trait_solver;
#[cfg(feature = "in-rust-tree")]
extern crate rustc_data_structures as ena;
mod builder; mod builder;
mod chalk_db; mod chalk_db;
mod chalk_ext; mod chalk_ext;

2
crates/hir-ty/src/next_solver/consts.rs
View file

@ -36,8 +36,6 @@ impl<'db> Const<'db> {
internee: kind, internee: kind,
flags: flags.flags, flags: flags.flags,
outer_exclusive_binder: flags.outer_exclusive_binder, outer_exclusive_binder: flags.outer_exclusive_binder,
#[cfg(feature = "in-rust-tree")]
stable_hash: ena::fingerprint::Fingerprint::ZERO,
}; };
Const::new_(interner.db(), InternedWrapperNoDebug(cached)) Const::new_(interner.db(), InternedWrapperNoDebug(cached))
} }

2
crates/hir-ty/src/next_solver/predicate.rs
View file

@ -227,8 +227,6 @@ impl<'db> Predicate<'db> {
internee: kind, internee: kind,
flags: flags.flags, flags: flags.flags,
outer_exclusive_binder: flags.outer_exclusive_binder, outer_exclusive_binder: flags.outer_exclusive_binder,
#[cfg(feature = "in-rust-tree")]
stable_hash: ena::fingerprint::Fingerprint::ZERO,
}; };
Predicate::new_(interner.db(), InternedWrapperNoDebug(cached)) Predicate::new_(interner.db(), InternedWrapperNoDebug(cached))
} }

2
crates/hir-ty/src/next_solver/ty.rs
View file

@ -61,8 +61,6 @@ impl<'db> Ty<'db> {
internee: kind, internee: kind,
flags: flags.flags, flags: flags.flags,
outer_exclusive_binder: flags.outer_exclusive_binder, outer_exclusive_binder: flags.outer_exclusive_binder,
#[cfg(feature = "in-rust-tree")]
stable_hash: ena::fingerprint::Fingerprint::ZERO,
}; };
Ty::new_(interner.db(), InternedWrapperNoDebug(cached)) Ty::new_(interner.db(), InternedWrapperNoDebug(cached))
} }

4
crates/hir/src/lib.rs
View file

@ -20,10 +20,6 @@
#![cfg_attr(feature = "in-rust-tree", feature(rustc_private))] #![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
#![recursion_limit = "512"] #![recursion_limit = "512"]
#[cfg(feature = "in-rust-tree")]
extern crate rustc_type_ir;
#[cfg(not(feature = "in-rust-tree"))]
extern crate ra_ap_rustc_type_ir as rustc_type_ir; extern crate ra_ap_rustc_type_ir as rustc_type_ir;
mod attrs; mod attrs;