Merged migrated compile-fail tests and ui tests. Fixes #46841.

2018-08-08 14:50:16 +02:00 · 2018-08-08 14:50:16 +02:00 · 3fc7ab2373
commit 3fc7ab2373
parent 3e0a407988
6584 changed files with 886 additions and 764 deletions
--- a/src/test/ui/compile-fail-migration/.gitattributes
+++ b/src/test/ui/compile-fail-migration/.gitattributes
--- a/src/test/ui/compile-fail-migration/E0501.ast.nll.stderr
+++ b/src/test/ui/compile-fail-migration/E0501.ast.nll.stderr
--- a/src/test/ui/compile-fail-migration/E0501.ast.stderr
+++ b/src/test/ui/compile-fail-migration/E0501.ast.stderr
--- a/src/test/ui/compile-fail-migration/E0501.mir.stderr
+++ b/src/test/ui/compile-fail-migration/E0501.mir.stderr
--- a/src/test/ui/compile-fail-migration/E0501.rs
+++ b/src/test/ui/compile-fail-migration/E0501.rs
--- a/src/test/ui/compile-fail-migration/E0506.ast.nll.stderr
+++ b/src/test/ui/compile-fail-migration/E0506.ast.nll.stderr
--- a/src/test/ui/compile-fail-migration/E0506.ast.stderr
+++ b/src/test/ui/compile-fail-migration/E0506.ast.stderr
--- a/src/test/ui/compile-fail-migration/E0506.mir.stderr
+++ b/src/test/ui/compile-fail-migration/E0506.mir.stderr
--- a/src/test/ui/compile-fail-migration/E0506.rs
+++ b/src/test/ui/compile-fail-migration/E0506.rs
--- a/src/test/ui/E0508-fail.ast.stderr
+++ b/src/test/ui/E0508-fail.ast.stderr
@ -0,0 +1,12 @@
 error[E0508]: cannot move out of type `[NonCopy; 1]`, a non-copy array
  --> $DIR/E0508-fail.rs:18:18
   |
 LL |     let _value = array[0];  //[ast]~ ERROR [E0508]
   |                  ^^^^^^^^
   |                  |
   |                  cannot move out of here
   |                  help: consider using a reference instead: `&array[0]`
 error: aborting due to previous error
 For more information about this error, try `rustc --explain E0508`.
--- a/src/test/ui/E0508-fail.mir.stderr
+++ b/src/test/ui/E0508-fail.mir.stderr
@ -0,0 +1,12 @@
 error[E0508]: cannot move out of type `[NonCopy; 1]`, a non-copy array
  --> $DIR/E0508-fail.rs:18:18
   |
 LL |     let _value = array[0];  //[ast]~ ERROR [E0508]
   |                  ^^^^^^^^
   |                  |
   |                  cannot move out of here
   |                  help: consider using a reference instead: `&array[0]`
 error: aborting due to previous error
 For more information about this error, try `rustc --explain E0508`.
--- a/src/test/ui/compile-fail-migration/E0508.rs
+++ b/src/test/ui/compile-fail-migration/E0508.rs
--- a/src/test/ui/compile-fail-migration/E0508.ast.stderr
+++ b/src/test/ui/compile-fail-migration/E0508.ast.stderr
--- a/src/test/ui/compile-fail-migration/E0508.mir.stderr
+++ b/src/test/ui/compile-fail-migration/E0508.mir.stderr
--- a/src/test/ui/compile-fail-migration/E0583.rs
+++ b/src/test/ui/compile-fail-migration/E0583.rs
--- a/src/test/ui/compile-fail-migration/E0583.stderr
+++ b/src/test/ui/compile-fail-migration/E0583.stderr
--- a/src/test/ui/compile-fail-migration/E0594.ast.nll.stderr
+++ b/src/test/ui/compile-fail-migration/E0594.ast.nll.stderr
--- a/src/test/ui/compile-fail-migration/E0594.ast.stderr
+++ b/src/test/ui/compile-fail-migration/E0594.ast.stderr
--- a/src/test/ui/compile-fail-migration/E0594.mir.stderr
+++ b/src/test/ui/compile-fail-migration/E0594.mir.stderr
--- a/src/test/ui/compile-fail-migration/E0594.rs
+++ b/src/test/ui/compile-fail-migration/E0594.rs
--- a/src/test/ui/compile-fail-migration/E0596.ast.nll.stderr
+++ b/src/test/ui/compile-fail-migration/E0596.ast.nll.stderr
--- a/src/test/ui/compile-fail-migration/E0596.ast.stderr
+++ b/src/test/ui/compile-fail-migration/E0596.ast.stderr
--- a/src/test/ui/compile-fail-migration/E0596.mir.stderr
+++ b/src/test/ui/compile-fail-migration/E0596.mir.stderr
--- a/src/test/ui/compile-fail-migration/E0596.rs
+++ b/src/test/ui/compile-fail-migration/E0596.rs
--- a/src/test/ui/compile-fail-migration/absolute-paths-in-nested-use-groups.rs
+++ b/src/test/ui/compile-fail-migration/absolute-paths-in-nested-use-groups.rs
--- a/src/test/ui/compile-fail-migration/absolute-paths-in-nested-use-groups.stderr
+++ b/src/test/ui/compile-fail-migration/absolute-paths-in-nested-use-groups.stderr
--- a/src/test/ui/compile-fail-migration/access-mode-in-closures.nll.stderr
+++ b/src/test/ui/compile-fail-migration/access-mode-in-closures.nll.stderr
--- a/src/test/ui/compile-fail-migration/access-mode-in-closures.rs
+++ b/src/test/ui/compile-fail-migration/access-mode-in-closures.rs
--- a/src/test/ui/compile-fail-migration/access-mode-in-closures.stderr
+++ b/src/test/ui/compile-fail-migration/access-mode-in-closures.stderr
--- a/src/test/ui/compile-fail-migration/alloc-error-handler-bad-signature-1.rs
+++ b/src/test/ui/compile-fail-migration/alloc-error-handler-bad-signature-1.rs
--- a/src/test/ui/compile-fail-migration/alloc-error-handler-bad-signature-1.stderr
+++ b/src/test/ui/compile-fail-migration/alloc-error-handler-bad-signature-1.stderr
--- a/src/test/ui/compile-fail-migration/alloc-error-handler-bad-signature-2.rs
+++ b/src/test/ui/compile-fail-migration/alloc-error-handler-bad-signature-2.rs
--- a/src/test/ui/compile-fail-migration/alloc-error-handler-bad-signature-2.stderr
+++ b/src/test/ui/compile-fail-migration/alloc-error-handler-bad-signature-2.stderr
--- a/src/test/ui/compile-fail-migration/alloc-error-handler-bad-signature-3.rs
+++ b/src/test/ui/compile-fail-migration/alloc-error-handler-bad-signature-3.rs
--- a/src/test/ui/compile-fail-migration/alloc-error-handler-bad-signature-3.stderr
+++ b/src/test/ui/compile-fail-migration/alloc-error-handler-bad-signature-3.stderr
--- a/src/test/ui/compile-fail-migration/allocator/auxiliary/system-allocator.rs
+++ b/src/test/ui/compile-fail-migration/allocator/auxiliary/system-allocator.rs
--- a/src/test/ui/compile-fail-migration/allocator/auxiliary/system-allocator2.rs
+++ b/src/test/ui/compile-fail-migration/allocator/auxiliary/system-allocator2.rs
--- a/src/test/ui/compile-fail-migration/allocator/function-allocator.rs
+++ b/src/test/ui/compile-fail-migration/allocator/function-allocator.rs
--- a/src/test/ui/compile-fail-migration/allocator/function-allocator.stderr
+++ b/src/test/ui/compile-fail-migration/allocator/function-allocator.stderr
--- a/src/test/ui/compile-fail-migration/allocator/not-an-allocator.rs
+++ b/src/test/ui/compile-fail-migration/allocator/not-an-allocator.rs
--- a/src/test/ui/compile-fail-migration/allocator/not-an-allocator.stderr
+++ b/src/test/ui/compile-fail-migration/allocator/not-an-allocator.stderr
--- a/src/test/ui/compile-fail-migration/allocator/two-allocators.rs
+++ b/src/test/ui/compile-fail-migration/allocator/two-allocators.rs
--- a/src/test/ui/compile-fail-migration/allocator/two-allocators.stderr
+++ b/src/test/ui/compile-fail-migration/allocator/two-allocators.stderr
--- a/src/test/ui/compile-fail-migration/allocator/two-allocators2.rs
+++ b/src/test/ui/compile-fail-migration/allocator/two-allocators2.rs
--- a/src/test/ui/compile-fail-migration/allocator/two-allocators2.stderr
+++ b/src/test/ui/compile-fail-migration/allocator/two-allocators2.stderr
--- a/src/test/ui/compile-fail-migration/allocator/two-allocators3.rs
+++ b/src/test/ui/compile-fail-migration/allocator/two-allocators3.rs
--- a/src/test/ui/compile-fail-migration/allocator/two-allocators3.stderr
+++ b/src/test/ui/compile-fail-migration/allocator/two-allocators3.stderr
--- a/src/test/ui/compile-fail-migration/anon-params-deprecated.rs
+++ b/src/test/ui/compile-fail-migration/anon-params-deprecated.rs
--- a/src/test/ui/compile-fail-migration/anon-params-deprecated.stderr
+++ b/src/test/ui/compile-fail-migration/anon-params-deprecated.stderr
--- a/src/test/ui/compile-fail-migration/arg-count-mismatch.rs
+++ b/src/test/ui/compile-fail-migration/arg-count-mismatch.rs
--- a/src/test/ui/compile-fail-migration/arg-count-mismatch.stderr
+++ b/src/test/ui/compile-fail-migration/arg-count-mismatch.stderr
--- a/src/test/ui/compile-fail-migration/arg-type-mismatch.rs
+++ b/src/test/ui/compile-fail-migration/arg-type-mismatch.rs
--- a/src/test/ui/compile-fail-migration/arg-type-mismatch.stderr
+++ b/src/test/ui/compile-fail-migration/arg-type-mismatch.stderr
--- a/src/test/ui/compile-fail-migration/array-not-vector.rs
+++ b/src/test/ui/compile-fail-migration/array-not-vector.rs
--- a/src/test/ui/compile-fail-migration/array-not-vector.stderr
+++ b/src/test/ui/compile-fail-migration/array-not-vector.stderr
--- a/src/test/ui/compile-fail-migration/array_const_index-0.rs
+++ b/src/test/ui/compile-fail-migration/array_const_index-0.rs
--- a/src/test/ui/compile-fail-migration/array_const_index-0.stderr
+++ b/src/test/ui/compile-fail-migration/array_const_index-0.stderr
--- a/src/test/ui/compile-fail-migration/array_const_index-1.rs
+++ b/src/test/ui/compile-fail-migration/array_const_index-1.rs
--- a/src/test/ui/compile-fail-migration/array_const_index-1.stderr
+++ b/src/test/ui/compile-fail-migration/array_const_index-1.stderr
--- a/src/test/ui/compile-fail-migration/asm-bad-clobber.rs
+++ b/src/test/ui/compile-fail-migration/asm-bad-clobber.rs
--- a/src/test/ui/compile-fail-migration/asm-bad-clobber.stderr
+++ b/src/test/ui/compile-fail-migration/asm-bad-clobber.stderr
--- a/src/test/ui/compile-fail-migration/asm-in-bad-modifier.rs
+++ b/src/test/ui/compile-fail-migration/asm-in-bad-modifier.rs
--- a/src/test/ui/compile-fail-migration/asm-in-bad-modifier.stderr
+++ b/src/test/ui/compile-fail-migration/asm-in-bad-modifier.stderr
--- a/src/test/ui/compile-fail-migration/asm-misplaced-option.rs
+++ b/src/test/ui/compile-fail-migration/asm-misplaced-option.rs
--- a/src/test/ui/compile-fail-migration/asm-misplaced-option.stderr
+++ b/src/test/ui/compile-fail-migration/asm-misplaced-option.stderr
--- a/src/test/ui/asm/asm-out-assign-imm.nll.stderr
+++ b/src/test/ui/asm/asm-out-assign-imm.nll.stderr
--- a/src/test/ui/asm/asm-out-assign-imm.rs
+++ b/src/test/ui/asm/asm-out-assign-imm.rs
--- a/src/test/ui/asm/asm-out-assign-imm.stderr
+++ b/src/test/ui/asm/asm-out-assign-imm.stderr
--- a/src/test/ui/compile-fail-migration/asm-out-no-modifier.rs
+++ b/src/test/ui/compile-fail-migration/asm-out-no-modifier.rs
--- a/src/test/ui/compile-fail-migration/asm-out-no-modifier.stderr
+++ b/src/test/ui/compile-fail-migration/asm-out-no-modifier.stderr
--- a/src/test/ui/compile-fail-migration/asm-out-read-uninit.ast.stderr
+++ b/src/test/ui/compile-fail-migration/asm-out-read-uninit.ast.stderr
--- a/src/test/ui/compile-fail-migration/asm-out-read-uninit.mir.stderr
+++ b/src/test/ui/compile-fail-migration/asm-out-read-uninit.mir.stderr
--- a/src/test/ui/compile-fail-migration/asm-out-read-uninit.rs
+++ b/src/test/ui/compile-fail-migration/asm-out-read-uninit.rs
--- a/src/test/ui/compile-fail-migration/asm-src-loc-codegen-units.rs
+++ b/src/test/ui/compile-fail-migration/asm-src-loc-codegen-units.rs
--- a/src/test/ui/compile-fail-migration/asm-src-loc-codegen-units.stderr
+++ b/src/test/ui/compile-fail-migration/asm-src-loc-codegen-units.stderr
--- a/src/test/ui/compile-fail-migration/asm-src-loc.rs
+++ b/src/test/ui/compile-fail-migration/asm-src-loc.rs
--- a/src/test/ui/compile-fail-migration/asm-src-loc.stderr
+++ b/src/test/ui/compile-fail-migration/asm-src-loc.stderr
--- a/src/test/ui/compile-fail-migration/assign-imm-local-twice.ast.nll.stderr
+++ b/src/test/ui/compile-fail-migration/assign-imm-local-twice.ast.nll.stderr
--- a/src/test/ui/compile-fail-migration/assign-imm-local-twice.ast.stderr
+++ b/src/test/ui/compile-fail-migration/assign-imm-local-twice.ast.stderr
--- a/src/test/ui/compile-fail-migration/assign-imm-local-twice.mir.stderr
+++ b/src/test/ui/compile-fail-migration/assign-imm-local-twice.mir.stderr
--- a/src/test/ui/compile-fail-migration/assign-imm-local-twice.rs
+++ b/src/test/ui/compile-fail-migration/assign-imm-local-twice.rs
--- a/src/test/ui/compile-fail-migration/assign-to-method.rs
+++ b/src/test/ui/compile-fail-migration/assign-to-method.rs
--- a/src/test/ui/compile-fail-migration/assign-to-method.stderr
+++ b/src/test/ui/compile-fail-migration/assign-to-method.stderr
--- a/src/test/ui/compile-fail-migration/assignment-operator-unimplemented.rs
+++ b/src/test/ui/compile-fail-migration/assignment-operator-unimplemented.rs
--- a/src/test/ui/compile-fail-migration/assignment-operator-unimplemented.stderr
+++ b/src/test/ui/compile-fail-migration/assignment-operator-unimplemented.stderr
--- a/src/test/ui/compile-fail-migration/assoc-inherent.rs
+++ b/src/test/ui/compile-fail-migration/assoc-inherent.rs
--- a/src/test/ui/compile-fail-migration/assoc-inherent.stderr
+++ b/src/test/ui/compile-fail-migration/assoc-inherent.stderr
--- a/src/test/ui/compile-fail-migration/associated-const-ambiguity-report.rs
+++ b/src/test/ui/compile-fail-migration/associated-const-ambiguity-report.rs
--- a/src/test/ui/compile-fail-migration/associated-const-ambiguity-report.stderr
+++ b/src/test/ui/compile-fail-migration/associated-const-ambiguity-report.stderr
--- a/src/test/ui/compile-fail-migration/associated-const-array-len.rs
+++ b/src/test/ui/compile-fail-migration/associated-const-array-len.rs
--- a/src/test/ui/compile-fail-migration/associated-const-array-len.stderr
+++ b/src/test/ui/compile-fail-migration/associated-const-array-len.stderr
--- a/src/test/ui/compile-fail-migration/associated-const-dead-code.rs
+++ b/src/test/ui/compile-fail-migration/associated-const-dead-code.rs
--- a/src/test/ui/compile-fail-migration/associated-const-dead-code.stderr
+++ b/src/test/ui/compile-fail-migration/associated-const-dead-code.stderr
--- a/src/test/ui/compile-fail-migration/associated-const-generic-obligations.rs
+++ b/src/test/ui/compile-fail-migration/associated-const-generic-obligations.rs
--- a/src/test/ui/compile-fail-migration/associated-const-generic-obligations.stderr
+++ b/src/test/ui/compile-fail-migration/associated-const-generic-obligations.stderr
--- a/src/test/ui/associated-const/associated-const-impl-wrong-lifetime.rs
+++ b/src/test/ui/associated-const/associated-const-impl-wrong-lifetime.rs
--- a/src/test/ui/associated-const/associated-const-impl-wrong-lifetime.stderr
+++ b/src/test/ui/associated-const/associated-const-impl-wrong-lifetime.stderr
--- a/src/test/ui/associated-const/associated-const-impl-wrong-type.rs
+++ b/src/test/ui/associated-const/associated-const-impl-wrong-type.rs
--- a/src/test/ui/associated-const/associated-const-impl-wrong-type.stderr
+++ b/src/test/ui/associated-const/associated-const-impl-wrong-type.stderr
--- a/src/test/ui/compile-fail-migration/associated-const-in-trait.rs
+++ b/src/test/ui/compile-fail-migration/associated-const-in-trait.rs
--- a/Show more
+++ b/Show more