rename track-raw-pointers flag to tag-raw-pointers

[rust.git] / src / lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index c8c9e70ec3deb22ba283662bd65d6689050c7a31..c786487d4a146f34b06d203d76246ef1c06961ac 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,24 +1,21 @@
 #![feature(rustc_private)]
-#![feature(option_expect_none, option_unwrap_none)]
 #![feature(map_first_last)]
+#![feature(map_try_insert)]
 #![feature(never_type)]
-#![feature(or_patterns)]
 #![feature(try_blocks)]
-
+#![feature(bool_to_option)]
 #![warn(rust_2018_idioms)]
 #![allow(clippy::cast_lossless)]
 
-#![allow(incomplete_features)]
-#![feature(const_generics)]
-
-extern crate rustc_attr;
 extern crate rustc_apfloat;
 extern crate rustc_ast;
-#[macro_use] extern crate rustc_middle;
+#[macro_use]
+extern crate rustc_middle;
+extern crate rustc_const_eval;
 extern crate rustc_data_structures;
 extern crate rustc_hir;
 extern crate rustc_index;
-extern crate rustc_mir;
+extern crate rustc_session;
 extern crate rustc_span;
 extern crate rustc_target;
 
@@ -40,49 +37,48 @@
 // Establish a "crate-wide prelude": we often import `crate::*`.
 
 // Make all those symbols available in the same place as our own.
-pub use rustc_mir::interpret::*;
+pub use rustc_const_eval::interpret::*;
 // Resolve ambiguity.
-pub use rustc_mir::interpret::{self, AllocMap, PlaceTy};
+pub use rustc_const_eval::interpret::{self, AllocMap, PlaceTy};
 
 pub use crate::shims::dlsym::{Dlsym, EvalContextExt as _};
 pub use crate::shims::env::{EnvVars, EvalContextExt as _};
 pub use crate::shims::foreign_items::EvalContextExt as _;
 pub use crate::shims::intrinsics::EvalContextExt as _;
 pub use crate::shims::os_str::EvalContextExt as _;
-pub use crate::shims::time::EvalContextExt as _;
 pub use crate::shims::panic::{CatchUnwindData, EvalContextExt as _};
+pub use crate::shims::time::EvalContextExt as _;
 pub use crate::shims::tls::{EvalContextExt as _, TlsData};
 pub use crate::shims::EvalContextExt as _;
 
 pub use crate::data_race::{
-    AtomicReadOp, AtomicWriteOp, AtomicRWOp, AtomicFenceOp, DataRaceLockHandle,
-    EvalContextExt as DataRaceEvalContextExt
+    AtomicFenceOp, AtomicReadOp, AtomicRwOp, AtomicWriteOp,
+    EvalContextExt as DataRaceEvalContextExt,
 };
 pub use crate::diagnostics::{
     register_diagnostic, report_error, EvalContextExt as DiagnosticsEvalContextExt,
-    TerminationInfo, NonHaltingDiagnostic,
+    NonHaltingDiagnostic, TerminationInfo,
+};
+pub use crate::eval::{
+    create_ecx, eval_entry, AlignmentCheck, IsolatedOp, MiriConfig, RejectOpWith,
 };
-pub use crate::eval::{create_ecx, eval_main, AlignmentCheck, MiriConfig};
 pub use crate::helpers::EvalContextExt as HelpersEvalContextExt;
 pub use crate::machine::{
     AllocExtra, Evaluator, FrameData, MemoryExtra, MiriEvalContext, MiriEvalContextExt,
-    MiriMemoryKind, NUM_CPUS, PAGE_SIZE, STACK_ADDR, STACK_SIZE,
+    MiriMemoryKind, Tag, NUM_CPUS, PAGE_SIZE, STACK_ADDR, STACK_SIZE,
 };
 pub use crate::mono_hash_map::MonoHashMap;
 pub use crate::operator::EvalContextExt as OperatorEvalContextExt;
 pub use crate::range_map::RangeMap;
 pub use crate::stacked_borrows::{
-    EvalContextExt as StackedBorEvalContextExt, Item, Permission, CallId, PtrId, Stack, Stacks, Tag,
+    CallId, EvalContextExt as StackedBorEvalContextExt, Item, Permission, PtrId, SbTag, Stack,
+    Stacks,
 };
+pub use crate::sync::{CondvarId, EvalContextExt as SyncEvalContextExt, MutexId, RwLockId};
 pub use crate::thread::{
     EvalContextExt as ThreadsEvalContextExt, SchedulingAction, ThreadId, ThreadManager, ThreadState,
 };
-pub use crate::sync::{
-    EvalContextExt as SyncEvalContextExt, CondvarId, MutexId, RwLockId
-};
-pub use crate::vector_clock::{
-    VClock, VSmallClockSet, VectorIdx, VTimestamp
-};
+pub use crate::vector_clock::{VClock, VTimestamp, VectorIdx};
 
 /// Insert rustc arguments at the beginning of the argument list that Miri wants to be
 /// set per default, for maximal validation power.