Auto merge of #946 - RalfJung:rustup, r=oli-obk

bors · bors · commit 7278385d80ca · 2019-09-11T15:24:49.000Z
fix async test Test got broken by rust-lang/rust#64292.
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-1e869133b9888dc5abde54f4f31cb797ed9c7874
+74d5c70b174f06843049af2d764ff57ddc81c81c
diff --git a/tests/run-pass/async-fn.rs b/tests/run-pass/async-fn.rs
@@ -15,7 +15,8 @@ pub async fn foo(x: &u32, y: u32) -> u32 {
 }
 
 async fn add(x: u32, y: u32) -> u32 {
-    async { x + y }.await
+    let a = async { x + y };
+    a.await
 }
 
 async fn build_aggregate(a: u32, b: u32, c: u32, d: u32) -> u32 {

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,8 @@ pub async fn foo(x: &u32, y: u32) -> u32 {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`async fn add(x: u32, y: u32) -> u32 {`
`18`		`- async { x + y }.await`
	`18`	`+ let a = async { x + y };`
	`19`	`+ a.await`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`async fn build_aggregate(a: u32, b: u32, c: u32, d: u32) -> u32 {`