Skip to content

Commit

Permalink
Rollup merge of rust-lang#85770 - Bobo1239:set_locale_for_sort, r=jyn514
Browse files Browse the repository at this point in the history
Remove `--print unversioned-files` from rustdoc

This flag isn't needed anymore. See rust-lang#83784.
  • Loading branch information
GuillaumeGomez authored May 30, 2021
2 parents 957badb + 8b6dad2 commit f7fb29b
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 34 deletions.
7 changes: 0 additions & 7 deletions src/librustdoc/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion src/librustdoc/html/render/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/librustdoc/html/render/write_shared.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 0 additions & 3 deletions src/librustdoc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(
"",
Expand Down
4 changes: 0 additions & 4 deletions src/test/run-make-fulldeps/print-unversioned-files/Makefile

This file was deleted.

This file was deleted.

0 comments on commit f7fb29b

Please sign in to comment.