Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/librustdoc/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -336,9 +336,6 @@ impl FromStr for EmitType {

fn from_str(s: &str) -> Result<Self, Self::Err> {
match s {
// old nightly-only choices that are going away soon
"toolchain-shared-resources" => Ok(Self::HtmlStaticFiles),
"invocation-specific" => Ok(Self::HtmlNonStaticFiles),
// modern choices
"html-static-files" => Ok(Self::HtmlStaticFiles),
"html-non-static-files" => Ok(Self::HtmlNonStaticFiles),
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 @@ -11,7 +11,7 @@
//! contents, so they do not include a hash in their filename and are not safe to
//! cache with `Cache-Control: immutable`. They include the contents of the
//! --resource-suffix flag and are emitted when --emit-type is empty (default)
//! or contains "invocation-specific".
//! or contains "html-non-static-files".

use std::cell::RefCell;
use std::ffi::{OsStr, OsString};
Expand Down
2 changes: 1 addition & 1 deletion tests/run-make/emit-shared-files/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use run_make_support::{has_extension, has_prefix, path, rustdoc, shallow_find_fi
fn main() {
rustdoc()
.arg("-Zunstable-options")
.arg("--emit=invocation-specific")
.arg("--emit=html-non-static-files")
.out_dir("invocation-only")
.arg("--resource-suffix=-xxx")
.args(&["--theme", "y.css"])
Expand Down
2 changes: 1 addition & 1 deletion tests/run-make/rustdoc-scrape-examples-dep-info/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ fn main() {

scrape::scrape(
&["--scrape-tests", "--emit=dep-info"],
&["--emit=dep-info,invocation-specific"],
&["--emit=dep-info,html-non-static-files"],
);

let content = rfs::read_to_string("rustdoc/foobar.d").replace(r"\", "/");
Expand Down
Loading