diff options
| author | Jubilee <46493976+workingjubilee@users.noreply.github.com> | 2024-08-15 18:44:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-15 18:44:16 -0700 |
| commit | 4fd4da9e23492da01af5bd6e804eb8cec1ee1c76 (patch) | |
| tree | 6aa0703f528c317669a857be4698636ab39fdbd9 /src | |
| parent | f624f2d3f9b68ba752a220f531ca902591b81845 (diff) | |
| parent | bb84372e436dfeba61ad1b4deef408a3cf9a12c5 (diff) | |
| download | rust-4fd4da9e23492da01af5bd6e804eb8cec1ee1c76.tar.gz rust-4fd4da9e23492da01af5bd6e804eb8cec1ee1c76.zip | |
Rollup merge of #128922 - Nadrieril:r-a-use-upstream-pat-ana, r=Veykril
rust-analyzer: use in-tree `pattern_analysis` crate r? ```@Veykril```
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/rust-analyzer/crates/hir-ty/src/lib.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/tools/rust-analyzer/crates/hir-ty/src/lib.rs b/src/tools/rust-analyzer/crates/hir-ty/src/lib.rs index 4c9e0a1e118..21c84511dc3 100644 --- a/src/tools/rust-analyzer/crates/hir-ty/src/lib.rs +++ b/src/tools/rust-analyzer/crates/hir-ty/src/lib.rs @@ -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; |