Skip to content

Commit d6ff760

Browse files
committed
Auto merge of rust-lang#149351 - Zalathar:rollup-ee06zha, r=Zalathar
Rollup of 12 pull requests Successful merges: - rust-lang#147936 (Offload intrinsic) - rust-lang#148358 (Fix some issues around `rustc_public`) - rust-lang#148452 (Mangle symbols with a mangled name close to PDB limits with v0 instead of legacy mangling to avoid linker errors) - rust-lang#148751 (Build gnullvm toolchains on Windows natively) - rust-lang#148951 (rustc_target: aarch64: Remove deprecated FEAT_TME) - rust-lang#149149 ([rustdoc] misc search index cleanups) - rust-lang#149173 (Use rust rather than LLVM target features in the target spec) - rust-lang#149307 (Deny const auto traits) - rust-lang#149312 (Mark riscv64gc-unknown-linux-musl as tier 2 target) - rust-lang#149317 (Handle inline asm in has_ffi_unwind_calls) - rust-lang#149326 (Remove unused `Clone` derive on `DelayedLint`) - rust-lang#149341 (Add `Copy` to some AST enums.) r? `@ghost` `@rustbot` modify labels: rollup
2 parents ec69019 + 2065393 commit d6ff760

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

compiler/rustc_public/src/compiler_interface.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -835,6 +835,8 @@ impl<'tcx> CompilerInterface<'tcx> {
835835
// A thread local variable that stores a pointer to [`CompilerInterface`].
836836
scoped_tls::scoped_thread_local!(static TLV: Cell<*const ()>);
837837

838+
// remove this cfg when we have a stable driver.
839+
#[cfg(feature = "rustc_internal")]
838840
pub(crate) fn run<'tcx, F, T>(interface: &CompilerInterface<'tcx>, f: F) -> Result<T, Error>
839841
where
840842
F: FnOnce() -> T,

compiler/rustc_public/src/unstable/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ mod internal_cx;
2222
///
2323
/// This trait is only for [`RustcInternal`]. Any other other access to rustc's internals
2424
/// should go through [`rustc_public_bridge::context::CompilerCtxt`].
25+
#[cfg_attr(not(feature = "rustc_internal"), allow(unreachable_pub))]
2526
pub trait InternalCx<'tcx>: Copy + Clone {
2627
fn tcx(self) -> TyCtxt<'tcx>;
2728

@@ -59,6 +60,7 @@ pub trait InternalCx<'tcx>: Copy + Clone {
5960
/// between internal MIR and rustc_public's IR constructs.
6061
/// However, they should be used seldom and they have no influence in this crate semver.
6162
#[doc(hidden)]
63+
#[cfg_attr(not(feature = "rustc_internal"), allow(unreachable_pub))]
6264
pub trait Stable<'tcx>: PointeeSized {
6365
/// The stable representation of the type implementing Stable.
6466
type T;
@@ -78,6 +80,7 @@ pub trait Stable<'tcx>: PointeeSized {
7880
/// between internal MIR and rustc_public's IR constructs.
7981
/// They should be used seldom as they have no stability guarantees.
8082
#[doc(hidden)]
83+
#[cfg_attr(not(feature = "rustc_internal"), allow(unreachable_pub))]
8184
pub trait RustcInternal {
8285
type T<'tcx>;
8386
fn internal<'tcx>(

0 commit comments

Comments
 (0)