Moved tests and fixed merge conflict

David Haig · David Haig · commit 6531ba882e85 · 2019-11-28T08:24:19.000Z
diff --git a/src/librustc_mir/shim.rs b/src/librustc_mir/shim.rs
@@ -253,7 +253,6 @@ fn new_body<'tcx>(
         basic_blocks,
         source_scopes,
         ClearCrossCrate::Clear,
-        None,
         local_decls,
         IndexVec::new(),
         arg_count,
diff --git a/src/test/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-completion.rs b/src/test/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-completion.rs
@@ -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)]
 
diff --git a/src/test/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-panic.rs b/src/test/ui/async-await/issues/issue-65419/issue-65419-async-fn-resume-after-panic.rs
@@ -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)]
 
diff --git a/src/test/ui/async-await/issues/issue-65419/issue-65419-generator-resume-after-completion.rs b/src/test/ui/async-await/issues/issue-65419/issue-65419-generator-resume-after-completion.rs
@@ -4,6 +4,7 @@
 
 // run-fail
 // error-pattern:generator resumed after completion
+// edition:2018
 
 #![feature(generators, generator_trait)]
 
