Skip to content

Commit 71c4c89

Browse files
authored
Rollup merge of rust-lang#148180 - notriddle:unversioned-shared-resources, r=GuillaumeGomez
rustdoc: remove `--emit=unversioned-shared-resources` This option hasn't done anything for a long time, and can be removed. I've kept a shim in place to avoid breaking docs.rs, but the option no longer does anything. Using git-blame, I tracked this option down to f77ebd4, the commit that introduced EmitType in the first place. It was used with SharedResource::Unversioned, which no longer exists since f9e1f6f removed them. CC rust-lang#146220 Part of rust-lang#83784
2 parents 6a7bcec + fe3490c commit 71c4c89

File tree

4 files changed

+3
-5
lines changed

4 files changed

+3
-5
lines changed

src/librustdoc/config.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,6 @@ pub(crate) enum ModuleSorting {
311311

312312
#[derive(Clone, Debug, PartialEq, Eq)]
313313
pub(crate) enum EmitType {
314-
Unversioned,
315314
Toolchain,
316315
InvocationSpecific,
317316
DepInfo(Option<OutFileName>),
@@ -322,7 +321,6 @@ impl FromStr for EmitType {
322321

323322
fn from_str(s: &str) -> Result<Self, Self::Err> {
324323
match s {
325-
"unversioned-shared-resources" => Ok(Self::Unversioned),
326324
"toolchain-shared-resources" => Ok(Self::Toolchain),
327325
"invocation-specific" => Ok(Self::InvocationSpecific),
328326
"dep-info" => Ok(Self::DepInfo(None)),

src/librustdoc/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ fn opts() -> Vec<RustcOptGroup> {
567567
"",
568568
"emit",
569569
"Comma separated list of types of output for rustdoc to emit",
570-
"[unversioned-shared-resources,toolchain-shared-resources,invocation-specific,dep-info]",
570+
"[toolchain-shared-resources,invocation-specific,dep-info]",
571571
),
572572
opt(Unstable, FlagMulti, "", "no-run", "Compile doctests without running them", ""),
573573
opt(

tests/run-make/emit-shared-files/rmake.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ fn main() {
6868

6969
rustdoc()
7070
.arg("-Zunstable-options")
71-
.arg("--emit=toolchain-shared-resources,unversioned-shared-resources")
71+
.arg("--emit=toolchain-shared-resources")
7272
.out_dir("all-shared")
7373
.arg("--resource-suffix=-xxx")
7474
.args(&["--extend-css", "z.css"])

tests/run-make/rustdoc-default-output/output-default.stdout

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ Options:
150150
--generate-redirect-map
151151
Generate JSON file at the top level instead of
152152
generating HTML redirection files
153-
--emit [unversioned-shared-resources,toolchain-shared-resources,invocation-specific,dep-info]
153+
--emit [toolchain-shared-resources,invocation-specific,dep-info]
154154
Comma separated list of types of output for rustdoc to
155155
emit
156156
--no-run Compile doctests without running them

0 commit comments

Comments
 (0)