Skip to content

Commit

Permalink
Rollup merge of #67989 - ollie27:rustdoc_unstable, r=GuillaumeGomez
Browse files Browse the repository at this point in the history
rustdoc: Don't allow `#![feature(...)]` on stable or beta

Fixes #67647

r? @GuillaumeGomez
  • Loading branch information
JohnTitor authored Jan 14, 2020
2 parents fd162a4 + 4057199 commit 9e47ddd
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/librustdoc/core.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 9e47ddd

Please sign in to comment.