Rustup

Author: JohnTitor

benches/helpers/miri_helper.rs

@@ -2,12 +2,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_hir::def_id::LOCAL_CRATE;
 use rustc_driver::Compilation;
 use rustc_interface::{interface, Queries};
 

rust-version

@@ -1 +1 @@
-093241deae70ba38413aff823b31c23731debf14
+ebbb2bf37aedaaa64dfaa52ba337ca6efb6b9093

src/bin/miri-rustc-tests.rs

@@ -5,6 +5,7 @@ extern crate rustc;
 extern crate rustc_codegen_utils;
 extern crate rustc_driver;
 extern crate rustc_errors;
+extern crate rustc_hir;
 extern crate rustc_interface;
 extern crate rustc_metadata;
 extern crate rustc_span;
@@ -14,8 +15,9 @@ use std::io::Write;
 use std::path::Path;
 use std::sync::{Arc, Mutex};
 
-use rustc::hir::def_id::LOCAL_CRATE;
-use rustc::hir::{self, itemlikevisit};
+use rustc_hir as hir;
+use rustc_hir::def_id::LOCAL_CRATE;
+use rustc_hir::itemlikevisit;
 use rustc::ty::TyCtxt;
 use rustc_driver::Compilation;
 use rustc_interface::{interface, Queries};

src/bin/miri.rs

@@ -10,6 +10,7 @@ extern crate rustc;
 extern crate rustc_codegen_utils;
 extern crate rustc_driver;
 extern crate rustc_errors;
+extern crate rustc_hir;
 extern crate rustc_interface;
 extern crate rustc_metadata;
 extern crate rustc_span;
@@ -20,7 +21,7 @@ use std::str::FromStr;
 
 use hex::FromHexError;
 
-use rustc::hir::def_id::LOCAL_CRATE;
+use rustc_hir::def_id::LOCAL_CRATE;
 use rustc_driver::Compilation;
 use rustc_interface::{interface, Queries};
 

src/eval.rs

@@ -5,7 +5,7 @@ use std::ffi::OsStr;
 use rand::rngs::StdRng;
 use rand::SeedableRng;
 
-use rustc::hir::def_id::DefId;
+use rustc_hir::def_id::DefId;
 use rustc::ty::layout::{LayoutOf, Size};
 use rustc::ty::{self, TyCtxt};
 

src/helpers.rs

@@ -1,7 +1,7 @@
 use std::ffi::OsStr;
 use std::{iter, mem};
 
-use rustc::hir::def_id::{DefId, CRATE_DEF_INDEX};
+use rustc_hir::def_id::{DefId, CRATE_DEF_INDEX};
 use rustc::mir;
 use rustc::ty::{
     self,
@@ -331,7 +331,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
     /// Helper function to get the `TyLayout` of a `libc` type
     fn libc_ty_layout(&mut self, name: &str) -> InterpResult<'tcx, TyLayout<'tcx>> {
         let this = self.eval_context_mut();
-        let ty = this.resolve_path(&["libc", name])?.ty(*this.tcx);
+        let ty = this.resolve_path(&["libc", name])?.monomorphic_ty(*this.tcx);
         this.layout_of(ty)
     }
 

src/lib.rs

@@ -10,6 +10,7 @@ extern crate rustc_apfloat;
 extern crate syntax;
 #[macro_use]
 extern crate rustc;
+extern crate rustc_hir;
 extern crate rustc_span;
 extern crate rustc_data_structures;
 extern crate rustc_mir;

src/machine.rs

@@ -7,7 +7,7 @@ use std::rc::Rc;
 
 use rand::rngs::StdRng;
 
-use rustc::hir::def_id::DefId;
+use rustc_hir::def_id::DefId;
 use rustc::mir;
 use rustc::ty::{
     self,

src/shims/foreign_items.rs

@@ -1,6 +1,6 @@
 use std::{convert::TryInto, iter};
 
-use rustc::hir::def_id::DefId;
+use rustc_hir::def_id::DefId;
 use rustc::mir;
 use rustc::ty;
 use rustc::ty::layout::{Align, LayoutOf, Size};

src/shims/fs.rs

@@ -389,7 +389,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             // function and `resolve_path` is returning the latter.
             let statx_ty = this
                 .resolve_path(&["libc", "unix", "linux_like", "linux", "gnu", "statx"])?
-                .ty(*this.tcx);
+                .monomorphic_ty(*this.tcx);
             let statxbuf_ty = this.tcx.mk_mut_ptr(statx_ty);
             let statxbuf_layout = this.layout_of(statxbuf_ty)?;
             let statxbuf_imm = ImmTy::from_scalar(statxbuf_scalar, statxbuf_layout);