Skip to content

Commit

Permalink
Auto merge of #946 - RalfJung:rustup, r=oli-obk
Browse files Browse the repository at this point in the history
fix async test

Test got broken by rust-lang/rust#64292.
  • Loading branch information
bors committed Sep 11, 2019
2 parents dd94c7c + f5c35a2 commit 7278385
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion rust-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1e869133b9888dc5abde54f4f31cb797ed9c7874
74d5c70b174f06843049af2d764ff57ddc81c81c
3 changes: 2 additions & 1 deletion tests/run-pass/async-fn.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 7278385

Please sign in to comment.