Skip to content

Commit

Permalink
Rollup merge of rust-lang#128922 - Nadrieril:r-a-use-upstream-pat-ana…
Browse files Browse the repository at this point in the history
…, r=Veykril

rust-analyzer: use in-tree `pattern_analysis` crate

r? `@Veykril`
  • Loading branch information
GuillaumeGomez authored Aug 15, 2024
2 parents 64ef806 + bb84372 commit 41b7f98
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/tools/rust-analyzer/crates/hir-ty/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ extern crate rustc_abi;
#[cfg(not(feature = "in-rust-tree"))]
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
// using the in-tree one.
#[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;

mod builder;
Expand Down

0 comments on commit 41b7f98

Please sign in to comment.