Skip to content

Commit 1301f43

Browse files
Remove E0019, use E0015 for inline assembly in a const
1 parent 0c26144 commit 1301f43

File tree

5 files changed

+6
-44
lines changed

5 files changed

+6
-44
lines changed

compiler/rustc_error_codes/src/error_codes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ E0010: include_str!("./error_codes/E0010.md"),
1818
E0013: include_str!("./error_codes/E0013.md"),
1919
E0014: include_str!("./error_codes/E0014.md"),
2020
E0015: include_str!("./error_codes/E0015.md"),
21-
E0019: include_str!("./error_codes/E0019.md"),
2221
E0023: include_str!("./error_codes/E0023.md"),
2322
E0025: include_str!("./error_codes/E0025.md"),
2423
E0026: include_str!("./error_codes/E0026.md"),
@@ -461,6 +460,7 @@ E0774: include_str!("./error_codes/E0774.md"),
461460
;
462461
// E0006, // merged with E0005
463462
// E0008, // cannot bind by-move into a pattern guard
463+
// E0019, merged into E0015
464464
// E0035, merged into E0087/E0089
465465
// E0036, merged into E0087/E0089
466466
// E0068,

compiler/rustc_error_codes/src/error_codes/E0019.md

-38
This file was deleted.

compiler/rustc_mir/src/transform/check_consts/ops.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@ impl NonConstOp for InlineAsm {
193193
struct_span_err!(
194194
ccx.tcx.sess,
195195
span,
196-
E0019,
197-
"{} contains unimplemented expression type",
196+
E0015,
197+
"inline assembly is not allowed in {}s",
198198
ccx.const_kind()
199199
)
200200
}

src/test/ui/consts/inline_asm.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#![feature(llvm_asm)]
22

33
const _: () = unsafe { llvm_asm!("nop") };
4-
//~^ ERROR contains unimplemented expression type
4+
//~^ ERROR inline assembly
55

66
fn main() {}

src/test/ui/consts/inline_asm.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0019]: constant contains unimplemented expression type
1+
error[E0015]: inline assembly is not allowed in constants
22
--> $DIR/inline_asm.rs:3:24
33
|
44
LL | const _: () = unsafe { llvm_asm!("nop") };
@@ -8,4 +8,4 @@ LL | const _: () = unsafe { llvm_asm!("nop") };
88

99
error: aborting due to previous error
1010

11-
For more information about this error, try `rustc --explain E0019`.
11+
For more information about this error, try `rustc --explain E0015`.

0 commit comments

Comments
 (0)