about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-09-14 14:50:16 +0800
committerGitHub <noreply@github.com>2018-09-14 14:50:16 +0800
commit585f39fb32ef114d47ff5466e7aa3d5d0157c969 (patch)
treea2dad138b905e4c6293f6cc096b5e9ca77cd0027 /src/libstd
parentae8410bf2916d6913d647ad2135144eadd33c8d8 (diff)
parentdda7e0dec6d3a9dd3a89d6483b81f3d1511ec63a (diff)
downloadrust-585f39fb32ef114d47ff5466e7aa3d5d0157c969.tar.gz
rust-585f39fb32ef114d47ff5466e7aa3d5d0157c969.zip
Rollup merge of #54207 - QuietMisdreavus:never-docs-stab, r=kennytm
re-mark the never docs as unstable

Fixes https://github.com/rust-lang/rust/issues/54198

This stability attribute was removed in https://github.com/rust-lang/rust/pull/47630, but not replaced with a `#[stable]` attribute, and when https://github.com/rust-lang/rust/pull/50121 reverted that stabilization, it didn't set the docs back to unstable. I'm concerned as to why it was allowed to not have the stability attribute at all, but at least this can put it back.

I'm nominating this for beta backport because it's a really small change, and right now our docs are in an awkward position where the `!` type is technically unstable to use, but the docs don't say so the same way any other library feature would. (And this is also the case *on stable* now, but i'm not suggesting a stable backport for a docs fix.)
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/primitive_docs.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstd/primitive_docs.rs b/src/libstd/primitive_docs.rs
index 7074928eaf6..4c1fdc4f895 100644
--- a/src/libstd/primitive_docs.rs
+++ b/src/libstd/primitive_docs.rs
@@ -250,6 +250,7 @@ mod prim_bool { }
 /// [`Default`]: default/trait.Default.html
 /// [`default()`]: default/trait.Default.html#tymethod.default
 ///
+#[unstable(feature = "never_type", issue = "35121")]
 mod prim_never { }
 
 #[doc(primitive = "char")]