Skip to content

Commit cccf0b9

Browse files
committed
Auto merge of #129143 - workingjubilee:rollup-h0hzumu, r=workingjubilee
Rollup of 9 pull requests Successful merges: - #128064 (Improve docs for Waker::noop and LocalWaker::noop) - #128922 (rust-analyzer: use in-tree `pattern_analysis` crate) - #128965 (Remove `print::Pat` from the printing of `WitnessPat`) - #129018 (Migrate `rlib-format-packed-bundled-libs` and `native-link-modifier-bundle` `run-make` tests to rmake) - #129037 (Port `run-make/libtest-json` and `run-make/libtest-junit` to rmake) - #129078 (`ParamEnvAnd::fully_perform`: we have an `ocx`, use it) - #129110 (Add a comment explaining the return type of `Ty::kind`.) - #129111 (Port the `sysroot-crates-are-unstable` Python script to rmake) - #129135 (crashes: more tests) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 057356c + aded041 commit cccf0b9

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

crates/hir-ty/src/lib.rs

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

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

2224
mod builder;

0 commit comments

Comments
 (0)