Skip to content

Commit f6d6470

Browse files
committed
move to 2018 edition
I want NLL :D
1 parent 9edac31 commit f6d6470

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ repository = "https://github.com/solson/miri"
99
version = "0.1.0"
1010
build = "build.rs"
1111
default-run = "miri"
12+
edition = "2018"
1213

1314
[lib]
1415
test = true # we have unit tests

src/bin/miri-rustc-tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(rustc_private)]
1+
#![feature(rustc_private, extern_crate_item_prelude)]
22
extern crate miri;
33
extern crate getopts;
44
extern crate rustc;

src/bin/miri.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(rustc_private)]
1+
#![feature(rustc_private, extern_crate_item_prelude)]
22

33
extern crate getopts;
44
extern crate miri;

src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(rustc_private)]
1+
#![feature(rustc_private, extern_crate_item_prelude)]
22

33
#![cfg_attr(feature = "cargo-clippy", allow(cast_lossless))]
44

@@ -253,7 +253,7 @@ impl Into<MemoryKind<MiriMemoryKind>> for MiriMemoryKind {
253253
impl MayLeak for MiriMemoryKind {
254254
#[inline(always)]
255255
fn may_leak(self) -> bool {
256-
use MiriMemoryKind::*;
256+
use self::MiriMemoryKind::*;
257257
match self {
258258
Rust | C => false,
259259
Env | MutStatic => true,

0 commit comments

Comments
 (0)