From c77e9022d5d75a2d273b39f0539bfbf52d0ba6e6 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sat, 30 May 2020 09:14:56 +0200 Subject: [PATCH] rustup (and account for stabilization) --- rust-version | 2 +- src/shims/intrinsics.rs | 1 - tests/compile-fail/rc_as_ptr.rs | 1 - tests/run-pass/rc.rs | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/rust-version b/rust-version index 73f017b8d2c..0124f254ec1 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -255c0338dc0b02f833fb1a816d76febd50c399c4 +0e9e4083100aa3ebf09b8f1ace0348cb37475eb9 diff --git a/src/shims/intrinsics.rs b/src/shims/intrinsics.rs index ec86e878ec6..c16fbc278c8 100644 --- 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 0b98c7d2bba..1a9c322ac8d 100644 --- 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 9ab460c9616..3dc61fe1f00 100644 --- 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)]