From af442d964de8cb9814f0e2374db34e87fb21ca73 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Fri, 17 Apr 2020 18:36:16 +0900 Subject: [PATCH] Rename `asm` test directory in favor of `llvm_asm` --- src/test/ui/{asm => llvm-asm}/issue-51431.rs | 0 .../ui/{asm => llvm-asm}/issue-51431.stderr | 0 src/test/ui/{asm => llvm-asm}/issue-54067.rs | 0 src/test/ui/{asm => llvm-asm}/issue-62046.rs | 0 .../ui/{asm => llvm-asm}/issue-62046.stderr | 0 src/test/ui/{asm => llvm-asm}/issue-69092.rs | 0 .../ui/{asm => llvm-asm}/issue-69092.stderr | 0 .../llvm-asm-bad-clobber.rs} | 0 .../llvm-asm-bad-clobber.stderr} | 2 +- .../llvm-asm-in-bad-modifier.rs} | 0 .../llvm-asm-in-bad-modifier.stderr} | 4 ++-- .../llvm-asm-literal-escaping.rs} | 0 .../llvm-asm-misplaced-option.rs} | 0 .../llvm-asm-misplaced-option.stderr} | 4 ++-- .../llvm-asm-out-assign-imm.rs} | 0 .../llvm-asm-out-assign-imm.stderr} | 2 +- .../llvm-asm-out-no-modifier.rs} | 0 .../llvm-asm-out-no-modifier.stderr} | 2 +- .../llvm-asm-out-read-uninit.rs} | 0 .../llvm-asm-out-read-uninit.stderr} | 2 +- .../llvm-asm-parse-errors.rs} | 0 .../llvm-asm-parse-errors.stderr} | 22 +++++++++---------- 22 files changed, 19 insertions(+), 19 deletions(-) rename src/test/ui/{asm => llvm-asm}/issue-51431.rs (100%) rename src/test/ui/{asm => llvm-asm}/issue-51431.stderr (100%) rename src/test/ui/{asm => llvm-asm}/issue-54067.rs (100%) rename src/test/ui/{asm => llvm-asm}/issue-62046.rs (100%) rename src/test/ui/{asm => llvm-asm}/issue-62046.stderr (100%) rename src/test/ui/{asm => llvm-asm}/issue-69092.rs (100%) rename src/test/ui/{asm => llvm-asm}/issue-69092.stderr (100%) rename src/test/ui/{asm/asm-bad-clobber.rs => llvm-asm/llvm-asm-bad-clobber.rs} (100%) rename src/test/ui/{asm/asm-bad-clobber.stderr => llvm-asm/llvm-asm-bad-clobber.stderr} (87%) rename src/test/ui/{asm/asm-in-bad-modifier.rs => llvm-asm/llvm-asm-in-bad-modifier.rs} (100%) rename src/test/ui/{asm/asm-in-bad-modifier.stderr => llvm-asm/llvm-asm-in-bad-modifier.stderr} (84%) rename src/test/ui/{asm/asm-literal-escaping.rs => llvm-asm/llvm-asm-literal-escaping.rs} (100%) rename src/test/ui/{asm/asm-misplaced-option.rs => llvm-asm/llvm-asm-misplaced-option.rs} (100%) rename src/test/ui/{asm/asm-misplaced-option.stderr => llvm-asm/llvm-asm-misplaced-option.stderr} (83%) rename src/test/ui/{asm/asm-out-assign-imm.rs => llvm-asm/llvm-asm-out-assign-imm.rs} (100%) rename src/test/ui/{asm/asm-out-assign-imm.stderr => llvm-asm/llvm-asm-out-assign-imm.stderr} (91%) rename src/test/ui/{asm/asm-out-no-modifier.rs => llvm-asm/llvm-asm-out-no-modifier.rs} (100%) rename src/test/ui/{asm/asm-out-no-modifier.stderr => llvm-asm/llvm-asm-out-no-modifier.stderr} (85%) rename src/test/ui/{asm/asm-out-read-uninit.rs => llvm-asm/llvm-asm-out-read-uninit.rs} (100%) rename src/test/ui/{asm/asm-out-read-uninit.stderr => llvm-asm/llvm-asm-out-read-uninit.stderr} (87%) rename src/test/ui/{asm/asm-parse-errors.rs => llvm-asm/llvm-asm-parse-errors.rs} (100%) rename src/test/ui/{asm/asm-parse-errors.stderr => llvm-asm/llvm-asm-parse-errors.stderr} (80%) diff --git a/src/test/ui/asm/issue-51431.rs b/src/test/ui/llvm-asm/issue-51431.rs similarity index 100% rename from src/test/ui/asm/issue-51431.rs rename to src/test/ui/llvm-asm/issue-51431.rs diff --git a/src/test/ui/asm/issue-51431.stderr b/src/test/ui/llvm-asm/issue-51431.stderr similarity index 100% rename from src/test/ui/asm/issue-51431.stderr rename to src/test/ui/llvm-asm/issue-51431.stderr diff --git a/src/test/ui/asm/issue-54067.rs b/src/test/ui/llvm-asm/issue-54067.rs similarity index 100% rename from src/test/ui/asm/issue-54067.rs rename to src/test/ui/llvm-asm/issue-54067.rs diff --git a/src/test/ui/asm/issue-62046.rs b/src/test/ui/llvm-asm/issue-62046.rs similarity index 100% rename from src/test/ui/asm/issue-62046.rs rename to src/test/ui/llvm-asm/issue-62046.rs diff --git a/src/test/ui/asm/issue-62046.stderr b/src/test/ui/llvm-asm/issue-62046.stderr similarity index 100% rename from src/test/ui/asm/issue-62046.stderr rename to src/test/ui/llvm-asm/issue-62046.stderr diff --git a/src/test/ui/asm/issue-69092.rs b/src/test/ui/llvm-asm/issue-69092.rs similarity index 100% rename from src/test/ui/asm/issue-69092.rs rename to src/test/ui/llvm-asm/issue-69092.rs diff --git a/src/test/ui/asm/issue-69092.stderr b/src/test/ui/llvm-asm/issue-69092.stderr similarity index 100% rename from src/test/ui/asm/issue-69092.stderr rename to src/test/ui/llvm-asm/issue-69092.stderr diff --git a/src/test/ui/asm/asm-bad-clobber.rs b/src/test/ui/llvm-asm/llvm-asm-bad-clobber.rs similarity index 100% rename from src/test/ui/asm/asm-bad-clobber.rs rename to src/test/ui/llvm-asm/llvm-asm-bad-clobber.rs diff --git a/src/test/ui/asm/asm-bad-clobber.stderr b/src/test/ui/llvm-asm/llvm-asm-bad-clobber.stderr similarity index 87% rename from src/test/ui/asm/asm-bad-clobber.stderr rename to src/test/ui/llvm-asm/llvm-asm-bad-clobber.stderr index 8c5d04694c497..9ecd12caa0e2a 100644 --- a/src/test/ui/asm/asm-bad-clobber.stderr +++ b/src/test/ui/llvm-asm/llvm-asm-bad-clobber.stderr @@ -1,5 +1,5 @@ error[E0664]: clobber should not be surrounded by braces - --> $DIR/asm-bad-clobber.rs:22:42 + --> $DIR/llvm-asm-bad-clobber.rs:22:42 | LL | llvm_asm!("xor %eax, %eax" : : : "{eax}"); | ^^^^^^^ diff --git a/src/test/ui/asm/asm-in-bad-modifier.rs b/src/test/ui/llvm-asm/llvm-asm-in-bad-modifier.rs similarity index 100% rename from src/test/ui/asm/asm-in-bad-modifier.rs rename to src/test/ui/llvm-asm/llvm-asm-in-bad-modifier.rs diff --git a/src/test/ui/asm/asm-in-bad-modifier.stderr b/src/test/ui/llvm-asm/llvm-asm-in-bad-modifier.stderr similarity index 84% rename from src/test/ui/asm/asm-in-bad-modifier.stderr rename to src/test/ui/llvm-asm/llvm-asm-in-bad-modifier.stderr index f1624f74a70ac..e94ac94f59f9a 100644 --- a/src/test/ui/asm/asm-in-bad-modifier.stderr +++ b/src/test/ui/llvm-asm/llvm-asm-in-bad-modifier.stderr @@ -1,11 +1,11 @@ error[E0662]: input operand constraint contains '=' - --> $DIR/asm-in-bad-modifier.rs:23:44 + --> $DIR/llvm-asm-in-bad-modifier.rs:23:44 | LL | llvm_asm!("mov $1, $0" : "=r"(x) : "=r"(5)); | ^^^^ error[E0663]: input operand constraint contains '+' - --> $DIR/asm-in-bad-modifier.rs:24:44 + --> $DIR/llvm-asm-in-bad-modifier.rs:24:44 | LL | llvm_asm!("mov $1, $0" : "=r"(y) : "+r"(5)); | ^^^^ diff --git a/src/test/ui/asm/asm-literal-escaping.rs b/src/test/ui/llvm-asm/llvm-asm-literal-escaping.rs similarity index 100% rename from src/test/ui/asm/asm-literal-escaping.rs rename to src/test/ui/llvm-asm/llvm-asm-literal-escaping.rs diff --git a/src/test/ui/asm/asm-misplaced-option.rs b/src/test/ui/llvm-asm/llvm-asm-misplaced-option.rs similarity index 100% rename from src/test/ui/asm/asm-misplaced-option.rs rename to src/test/ui/llvm-asm/llvm-asm-misplaced-option.rs diff --git a/src/test/ui/asm/asm-misplaced-option.stderr b/src/test/ui/llvm-asm/llvm-asm-misplaced-option.stderr similarity index 83% rename from src/test/ui/asm/asm-misplaced-option.stderr rename to src/test/ui/llvm-asm/llvm-asm-misplaced-option.stderr index ea155b91c5d61..21fd27825a185 100644 --- a/src/test/ui/asm/asm-misplaced-option.stderr +++ b/src/test/ui/llvm-asm/llvm-asm-misplaced-option.stderr @@ -1,11 +1,11 @@ warning: unrecognized option - --> $DIR/asm-misplaced-option.rs:24:69 + --> $DIR/llvm-asm-misplaced-option.rs:24:69 | LL | llvm_asm!("mov $1, $0" : "=r"(x) : "r"(5_usize), "0"(x) : : "cc"); | ^^^^ warning: expected a clobber, found an option - --> $DIR/asm-misplaced-option.rs:31:85 + --> $DIR/llvm-asm-misplaced-option.rs:31:85 | LL | llvm_asm!("add $2, $1; mov $1, $0" : "=r"(x) : "r"(x), "r"(8_usize) : "cc", "volatile"); | ^^^^^^^^^^ diff --git a/src/test/ui/asm/asm-out-assign-imm.rs b/src/test/ui/llvm-asm/llvm-asm-out-assign-imm.rs similarity index 100% rename from src/test/ui/asm/asm-out-assign-imm.rs rename to src/test/ui/llvm-asm/llvm-asm-out-assign-imm.rs diff --git a/src/test/ui/asm/asm-out-assign-imm.stderr b/src/test/ui/llvm-asm/llvm-asm-out-assign-imm.stderr similarity index 91% rename from src/test/ui/asm/asm-out-assign-imm.stderr rename to src/test/ui/llvm-asm/llvm-asm-out-assign-imm.stderr index feec61b4fc6ef..e110aec220936 100644 --- a/src/test/ui/asm/asm-out-assign-imm.stderr +++ b/src/test/ui/llvm-asm/llvm-asm-out-assign-imm.stderr @@ -1,5 +1,5 @@ error[E0384]: cannot assign twice to immutable variable `x` - --> $DIR/asm-out-assign-imm.rs:24:39 + --> $DIR/llvm-asm-out-assign-imm.rs:24:39 | LL | let x: isize; | - help: make this binding mutable: `mut x` diff --git a/src/test/ui/asm/asm-out-no-modifier.rs b/src/test/ui/llvm-asm/llvm-asm-out-no-modifier.rs similarity index 100% rename from src/test/ui/asm/asm-out-no-modifier.rs rename to src/test/ui/llvm-asm/llvm-asm-out-no-modifier.rs diff --git a/src/test/ui/asm/asm-out-no-modifier.stderr b/src/test/ui/llvm-asm/llvm-asm-out-no-modifier.stderr similarity index 85% rename from src/test/ui/asm/asm-out-no-modifier.stderr rename to src/test/ui/llvm-asm/llvm-asm-out-no-modifier.stderr index 1c9e108f910c6..1f2b272792435 100644 --- a/src/test/ui/asm/asm-out-no-modifier.stderr +++ b/src/test/ui/llvm-asm/llvm-asm-out-no-modifier.stderr @@ -1,5 +1,5 @@ error[E0661]: output operand constraint lacks '=' or '+' - --> $DIR/asm-out-no-modifier.rs:22:34 + --> $DIR/llvm-asm-out-no-modifier.rs:22:34 | LL | llvm_asm!("mov $1, $0" : "r"(x) : "r"(5)); | ^^^ diff --git a/src/test/ui/asm/asm-out-read-uninit.rs b/src/test/ui/llvm-asm/llvm-asm-out-read-uninit.rs similarity index 100% rename from src/test/ui/asm/asm-out-read-uninit.rs rename to src/test/ui/llvm-asm/llvm-asm-out-read-uninit.rs diff --git a/src/test/ui/asm/asm-out-read-uninit.stderr b/src/test/ui/llvm-asm/llvm-asm-out-read-uninit.stderr similarity index 87% rename from src/test/ui/asm/asm-out-read-uninit.stderr rename to src/test/ui/llvm-asm/llvm-asm-out-read-uninit.stderr index 3c3f3a6febb5a..a22ebe4e4d9db 100644 --- a/src/test/ui/asm/asm-out-read-uninit.stderr +++ b/src/test/ui/llvm-asm/llvm-asm-out-read-uninit.stderr @@ -1,5 +1,5 @@ error[E0381]: use of possibly-uninitialized variable: `x` - --> $DIR/asm-out-read-uninit.rs:22:48 + --> $DIR/llvm-asm-out-read-uninit.rs:22:48 | LL | llvm_asm!("mov $1, $0" : "=r"(x) : "r"(x)); | ^ use of possibly-uninitialized `x` diff --git a/src/test/ui/asm/asm-parse-errors.rs b/src/test/ui/llvm-asm/llvm-asm-parse-errors.rs similarity index 100% rename from src/test/ui/asm/asm-parse-errors.rs rename to src/test/ui/llvm-asm/llvm-asm-parse-errors.rs diff --git a/src/test/ui/asm/asm-parse-errors.stderr b/src/test/ui/llvm-asm/llvm-asm-parse-errors.stderr similarity index 80% rename from src/test/ui/asm/asm-parse-errors.stderr rename to src/test/ui/llvm-asm/llvm-asm-parse-errors.stderr index 64f295c3b3698..1fd46809f3eed 100644 --- a/src/test/ui/asm/asm-parse-errors.stderr +++ b/src/test/ui/llvm-asm/llvm-asm-parse-errors.stderr @@ -1,65 +1,65 @@ error: macro requires a string literal as an argument - --> $DIR/asm-parse-errors.rs:4:5 + --> $DIR/llvm-asm-parse-errors.rs:4:5 | LL | llvm_asm!(); | ^^^^^^^^^^^^ string literal required error: expected string literal - --> $DIR/asm-parse-errors.rs:5:23 + --> $DIR/llvm-asm-parse-errors.rs:5:23 | LL | llvm_asm!("nop" : struct); | ^^^^^^ not a string literal error: expected string literal - --> $DIR/asm-parse-errors.rs:6:35 + --> $DIR/llvm-asm-parse-errors.rs:6:35 | LL | llvm_asm!("mov %eax, $$0x2" : struct); | ^^^^^^ not a string literal error: expected `(`, found keyword `struct` - --> $DIR/asm-parse-errors.rs:7:44 + --> $DIR/llvm-asm-parse-errors.rs:7:44 | LL | llvm_asm!("mov %eax, $$0x2" : "={eax}" struct); | ^^^^^^ expected `(` error: expected expression, found keyword `struct` - --> $DIR/asm-parse-errors.rs:8:44 + --> $DIR/llvm-asm-parse-errors.rs:8:44 | LL | llvm_asm!("mov %eax, $$0x2" : "={eax}"(struct)); | ^^^^^^ expected expression error: expected string literal - --> $DIR/asm-parse-errors.rs:9:49 + --> $DIR/llvm-asm-parse-errors.rs:9:49 | LL | llvm_asm!("in %dx, %al" : "={al}"(result) : struct); | ^^^^^^ not a string literal error: expected `(`, found keyword `struct` - --> $DIR/asm-parse-errors.rs:10:56 + --> $DIR/llvm-asm-parse-errors.rs:10:56 | LL | llvm_asm!("in %dx, %al" : "={al}"(result) : "{dx}" struct); | ^^^^^^ expected `(` error: expected expression, found keyword `struct` - --> $DIR/asm-parse-errors.rs:11:56 + --> $DIR/llvm-asm-parse-errors.rs:11:56 | LL | llvm_asm!("in %dx, %al" : "={al}"(result) : "{dx}"(struct)); | ^^^^^^ expected expression error: expected string literal - --> $DIR/asm-parse-errors.rs:12:41 + --> $DIR/llvm-asm-parse-errors.rs:12:41 | LL | llvm_asm!("mov $$0x200, %eax" : : : struct); | ^^^^^^ not a string literal error: expected string literal - --> $DIR/asm-parse-errors.rs:13:50 + --> $DIR/llvm-asm-parse-errors.rs:13:50 | LL | llvm_asm!("mov eax, 2" : "={eax}"(foo) : : : struct); | ^^^^^^ not a string literal error: inline assembly must be a string literal - --> $DIR/asm-parse-errors.rs:14:15 + --> $DIR/llvm-asm-parse-errors.rs:14:15 | LL | llvm_asm!(123); | ^^^