about summary refs log tree commit diff
path: root/src/libcore/intrinsics.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-07-19 04:03:54 +0000
committerbors <bors@rust-lang.org>2020-07-19 04:03:54 +0000
commit0701419e96d94e5493c7ebfcecb66511ab0aa778 (patch)
treec8c859bd81bc547333c6f68d56990b9a859c4d20 /src/libcore/intrinsics.rs
parent1fa54ad9680cc82e7301f8ed4e9b7402dfd6ce0e (diff)
parenta83e294f7778c3643005dc0567fe47767fab6508 (diff)
downloadrust-0701419e96d94e5493c7ebfcecb66511ab0aa778.tar.gz
rust-0701419e96d94e5493c7ebfcecb66511ab0aa778.zip
Auto merge of #74493 - Manishearth:rollup-ust7yr4, r=Manishearth
Rollup of 7 pull requests

Successful merges:

 - #70817 (Add core::task::ready! macro)
 - #73762 (Document the trait keyword)
 - #74021 (impl Index<RangeFrom> for CStr)
 - #74071 (rustc_metadata: Make crate loading fully speculative)
 - #74445 (add test for #62878)
 - #74459 (Make unreachable_unchecked a const fn)
 - #74478 (Revert "Use an UTF-8 locale for the linker.")

Failed merges:

r? @ghost
Diffstat (limited to 'src/libcore/intrinsics.rs')
-rw-r--r--src/libcore/intrinsics.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libcore/intrinsics.rs b/src/libcore/intrinsics.rs
index 080760aa81f..8f0cf4361e7 100644
--- a/src/libcore/intrinsics.rs
+++ b/src/libcore/intrinsics.rs
@@ -932,6 +932,7 @@ extern "rust-intrinsic" {
     ///
     /// The stabilized version of this intrinsic is
     /// [`std::hint::unreachable_unchecked`](../../std/hint/fn.unreachable_unchecked.html).
+    #[rustc_const_unstable(feature = "const_unreachable_unchecked", issue = "53188")]
     pub fn unreachable() -> !;
 
     /// Informs the optimizer that a condition is always true.