Merge pull request #538 from solson/rustup

RalfJung · web-flow · commit 3798a8edb2e6 · 2018-11-22T08:50:57.000+01:00
remove stabilized feature flag
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-nightly-2018-11-21
+nightly-2018-11-22
diff --git a/src/bin/miri-rustc-tests.rs b/src/bin/miri-rustc-tests.rs
@@ -1,4 +1,4 @@
-#![feature(rustc_private, extern_crate_item_prelude)]
+#![feature(rustc_private)]
 extern crate miri;
 extern crate getopts;
 extern crate rustc;
diff --git a/src/bin/miri.rs b/src/bin/miri.rs
@@ -1,4 +1,4 @@
-#![feature(rustc_private, extern_crate_item_prelude)]
+#![feature(rustc_private)]
 
 extern crate getopts;
 extern crate miri;
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,4 +1,4 @@
-#![feature(rustc_private, extern_crate_item_prelude)]
+#![feature(rustc_private)]
 
 #![cfg_attr(feature = "cargo-clippy", allow(cast_lossless))]
 
diff --git a/tests/run-pass-fullmir/foreign-fn-linkname.rs b/tests/run-pass-fullmir/foreign-fn-linkname.rs
@@ -10,7 +10,7 @@
 
 //ignore-windows: Uses POSIX APIs
 
-#![feature(libc, extern_crate_item_prelude)]
+#![feature(libc)]
 #![allow(unused_extern_crates)] // rustc bug https://github.com/rust-lang/rust/issues/56098
 
 extern crate libc;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#![feature(rustc_private, extern_crate_item_prelude)]`
	`1`	`+#![feature(rustc_private)]`
`2`	`2`	`extern crate miri;`
`3`	`3`	`extern crate getopts;`
`4`	`4`	`extern crate rustc;`