From 8b6dad2a124f8f27fa79da2dac1d90d8789f861b Mon Sep 17 00:00:00 2001
From: Boris-Chengbiao Zhou <bobo1239@web.de>
Date: Fri, 28 May 2021 21:23:39 +0200
Subject: [PATCH] Remove `--print unversioned-files` from rustdoc
This flag isn't needed anymore. See #83784.
---
src/librustdoc/config.rs | 7 -------
src/librustdoc/html/render/mod.rs | 1 -
src/librustdoc/html/render/write_shared.rs | 2 +-
src/librustdoc/lib.rs | 3 ---
.../print-unversioned-files/Makefile | 4 ----
.../unversioned-files.txt | 18 ------------------
6 files changed, 1 insertion(+), 34 deletions(-)
delete mode 100644 src/test/run-make-fulldeps/print-unversioned-files/Makefile
delete mode 100644 src/test/run-make-fulldeps/print-unversioned-files/unversioned-files.txt
diff --git a/src/librustdoc/config.rs b/src/librustdoc/config.rs
index 6e1fdf67a652f..90b3733821622 100644
--- a/src/librustdoc/config.rs
+++ b/src/librustdoc/config.rs
@@ -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);
diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs
index 29b10fb8457b0..507c5e175f9b4 100644
--- a/src/librustdoc/html/render/mod.rs
+++ b/src/librustdoc/html/render/mod.rs
@@ -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;
diff --git a/src/librustdoc/html/render/write_shared.rs b/src/librustdoc/html/render/write_shared.rs
index dd0fb3a9e02ee..73ffec0dd4eeb 100644
--- a/src/librustdoc/html/render/write_shared.rs
+++ b/src/librustdoc/html/render/write_shared.rs
@@ -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,
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index 6488625c5a84d..bf0be62635630 100644
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -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(
"",
diff --git a/src/test/run-make-fulldeps/print-unversioned-files/Makefile b/src/test/run-make-fulldeps/print-unversioned-files/Makefile
deleted file mode 100644
index e368f61cddfc3..0000000000000
--- a/src/test/run-make-fulldeps/print-unversioned-files/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
--include ../tools.mk
-
-all:
- $(RUSTDOC) -Z unstable-options --print unversioned-files | sort | diff - unversioned-files.txt
diff --git a/src/test/run-make-fulldeps/print-unversioned-files/unversioned-files.txt b/src/test/run-make-fulldeps/print-unversioned-files/unversioned-files.txt
deleted file mode 100644
index 348cd1fdf37b3..0000000000000
--- a/src/test/run-make-fulldeps/print-unversioned-files/unversioned-files.txt
+++ /dev/null
@@ -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