diff options
| author | bors <bors@rust-lang.org> | 2024-03-25 12:17:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-03-25 12:17:18 +0000 |
| commit | dacfa72f85c261e1596ae2a3579be338e288f22a (patch) | |
| tree | 38eea51ded278d0d847fe3d112d40353f7138c79 | |
| parent | 6f6b03f9de783f91456080b3f6adc8d92903c1b0 (diff) | |
| parent | 1716cc8433fe4822cf531905b8d132c23592c72c (diff) | |
| download | rust-dacfa72f85c261e1596ae2a3579be338e288f22a.tar.gz rust-dacfa72f85c261e1596ae2a3579be338e288f22a.zip | |
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](https://github.com/rust-lang/rust/pull/122981). Let's just keep using the crates.io version for a bit longer. r? `@lnicola`
| -rw-r--r-- | crates/hir-ty/src/lib.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crates/hir-ty/src/lib.rs b/crates/hir-ty/src/lib.rs index d6d5c16ae75..579ca8a8250 100644 --- a/crates/hir-ty/src/lib.rs +++ b/crates/hir-ty/src/lib.rs @@ -15,10 +15,8 @@ extern crate rustc_abi; #[cfg(not(feature = "in-rust-tree"))] 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"))] +// Use the crates.io version unconditionally until the API settles enough that we can switch to +// using the in-tree one. extern crate ra_ap_rustc_pattern_analysis as rustc_pattern_analysis; mod builder; |