Auto merge of #17995 - lnicola:sync-from-rust, r=lnicola

minor: sync from downstream
rust-lang · Aug 29, 2024 · 4068232 · 4068232
2 parents 40a1a4e + 2c6dc02
commit 4068232
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/crates/hir-ty/src/lib.rs b/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;

diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-80eb5a8e910e5185d47cdefe3732d839c78a5e7e
+6cf068db566de080dfa7ed24a216ea3aed2b98ce
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		80eb5a8e910e5185d47cdefe3732d839c78a5e7e
		6cf068db566de080dfa7ed24a216ea3aed2b98ce