Skip to content

Commit

Permalink
Rollup merge of rust-lang#124627 - RalfJung:interpret-doc-no-inline, …
Browse files Browse the repository at this point in the history
…r=fmease

interpret: hide some reexports in rustdoc

Cc rust-lang#124608
  • Loading branch information
matthiaskrgr committed May 2, 2024
2 parents d6940fb + dba1849 commit a248411
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions compiler/rustc_const_eval/src/interpret/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ mod util;
mod validity;
mod visitor;

#[doc(no_inline)]
pub use rustc_middle::mir::interpret::*; // have all the `interpret` symbols in one place: here

pub use self::eval_context::{format_interp_error, Frame, FrameInfo, InterpCx, StackPopCleanup};
Expand Down
2 changes: 2 additions & 0 deletions src/tools/miri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,10 @@ mod shims;
// Establish a "crate-wide prelude": we often import `crate::*`.

// Make all those symbols available in the same place as our own.
#[doc(no_inline)]
pub use rustc_const_eval::interpret::*;
// Resolve ambiguity.
#[doc(no_inline)]
pub use rustc_const_eval::interpret::{self, AllocMap, PlaceTy, Provenance as _};

pub use crate::shims::env::{EnvVars, EvalContextExt as _};
Expand Down

0 comments on commit a248411

Please sign in to comment.