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

bors · bors · commit c86e24772849 · 2019-07-26T20:50:48.000Z
bump Rust
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-4268e7ee22935f086b856ef0063a9e22b49aeddb
+c43753f910aae000f8bcb0a502407ea332afc74b
diff --git a/src/bin/cargo-miri.rs b/src/bin/cargo-miri.rs
@@ -335,7 +335,7 @@ fn main() {
 }
 
 fn in_cargo_miri() {
-    let (subcommand, skip) = match std::env::args().nth(2).deref() {
+    let (subcommand, skip) = match std::env::args().nth(2).as_deref() {
         Some("test") => (MiriCommand::Test, 3),
         Some("run") => (MiriCommand::Run, 3),
         Some("setup") => (MiriCommand::Setup, 3),

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ fn main() {`
`335`	`335`	`}`
`336`	`336`
`337`	`337`	`fn in_cargo_miri() {`
`338`		`- let (subcommand, skip) = match std::env::args().nth(2).deref() {`
	`338`	`+ let (subcommand, skip) = match std::env::args().nth(2).as_deref() {`
`339`	`339`	`Some("test") => (MiriCommand::Test, 3),`
`340`	`340`	`Some("run") => (MiriCommand::Run, 3),`
`341`	`341`	`Some("setup") => (MiriCommand::Setup, 3),`