diff options
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/consts/const-eval/const_panic.rs (renamed from src/test/ui/const-eval/const_panic.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/consts/const-eval/const_panic.stderr (renamed from src/test/ui/const-eval/const_panic.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/consts/const-eval/const_panic_libcore.rs (renamed from src/test/ui/const-eval/const_panic_libcore.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/consts/const-eval/const_panic_libcore.stderr (renamed from src/test/ui/const-eval/const_panic_libcore.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/consts/const-eval/const_panic_libcore_main.rs (renamed from src/test/ui/const-eval/const_panic_libcore_main.rs) | 2 | ||||
| -rw-r--r-- | src/test/ui/consts/const-eval/const_panic_libcore_main.stderr (renamed from src/test/ui/const-eval/const_panic_libcore_main.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/consts/const-eval/feature-gate-const_panic.rs (renamed from src/test/ui/const-eval/feature-gate-const_panic.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/consts/const-eval/feature-gate-const_panic.stderr (renamed from src/test/ui/const-eval/feature-gate-const_panic.stderr) | 0 |
9 files changed, 3 insertions, 1 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 4a819814d81..6c33c4c245b 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -225,7 +225,7 @@ declare_features! ( (active, const_compare_raw_pointers, "1.27.0", Some(53020), None), // Allows panicking during const eval (produces compile-time errors) - (active, const_panic, "1.29.0", Some(51999), None), + (active, const_panic, "1.30.0", Some(51999), None), // Allows using #[prelude_import] on glob `use` items. // diff --git a/src/test/ui/const-eval/const_panic.rs b/src/test/ui/consts/const-eval/const_panic.rs index f2170f509eb..f2170f509eb 100644 --- a/src/test/ui/const-eval/const_panic.rs +++ b/src/test/ui/consts/const-eval/const_panic.rs diff --git a/src/test/ui/const-eval/const_panic.stderr b/src/test/ui/consts/const-eval/const_panic.stderr index c11146f4882..c11146f4882 100644 --- a/src/test/ui/const-eval/const_panic.stderr +++ b/src/test/ui/consts/const-eval/const_panic.stderr diff --git a/src/test/ui/const-eval/const_panic_libcore.rs b/src/test/ui/consts/const-eval/const_panic_libcore.rs index 59aeca18129..59aeca18129 100644 --- a/src/test/ui/const-eval/const_panic_libcore.rs +++ b/src/test/ui/consts/const-eval/const_panic_libcore.rs diff --git a/src/test/ui/const-eval/const_panic_libcore.stderr b/src/test/ui/consts/const-eval/const_panic_libcore.stderr index 45f2ee7744e..45f2ee7744e 100644 --- a/src/test/ui/const-eval/const_panic_libcore.stderr +++ b/src/test/ui/consts/const-eval/const_panic_libcore.stderr diff --git a/src/test/ui/const-eval/const_panic_libcore_main.rs b/src/test/ui/consts/const-eval/const_panic_libcore_main.rs index bbbe827a8ef..c66e1fe4bf5 100644 --- a/src/test/ui/const-eval/const_panic_libcore_main.rs +++ b/src/test/ui/consts/const-eval/const_panic_libcore_main.rs @@ -28,6 +28,8 @@ const X: () = unimplemented!(); #[lang = "eh_personality"] fn eh() {} +#[lang = "eh_unwind_resume"] +fn eh_unwind_resume() {} #[panic_implementation] fn panic(_info: &PanicInfo) -> ! { diff --git a/src/test/ui/const-eval/const_panic_libcore_main.stderr b/src/test/ui/consts/const-eval/const_panic_libcore_main.stderr index 7cb9f51c427..7cb9f51c427 100644 --- a/src/test/ui/const-eval/const_panic_libcore_main.stderr +++ b/src/test/ui/consts/const-eval/const_panic_libcore_main.stderr diff --git a/src/test/ui/const-eval/feature-gate-const_panic.rs b/src/test/ui/consts/const-eval/feature-gate-const_panic.rs index 26eb95d9c66..26eb95d9c66 100644 --- a/src/test/ui/const-eval/feature-gate-const_panic.rs +++ b/src/test/ui/consts/const-eval/feature-gate-const_panic.rs diff --git a/src/test/ui/const-eval/feature-gate-const_panic.stderr b/src/test/ui/consts/const-eval/feature-gate-const_panic.stderr index f4d05edd04a..f4d05edd04a 100644 --- a/src/test/ui/const-eval/feature-gate-const_panic.stderr +++ b/src/test/ui/consts/const-eval/feature-gate-const_panic.stderr |