rustup (and account for stabilization)

diff --git a/rust-version b/rust-version
index 73f017b8d2c62c6aa57318c1bdf6d9112337e00e..0124f254ec1eac5ee259db35f0fe85a65c50fbb1 100644 (file)
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-255c0338dc0b02f833fb1a816d76febd50c399c4
+0e9e4083100aa3ebf09b8f1ace0348cb37475eb9

diff --git a/src/shims/intrinsics.rs b/src/shims/intrinsics.rs
index ec86e878ec60702ef56dbeec5f81526e2ee095e4..c16fbc278c8d8715e8f8542a1328dedcee6e6a67 100644 (file)
--- a/src/shims/intrinsics.rs
+++ b/src/shims/intrinsics.rs
@@ -1,5 +1,4 @@
 use std::iter;
-use std::convert::TryFrom;
 
 use rustc_attr as attr;
 use rustc_ast::ast::FloatTy;

diff --git a/tests/compile-fail/rc_as_ptr.rs b/tests/compile-fail/rc_as_ptr.rs
index 0b98c7d2bba3d6c26a5fc543f9f1c2c9070fca10..1a9c322ac8d060d9bb1b9c4e485be70615f47c06 100644 (file)
--- a/tests/compile-fail/rc_as_ptr.rs
+++ b/tests/compile-fail/rc_as_ptr.rs
@@ -1,6 +1,5 @@
 // This should fail even without validation
 // compile-flags: -Zmiri-disable-validation
-#![feature(weak_into_raw)]
 
 use std::rc::{Rc, Weak};
 use std::ptr;

diff --git a/tests/run-pass/rc.rs b/tests/run-pass/rc.rs
index 9ab460c961651e56cd14e324b496ed9f62dbc9f2..3dc61fe1f00d5708499df414f64e84f08d03f79a 100644 (file)
--- a/tests/run-pass/rc.rs
+++ b/tests/run-pass/rc.rs
@@ -1,4 +1,3 @@
-#![feature(weak_into_raw)]
 #![feature(new_uninit)]
 #![feature(get_mut_unchecked)]