From ba1c88a3c15929692af82798f055885e972af417 Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Tue, 1 May 2018 11:04:01 +0200
Subject: [PATCH] Rustup to rustc 1.27.0-nightly (79252ff4e 2018-04-29)

---
 miri/fn_call.rs    | 4 ++--
 miri/intrinsic.rs  | 2 +-
 miri/lib.rs        | 1 +
 miri/validation.rs | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/miri/fn_call.rs b/miri/fn_call.rs
index a824cbab40a0..15b67cca9397 100644
--- a/miri/fn_call.rs
+++ b/miri/fn_call.rs
@@ -2,9 +2,9 @@ use rustc::ty::{self, Ty};
 use rustc::ty::layout::{self, Align, LayoutOf};
 use rustc::hir::def_id::{DefId, CRATE_DEF_INDEX};
 use rustc::mir;
+use rustc_target::spec::abi::Abi;
 use rustc_data_structures::indexed_vec::Idx;
 use syntax::attr;
-use syntax::abi::Abi;
 use syntax::codemap::Span;
 
 use std::mem;
@@ -177,7 +177,7 @@ impl<'a, 'mir, 'tcx: 'mir + 'a> EvalContextExt<'tcx> for EvalContext<'a, 'mir, '
         let attrs = self.tcx.get_attrs(def_id);
         let link_name = match attr::first_attr_value_str_by_name(&attrs, "link_name") {
             Some(name) => name.as_str(),
-            None => self.tcx.item_name(def_id),
+            None => self.tcx.item_name(def_id).as_str(),
         };
 
         match &link_name[..] {
diff --git a/miri/intrinsic.rs b/miri/intrinsic.rs
index ea9f0428964a..9f4950e8c9fb 100644
--- a/miri/intrinsic.rs
+++ b/miri/intrinsic.rs
@@ -29,7 +29,7 @@ impl<'a, 'mir, 'tcx> EvalContextExt<'tcx> for EvalContext<'a, 'mir, 'tcx, super:
     ) -> EvalResult<'tcx> {
         let substs = instance.substs;
 
-        let intrinsic_name = &self.tcx.item_name(instance.def_id())[..];
+        let intrinsic_name = &self.tcx.item_name(instance.def_id()).as_str()[..];
         match intrinsic_name {
             "align_offset" => {
                 // FIXME: return a real value in case the target allocation has an
diff --git a/miri/lib.rs b/miri/lib.rs
index 7c8183b50984..73437d713d01 100644
--- a/miri/lib.rs
+++ b/miri/lib.rs
@@ -11,6 +11,7 @@ extern crate log;
 #[macro_use]
 extern crate rustc;
 extern crate rustc_mir;
+extern crate rustc_target;
 extern crate rustc_data_structures;
 extern crate syntax;
 extern crate regex;
diff --git a/miri/validation.rs b/miri/validation.rs
index 2de620510ffe..51b407721399 100644
--- a/miri/validation.rs
+++ b/miri/validation.rs
@@ -3,7 +3,7 @@ use rustc::hir::Mutability::*;
 use rustc::mir::{self, ValidationOp, ValidationOperand};
 use rustc::mir::interpret::GlobalId;
 use rustc::ty::{self, Ty, TypeFoldable, TyCtxt, Instance};
-use rustc::ty::layout::LayoutOf;
+use rustc::ty::layout::{LayoutOf, PrimitiveExt};
 use rustc::ty::subst::{Substs, Subst};
 use rustc::traits::{self, TraitEngine};
 use rustc::infer::InferCtxt;