user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved tests and fixed merge conflict

Browse source
This commit is contained in:
David Haig 2019-11-28 08:24:19 +00:00
parent e88948a196
commit 6531ba882e
4 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/librustc_mir/shim.rs
View file

@ -253,7 +253,6 @@ fn new_body<'tcx>(
basic_blocks,
source_scopes,
ClearCrossCrate::Clear,
None,
local_decls,
IndexVec::new(),
arg_count,

2
src/test/ui/issues/issue-65419/issue-65419-async-fn-resume-after-completion.rs → src/test/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-completion.rs
View file

@ -3,7 +3,7 @@
// run-fail
// error-pattern: thread 'main' panicked at '`async fn` resumed after completion'
// compile-flags: --edition 2018
// edition:2018
#![feature(generators, generator_trait)]

2
src/test/ui/issues/issue-65419/issue-65419-async-fn-resume-after-panic.rs → src/test/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-panic.rs
View file

@ -3,7 +3,7 @@
// run-fail
// error-pattern: thread 'main' panicked at '`async fn` resumed after panicking'
// compile-flags: --edition 2018
// edition:2018
#![feature(generators, generator_trait)]

1
src/test/ui/issues/issue-65419/issue-65419-generator-resume-after-completion.rs → src/test/ui/async-await/issues/issue-65419/issue-65419-generator-resume-after-completion.rs
View file

@ -4,6 +4,7 @@
// run-fail
// error-pattern:generator resumed after completion
// edition:2018
#![feature(generators, generator_trait)]