Auto merge of #1496 - RalfJung:rustup, r=RalfJung

rustup; inner_deref has been stabilized miri and cargo-miri now use no nightly features (except for miri's using `rustc_private`, of course) :D
2020-08-03 12:25:11 +00:00 · 2020-08-03 12:25:11 +00:00 · 2d2820dc77
commit 2d2820dc77
parent 8a28eaa3fc cda255cfb4
2 changed files with 1 additions and 3 deletions
--- a/cargo-miri/bin.rs
+++ b/cargo-miri/bin.rs
@ -1,5 +1,3 @@
-#![feature(inner_deref)]
-
 use std::env;
 use std::ffi::OsString;
 use std::fs::{self, File};
--- a/2
+++ b/2
@ -1 +1 @@
-dfe1e3b641abbede6230e3931d14f0d43e5b8e54
+dbc2ef25fb5e15445de38f19ba75547a6cf35cae