Moved tests and fixed merge conflict

Author: David Haig

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,

src/test/ui/issues/issue-65419/issue-65419-async-fn-resume-after-completion.rs renamed to 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)]
 

src/test/ui/issues/issue-65419/issue-65419-async-fn-resume-after-panic.rs renamed to 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)]
 

src/test/ui/issues/issue-65419/issue-65419-generator-resume-after-completion.rs renamed to 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)]