adjust for librustc rename; reduce 'extern crate' to rustc crates

RalfJung · RalfJung · commit 8948a29a4cb3 · 2020-03-30T11:07:32.000+02:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -79,7 +79,7 @@ MIRI_LOG=info ./miri run tests/run-pass/vecs.rs
 ```
 
 Setting `MIRI_LOG` like this will configure logging for Miri itself as well as
-the `rustc::mir::interpret` and `rustc_mir::interpret` modules in rustc.  You
+the `rustc_middle::mir::interpret` and `rustc_mir::interpret` modules in rustc.  You
 can also do more targeted configuration, e.g. the following helps debug the
 stacked borrows implementation:
 
diff --git a/benches/helpers/miri_helper.rs b/benches/helpers/miri_helper.rs
@@ -1,17 +1,13 @@
-extern crate getopts;
-extern crate miri;
-extern crate rustc;
 extern crate rustc_driver;
 extern crate rustc_hir;
 extern crate rustc_interface;
-extern crate test;
 
-use self::miri::eval_main;
-use crate::test::Bencher;
 use rustc_hir::def_id::LOCAL_CRATE;
 use rustc_driver::Compilation;
 use rustc_interface::{interface, Queries};
 
+use crate::test::Bencher;
+
 struct MiriCompilerCalls<'a> {
     bencher: &'a mut Bencher,
 }
@@ -30,7 +26,7 @@ impl rustc_driver::Callbacks for MiriCompilerCalls<'_> {
 
             self.bencher.iter(|| {
                 let config = miri::MiriConfig::default();
-                eval_main(tcx, entry_def_id, config);
+                miri::eval_main(tcx, entry_def_id, config);
             });
         });
 
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-0afdf43dc1d9be4c8b422840166b51dd99e56a16
+8926bb497d9b127eb318aea5aed0e745d8381591
diff --git a/src/bin/miri-rustc-tests.rs b/src/bin/miri-rustc-tests.rs
@@ -1,6 +1,6 @@
 #![feature(rustc_private)]
-extern crate miri;
-extern crate rustc;
+
+extern crate rustc_middle;
 extern crate rustc_driver;
 extern crate rustc_hir;
 extern crate rustc_interface;
@@ -11,15 +11,13 @@ use std::io::Write;
 use std::path::Path;
 use std::sync::{Arc, Mutex};
 
-use rustc::ty::TyCtxt;
+use rustc_middle::ty::TyCtxt;
 use rustc_driver::Compilation;
 use rustc_hir as hir;
 use rustc_hir::def_id::LOCAL_CRATE;
 use rustc_hir::itemlikevisit;
 use rustc_interface::{interface, Queries};
 
-use miri::MiriConfig;
-
 struct MiriCompilerCalls {
     /// whether we are building for the host
     host_target: bool,
@@ -42,7 +40,7 @@ impl rustc_driver::Callbacks for MiriCompilerCalls {
                                 .iter()
                                 .any(|attr| attr.check_name(rustc_span::symbol::sym::test))
                             {
-                                let config = MiriConfig::default();
+                                let config = miri::MiriConfig::default();
                                 let did = self.0.hir().body_owner_def_id(body_id);
                                 println!("running test: {}", self.0.def_path_debug_str(did));
                                 miri::eval_main(self.0, did, config);
@@ -55,7 +53,7 @@ impl rustc_driver::Callbacks for MiriCompilerCalls {
                 }
                 tcx.hir().krate().visit_all_item_likes(&mut Visitor(tcx));
             } else if let Some((entry_def_id, _)) = tcx.entry_fn(LOCAL_CRATE) {
-                let config = MiriConfig::default();
+                let config = miri::MiriConfig::default();
                 miri::eval_main(tcx, entry_def_id, config);
 
                 compiler.session().abort_if_errors();
diff --git a/src/bin/miri.rs b/src/bin/miri.rs
@@ -1,12 +1,6 @@
 #![feature(rustc_private)]
 
-extern crate env_logger;
-extern crate getopts;
-#[macro_use]
-extern crate log;
-extern crate log_settings;
-extern crate miri;
-extern crate rustc;
+extern crate rustc_middle;
 extern crate rustc_driver;
 extern crate rustc_hir;
 extern crate rustc_interface;
@@ -17,12 +11,13 @@ use std::env;
 use std::str::FromStr;
 
 use hex::FromHexError;
+use log::debug;
 
 use rustc_session::CtfeBacktrace;
 use rustc_driver::Compilation;
 use rustc_hir::def_id::LOCAL_CRATE;
 use rustc_interface::{interface, Queries};
-use rustc::ty::TyCtxt;
+use rustc_middle::ty::TyCtxt;
 
 struct MiriCompilerCalls {
     miri_config: miri::MiriConfig,
@@ -84,7 +79,7 @@ fn init_late_loggers(tcx: TyCtxt<'_>) {
             if log::Level::from_str(&var).is_ok() {
                 env::set_var(
                     "RUSTC_LOG",
-                    &format!("rustc::mir::interpret={0},rustc_mir::interpret={0}", var),
+                    &format!("rustc_middle::mir::interpret={0},rustc_mir::interpret={0}", var),
                 );
             } else {
                 env::set_var("RUSTC_LOG", &var);
diff --git a/src/diagnostics.rs b/src/diagnostics.rs
@@ -1,6 +1,8 @@
 use std::cell::RefCell;
 use std::fmt;
 
+use log::trace;
+
 use rustc_span::DUMMY_SP;
 
 use crate::*;
diff --git a/src/eval.rs b/src/eval.rs
@@ -6,8 +6,8 @@ use std::convert::TryFrom;
 use rand::rngs::StdRng;
 use rand::SeedableRng;
 
-use rustc::ty::layout::LayoutOf;
-use rustc::ty::{self, TyCtxt};
+use rustc_middle::ty::layout::LayoutOf;
+use rustc_middle::ty::{self, TyCtxt};
 use rustc_hir::def_id::DefId;
 
 use crate::*;
diff --git a/src/helpers.rs b/src/helpers.rs
@@ -1,8 +1,10 @@
 use std::convert::TryFrom;
 use std::mem;
 
-use rustc::mir;
-use rustc::ty::{
+use log::trace;
+
+use rustc_middle::mir;
+use rustc_middle::ty::{
     self,
     layout::{self, LayoutOf, Size, TyAndLayout},
     List, TyCtxt,
diff --git a/src/intptrcast.rs b/src/intptrcast.rs
@@ -2,10 +2,11 @@ use std::cell::RefCell;
 use std::cmp::max;
 use std::collections::hash_map::Entry;
 
+use log::trace;
 use rand::Rng;
 
 use rustc_data_structures::fx::FxHashMap;
-use rustc::ty::layout::HasDataLayout;
+use rustc_middle::ty::layout::HasDataLayout;
 use rustc_mir::interpret::{AllocCheck, AllocId, InterpResult, Memory, Machine, Pointer, PointerArithmetic};
 use rustc_target::abi::Size;
 
diff --git a/src/lib.rs b/src/lib.rs
@@ -7,13 +7,9 @@
 #![warn(rust_2018_idioms)]
 #![allow(clippy::cast_lossless)]
 
-#[macro_use]
-extern crate log;
-// From rustc.
 extern crate rustc_apfloat;
 extern crate rustc_ast;
-#[macro_use]
-extern crate rustc;
+#[macro_use] extern crate rustc_middle;
 extern crate rustc_data_structures;
 extern crate rustc_hir;
 extern crate rustc_mir;
diff --git a/src/machine.rs b/src/machine.rs
@@ -7,11 +7,12 @@ use std::num::NonZeroU64;
 use std::rc::Rc;
 use std::time::Instant;
 
+use log::trace;
 use rand::rngs::StdRng;
 
 use rustc_data_structures::fx::FxHashMap;
-use rustc::mir;
-use rustc::ty::{
+use rustc_middle::mir;
+use rustc_middle::ty::{
     self,
     layout::{LayoutOf, Size},
     Ty,
diff --git a/src/operator.rs b/src/operator.rs
@@ -1,7 +1,9 @@
 use std::convert::TryFrom;
 
-use rustc::mir;
-use rustc::ty::{
+use log::trace;
+
+use rustc_middle::mir;
+use rustc_middle::ty::{
     layout::{LayoutOf, Size},
     Ty,
 };
@@ -33,7 +35,7 @@ impl<'mir, 'tcx> EvalContextExt<'tcx> for super::MiriEvalContext<'mir, 'tcx> {
         left: ImmTy<'tcx, Tag>,
         right: ImmTy<'tcx, Tag>,
     ) -> InterpResult<'tcx, (Scalar<Tag>, bool, Ty<'tcx>)> {
-        use rustc::mir::BinOp::*;
+        use rustc_middle::mir::BinOp::*;
 
         trace!("ptr_op: {:?} {:?} {:?}", *left, bin_op, *right);
 
diff --git a/src/range_map.rs b/src/range_map.rs
@@ -7,7 +7,7 @@
 
 use std::ops;
 
-use rustc::ty::layout::Size;
+use rustc_middle::ty::layout::Size;
 
 #[derive(Clone, Debug)]
 struct Elem<T> {
diff --git a/src/shims/dlsym.rs b/src/shims/dlsym.rs
@@ -1,4 +1,4 @@
-use rustc::mir;
+use rustc_middle::mir;
 
 use crate::*;
 
diff --git a/src/shims/env.rs b/src/shims/env.rs
@@ -7,7 +7,7 @@ use crate::rustc_target::abi::LayoutOf;
 use crate::*;
 
 use rustc_data_structures::fx::FxHashMap;
-use rustc::ty::layout::Size;
+use rustc_middle::ty::layout::Size;
 use rustc_mir::interpret::Pointer;
 
 /// Check whether an operation that writes to a target buffer was successful.
diff --git a/src/shims/foreign_items.rs b/src/shims/foreign_items.rs
@@ -4,9 +4,9 @@ mod posix;
 use std::{convert::{TryInto, TryFrom}, iter};
 
 use rustc_hir::def_id::DefId;
-use rustc::mir;
-use rustc::ty;
-use rustc::ty::layout::{Align, Size};
+use rustc_middle::mir;
+use rustc_middle::ty;
+use rustc_middle::ty::layout::{Align, Size};
 use rustc_apfloat::Float;
 use rustc_span::symbol::sym;
 use rustc_ast::attr;
diff --git a/src/shims/foreign_items/posix.rs b/src/shims/foreign_items/posix.rs
@@ -3,9 +3,11 @@ mod macos;
 
 use std::convert::TryFrom;
 
+use log::trace;
+
 use crate::*;
-use rustc::mir;
-use rustc::ty::layout::{Align, LayoutOf, Size};
+use rustc_middle::mir;
+use rustc_middle::ty::layout::{Align, LayoutOf, Size};
 
 impl<'mir, 'tcx> EvalContextExt<'mir, 'tcx> for crate::MiriEvalContext<'mir, 'tcx> {}
 pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx> {
diff --git a/src/shims/foreign_items/posix/linux.rs b/src/shims/foreign_items/posix/linux.rs
@@ -1,5 +1,5 @@
 use crate::*;
-use rustc::mir;
+use rustc_middle::mir;
 
 impl<'mir, 'tcx> EvalContextExt<'mir, 'tcx> for crate::MiriEvalContext<'mir, 'tcx> {}
 pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx> {
diff --git a/src/shims/foreign_items/posix/macos.rs b/src/shims/foreign_items/posix/macos.rs
@@ -1,5 +1,5 @@
 use crate::*;
-use rustc::mir;
+use rustc_middle::mir;
 
 impl<'mir, 'tcx> EvalContextExt<'mir, 'tcx> for crate::MiriEvalContext<'mir, 'tcx> {}
 pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx> {
diff --git a/src/shims/foreign_items/windows.rs b/src/shims/foreign_items/windows.rs
@@ -1,6 +1,6 @@
 use crate::*;
-use rustc::mir;
-use rustc::ty::layout::Size;
+use rustc_middle::mir;
+use rustc_middle::ty::layout::Size;
 use std::iter;
 
 impl<'mir, 'tcx> EvalContextExt<'mir, 'tcx> for crate::MiriEvalContext<'mir, 'tcx> {}
diff --git a/src/shims/fs.rs b/src/shims/fs.rs
@@ -6,7 +6,7 @@ use std::path::Path;
 use std::time::SystemTime;
 
 use rustc_data_structures::fx::FxHashMap;
-use rustc::ty::layout::{Align, LayoutOf, Size};
+use rustc_middle::ty::layout::{Align, LayoutOf, Size};
 
 use crate::stacked_borrows::Tag;
 use crate::*;
diff --git a/src/shims/intrinsics.rs b/src/shims/intrinsics.rs
@@ -1,9 +1,9 @@
 use std::iter;
 use std::convert::TryFrom;
 
-use rustc::mir;
-use rustc::ty;
-use rustc::ty::layout::{Align, LayoutOf};
+use rustc_middle::mir;
+use rustc_middle::ty;
+use rustc_middle::ty::layout::{Align, LayoutOf};
 use rustc_apfloat::Float;
 use rustc_span::source_map::Span;
 
diff --git a/src/shims/mod.rs b/src/shims/mod.rs
@@ -10,7 +10,9 @@ pub mod tls;
 
 use std::convert::TryFrom;
 
-use rustc::{mir, ty};
+use log::trace;
+
+use rustc_middle::{mir, ty};
 
 use crate::*;
 
diff --git a/src/shims/os_str.rs b/src/shims/os_str.rs
@@ -9,7 +9,7 @@ use std::os::unix::ffi::{OsStrExt, OsStringExt};
 #[cfg(windows)]
 use std::os::windows::ffi::{OsStrExt, OsStringExt};
 
-use rustc::ty::layout::LayoutOf;
+use rustc_middle::ty::layout::LayoutOf;
 
 use crate::*;
 
diff --git a/src/shims/panic.rs b/src/shims/panic.rs
@@ -11,8 +11,10 @@
 //!   gets popped *during unwinding*, we take the panic payload and store it according to the extra
 //!   metadata we remembered when pushing said frame.
 
-use rustc::mir;
-use rustc::ty::{self, layout::LayoutOf};
+use log::trace;
+
+use rustc_middle::mir;
+use rustc_middle::ty::{self, layout::LayoutOf};
 use rustc_target::spec::PanicStrategy;
 
 use crate::*;
@@ -186,7 +188,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         msg: &mir::AssertMessage<'tcx>,
         unwind: Option<mir::BasicBlock>,
     ) -> InterpResult<'tcx> {
-        use rustc::mir::AssertKind::*;
+        use rustc_middle::mir::AssertKind::*;
         let this = self.eval_context_mut();
 
         match msg {
diff --git a/src/shims/tls.rs b/src/shims/tls.rs
@@ -2,7 +2,9 @@
 
 use std::collections::BTreeMap;
 
-use rustc::{ty, ty::layout::{Size, HasDataLayout}};
+use log::trace;
+
+use rustc_middle::{ty, ty::layout::{Size, HasDataLayout}};
 use rustc_target::abi::LayoutOf;
 
 use crate::{HelpersEvalContextExt, InterpResult, MPlaceTy, Scalar, StackPopCleanup, Tag};
diff --git a/src/stacked_borrows.rs b/src/stacked_borrows.rs
@@ -6,9 +6,11 @@ use std::fmt;
 use std::num::NonZeroU64;
 use std::rc::Rc;
 
+use log::trace;
+
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
-use rustc::mir::RetagKind;
-use rustc::ty::{self, layout::Size};
+use rustc_middle::mir::RetagKind;
+use rustc_middle::ty::{self, layout::Size};
 use rustc_hir::Mutability;
 
 use crate::*;

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-0afdf43dc1d9be4c8b422840166b51dd99e56a16`
	`1`	`+8926bb497d9b127eb318aea5aed0e745d8381591`