Skip to content

Commit dacfa72

Browse files
committed
Auto merge of #16944 - Nadrieril:update-pat-ana, r=lnicola
Revert to the crates.io version of rustc_pattern_analysis The API hasn't fully settled yet, and there's an extra wrinkle with `IdxContainer` which blocked the [subtree update](rust-lang/rust#122981). Let's just keep using the crates.io version for a bit longer. r? `@lnicola`
2 parents 6f6b03f + 1716cc8 commit dacfa72

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

crates/hir-ty/src/lib.rs

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

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

2422
mod builder;

0 commit comments

Comments
 (0)