mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #82207 - ehuss:rustdoc-2021, r=jyn514

Browse Source 
rustdoc: treat edition 2021 as unstable

This ensures that `--edition=2021` requires `-Z unstable-options` in rustdoc.
This commit is contained in:
Guillaume Gomez 2021-02-17 20:38:07 +01:00 committed by GitHub
commit f97e1121a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_session/src/config.rs
View File

@ -1350,7 +1350,7 @@ pub fn parse_error_format(
error_format error_format
} }
fn parse_crate_edition(matches: &getopts::Matches) -> Edition { pub fn parse_crate_edition(matches: &getopts::Matches) -> Edition {
let edition = match matches.opt_str("edition") { let edition = match matches.opt_str("edition") {
Some(arg) => Edition::from_str(&arg).unwrap_or_else(|_| { Some(arg) => Edition::from_str(&arg).unwrap_or_else(|_| {
early_error( early_error(

14
src/librustdoc/config.rs
View File

@ -16,7 +16,7 @@ use rustc_session::config::{CodegenOptions, DebuggingOptions, ErrorOutputType, E
use rustc_session::getopts; use rustc_session::getopts;
use rustc_session::lint::Level; use rustc_session::lint::Level;
use rustc_session::search_paths::SearchPath; use rustc_session::search_paths::SearchPath;
use rustc_span::edition::{Edition, DEFAULT_EDITION}; use rustc_span::edition::Edition;
use rustc_target::spec::TargetTriple; use rustc_target::spec::TargetTriple;
use crate::core::new_handler; use crate::core::new_handler;
@ -469,17 +469,7 @@ impl Options {
} }
} }
let edition = if let Some(e) = matches.opt_str("edition") { let edition = config::parse_crate_edition(&matches);
match e.parse() {
Ok(e) => e,
Err(_) => {
diag.struct_err("could not parse edition").emit();
return Err(1);
}
}
} else {
DEFAULT_EDITION
};
let mut id_map = html::markdown::IdMap::new(); let mut id_map = html::markdown::IdMap::new();
id_map.populate(&html::render::INITIAL_IDS); id_map.populate(&html::render::INITIAL_IDS);