diff --git a/Cargo.toml b/Cargo.toml
index dcf93fa14104..390efe0a073a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,6 +9,7 @@ repository = "https://github.com/solson/miri"
 version = "0.1.0"
 build = "build.rs"
 default-run = "miri"
+edition = "2018"
 
 [lib]
 test = true # we have unit tests
diff --git a/src/bin/miri-rustc-tests.rs b/src/bin/miri-rustc-tests.rs
index 6fa9b817ffee..c9ec1011ddbb 100644
--- a/src/bin/miri-rustc-tests.rs
+++ b/src/bin/miri-rustc-tests.rs
@@ -1,4 +1,4 @@
-#![feature(rustc_private)]
+#![feature(rustc_private, extern_crate_item_prelude)]
 extern crate miri;
 extern crate getopts;
 extern crate rustc;
diff --git a/src/bin/miri.rs b/src/bin/miri.rs
index 1bbf3c8c4a4a..bfe631b51f0f 100644
--- a/src/bin/miri.rs
+++ b/src/bin/miri.rs
@@ -1,4 +1,4 @@
-#![feature(rustc_private)]
+#![feature(rustc_private, extern_crate_item_prelude)]
 
 extern crate getopts;
 extern crate miri;
diff --git a/src/lib.rs b/src/lib.rs
index 2fdd27b842e4..b4b7a310ca9d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,4 @@
-#![feature(rustc_private)]
+#![feature(rustc_private, extern_crate_item_prelude)]
 
 #![cfg_attr(feature = "cargo-clippy", allow(cast_lossless))]
 
@@ -253,7 +253,7 @@ impl Into<MemoryKind<MiriMemoryKind>> for MiriMemoryKind {
 impl MayLeak for MiriMemoryKind {
     #[inline(always)]
     fn may_leak(self) -> bool {
-        use MiriMemoryKind::*;
+        use self::MiriMemoryKind::*;
         match self {
             Rust | C => false,
             Env | MutStatic => true,