Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit e7ebf6f

Browse files
authoredAug 16, 2024
Rollup merge of rust-lang#128922 - Nadrieril:r-a-use-upstream-pat-ana, r=Veykril
rust-analyzer: use in-tree `pattern_analysis` crate r? ``@Veykril``
2 parents 16f453e + bb84372 commit e7ebf6f

File tree

1 file changed

+4
-2
lines changed
  • src/tools/rust-analyzer/crates/hir-ty/src

1 file changed

+4
-2
lines changed
 

‎src/tools/rust-analyzer/crates/hir-ty/src/lib.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@ extern crate rustc_abi;
1515
#[cfg(not(feature = "in-rust-tree"))]
1616
extern crate ra_ap_rustc_abi as rustc_abi;
1717

18-
// Use the crates.io version unconditionally until the API settles enough that we can switch to
19-
// using the in-tree one.
18+
#[cfg(feature = "in-rust-tree")]
19+
extern crate rustc_pattern_analysis;
20+
21+
#[cfg(not(feature = "in-rust-tree"))]
2022
extern crate ra_ap_rustc_pattern_analysis as rustc_pattern_analysis;
2123

2224
mod builder;

0 commit comments

Comments
 (0)
Please sign in to comment.