diff --git a/rust-version b/rust-version
index 71bc3b30f412..44bed6b73d1a 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-0ec370670220b712b042ee09aab067ec7e5878d5
+093241deae70ba38413aff823b31c23731debf14
diff --git a/src/eval.rs b/src/eval.rs
index 0cc302b967b2..1968111307e7 100644
--- a/src/eval.rs
+++ b/src/eval.rs
@@ -47,7 +47,7 @@ pub fn create_ecx<'mir, 'tcx: 'mir>(
     config: MiriConfig,
 ) -> InterpResult<'tcx, (InterpCx<'mir, 'tcx, Evaluator<'tcx>>, MPlaceTy<'tcx, Tag>)> {
     let mut ecx = InterpCx::new(
-        tcx.at(syntax::source_map::DUMMY_SP),
+        tcx.at(rustc_span::source_map::DUMMY_SP),
         ty::ParamEnv::reveal_all(),
         Evaluator::new(config.communicate),
         MemoryExtra::new(
diff --git a/src/helpers.rs b/src/helpers.rs
index 18b433a0e4a5..17d74d2ef757 100644
--- a/src/helpers.rs
+++ b/src/helpers.rs
@@ -8,7 +8,7 @@
     layout::{self, LayoutOf, Size, TyLayout},
     List, TyCtxt,
 };
-use syntax::source_map::DUMMY_SP;
+use rustc_span::source_map::DUMMY_SP;
 
 use rand::RngCore;
 
diff --git a/src/lib.rs b/src/lib.rs
index 32d2bda719ea..2ddcdf8ff777 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -10,6 +10,7 @@
 extern crate syntax;
 #[macro_use]
 extern crate rustc;
+extern crate rustc_span;
 extern crate rustc_data_structures;
 extern crate rustc_mir;
 extern crate rustc_target;
diff --git a/src/machine.rs b/src/machine.rs
index 502120d316b7..4c1446c82c74 100644
--- a/src/machine.rs
+++ b/src/machine.rs
@@ -14,7 +14,8 @@
     layout::{LayoutOf, Size},
     Ty, TyCtxt,
 };
-use syntax::{attr, source_map::Span, symbol::sym};
+use rustc_span::{source_map::Span, symbol::sym};
+use syntax::attr;
 
 use crate::*;
 
diff --git a/src/shims/foreign_items.rs b/src/shims/foreign_items.rs
index 07e3b7d75826..6ad16c6f6764 100644
--- a/src/shims/foreign_items.rs
+++ b/src/shims/foreign_items.rs
@@ -5,8 +5,8 @@
 use rustc::ty;
 use rustc::ty::layout::{Align, LayoutOf, Size};
 use rustc_apfloat::Float;
+use rustc_span::symbol::sym;
 use syntax::attr;
-use syntax::symbol::sym;
 
 use crate::*;
 
@@ -961,7 +961,7 @@ fn emulate_foreign_item(
                 // lpBuffer : ptr to buffer that receives contents of the env_var as a null-terminated string.
                 // Return `# of chars` stored in the buffer pointed to by lpBuffer, excluding null-terminator.
                 // Return 0 upon failure.
-                
+
                 // This is not the env var you are looking for.
                 this.set_last_error(Scalar::from_u32(203))?; // ERROR_ENVVAR_NOT_FOUND
                 this.write_null(dest)?;
diff --git a/src/shims/intrinsics.rs b/src/shims/intrinsics.rs
index 37aee1f5652c..a7aec53c37de 100644
--- a/src/shims/intrinsics.rs
+++ b/src/shims/intrinsics.rs
@@ -5,7 +5,7 @@
 use rustc::ty;
 use rustc::ty::layout::{self, Align, LayoutOf, Size};
 use rustc_apfloat::Float;
-use syntax::source_map::Span;
+use rustc_span::source_map::Span;
 
 use crate::*;
 
diff --git a/src/shims/panic.rs b/src/shims/panic.rs
index 8f082f45c915..950a23aa59ca 100644
--- a/src/shims/panic.rs
+++ b/src/shims/panic.rs
@@ -14,7 +14,7 @@
 use rustc::mir;
 use rustc::ty::{self, layout::LayoutOf};
 use rustc_target::spec::PanicStrategy;
-use syntax::source_map::Span;
+use rustc_span::source_map::Span;
 
 use crate::*;