Skip to content

Commit

Permalink
Auto merge of #16944 - Nadrieril:update-pat-ana, r=lnicola
Browse files Browse the repository at this point in the history
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`
  • Loading branch information
bors committed Mar 25, 2024
2 parents 6f6b03f + 1716cc8 commit dacfa72
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions crates/hir-ty/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit dacfa72

Please sign in to comment.