Rollup merge of #85770 - Bobo1239:set_locale_for_sort, r=jyn514

Remove `--print unversioned-files` from rustdoc

This flag isn't needed anymore. See #83784.
This commit is contained in:
Guillaume Gomez 2021-05-30 21:06:46 +02:00 committed by GitHub
commit f7fb29b59d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 1 additions and 34 deletions

View file

@ -349,13 +349,6 @@ impl Options {
return Err(0);
}
if matches.opt_strs("print").iter().any(|opt| opt == "unversioned-files") {
for file in crate::html::render::FILES_UNVERSIONED.keys() {
println!("{}", file);
}
return Err(0);
}
let color = config::parse_color(&matches);
let config::JsonConfig { json_rendered, json_unused_externs, .. } =
config::parse_json(&matches);

View file

@ -33,7 +33,6 @@ mod print_item;
mod write_shared;
crate use context::*;
crate use write_shared::FILES_UNVERSIONED;
use std::collections::VecDeque;
use std::default::Default;

View file

@ -18,7 +18,7 @@ use crate::docfs::PathError;
use crate::error::Error;
use crate::html::{layout, static_files};
crate static FILES_UNVERSIONED: Lazy<FxHashMap<&str, &[u8]>> = Lazy::new(|| {
static FILES_UNVERSIONED: Lazy<FxHashMap<&str, &[u8]>> = Lazy::new(|| {
map! {
"FiraSans-Regular.woff2" => static_files::fira_sans::REGULAR2,
"FiraSans-Medium.woff2" => static_files::fira_sans::MEDIUM2,

View file

@ -581,9 +581,6 @@ fn opts() -> Vec<RustcOptGroup> {
"Generate JSON file at the top level instead of generating HTML redirection files",
)
}),
unstable("print", |o| {
o.optmulti("", "print", "Rustdoc information to print on stdout", "[unversioned-files]")
}),
unstable("emit", |o| {
o.optmulti(
"",

View file

@ -1,4 +0,0 @@
-include ../tools.mk
all:
$(RUSTDOC) -Z unstable-options --print unversioned-files | sort | diff - unversioned-files.txt

View file

@ -1,18 +0,0 @@
COPYRIGHT.txt
FiraSans-LICENSE.txt
FiraSans-Medium.woff
FiraSans-Medium.woff2
FiraSans-Regular.woff
FiraSans-Regular.woff2
LICENSE-APACHE.txt
LICENSE-MIT.txt
SourceCodePro-It.ttf.woff
SourceCodePro-LICENSE.txt
SourceCodePro-Regular.ttf.woff
SourceCodePro-Semibold.ttf.woff
SourceSerif4-Bold.ttf.woff
SourceSerif4-It.ttf.woff
SourceSerif4-LICENSE.md
SourceSerif4-Regular.ttf.woff
noto-sans-kr-v13-korean-regular-LICENSE.txt
noto-sans-kr-v13-korean-regular.woff