about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2020-01-14 14:02:18 +0900
committerGitHub <noreply@github.com>2020-01-14 14:02:18 +0900
commit9e47ddd399fab91af5eb804727f9f1400a140753 (patch)
tree3e63303b80d73e0d84b64efcf1f71edfee617409 /src
parentfd162a48bcd70ba93a039cb7a2bbbcf81a62c748 (diff)
parent40571995984a0f2c466f77955e7d147887c2179b (diff)
downloadrust-9e47ddd399fab91af5eb804727f9f1400a140753.tar.gz
rust-9e47ddd399fab91af5eb804727f9f1400a140753.zip
Rollup merge of #67989 - ollie27:rustdoc_unstable, r=GuillaumeGomez
rustdoc: Don't allow `#![feature(...)]` on stable or beta

Fixes #67647

r? @GuillaumeGomez
Diffstat (limited to 'src')
-rw-r--r--src/librustdoc/core.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs
index 61a7bc765bc..4c8b8112fa8 100644
--- a/src/librustdoc/core.rs
+++ b/src/librustdoc/core.rs
@@ -307,8 +307,7 @@ pub fn run_core(options: RustdocOptions) -> (clean::Crate, RenderInfo, RenderOpt
         cg: codegen_options,
         externs,
         target_triple: target,
-        // Ensure that rustdoc works even if rustc is feature-staged
-        unstable_features: UnstableFeatures::Allow,
+        unstable_features: UnstableFeatures::from_environment(),
         actually_rustdoc: true,
         debugging_opts: debugging_options,
         error_format,