From 50fd1f18d1d0d6cb3b0d041aa6e3f5d4b3684afe Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Thu, 16 Jul 2026 18:49:50 -0700 Subject: [PATCH] rustdoc: rename the doc parts metadata params --- src/doc/rustdoc/src/unstable-features.md | 29 +++-- src/librustdoc/config.rs | 104 +++++++++++------- src/librustdoc/lib.rs | 35 ++++-- .../output-default.stdout | 26 ++--- .../rustdoc-merge-directory-alias/rmake.rs | 28 ++--- .../run-make/rustdoc-merge-directory/rmake.rs | 13 +-- .../rustdoc-merge-no-input-finalize/rmake.rs | 8 +- .../auxiliary/quebec.rs | 1 - .../auxiliary/tango.rs | 1 - .../cargo-transitive-read-write/sierra.rs | 3 +- .../auxiliary/quebec.rs | 3 +- .../auxiliary/romeo.rs | 3 +- .../auxiliary/sierra.rs | 3 +- .../auxiliary/tango.rs | 3 +- .../kitchen-sink-separate-dirs/indigo.rs | 9 +- .../no-merge-separate/auxiliary/quebec.rs | 2 +- .../no-merge-separate/auxiliary/tango.rs | 2 +- .../no-merge-separate/sierra.rs | 4 +- .../no-merge-write-anyway/auxiliary/quebec.rs | 3 +- .../no-merge-write-anyway/auxiliary/tango.rs | 3 +- .../no-merge-write-anyway/sierra.rs | 5 +- .../overwrite-but-include/auxiliary/quebec.rs | 3 +- .../overwrite-but-include/auxiliary/tango.rs | 3 +- .../overwrite-but-include/sierra.rs | 3 +- .../auxiliary/quebec.rs | 3 +- .../overwrite-but-separate/auxiliary/tango.rs | 3 +- .../overwrite-but-separate/sierra.rs | 5 +- .../overwrite/auxiliary/quebec.rs | 2 +- .../overwrite/auxiliary/tango.rs | 2 +- .../overwrite/sierra.rs | 3 +- .../single-crate-finalize/quebec.rs | 1 - .../single-crate-read-write/quebec.rs | 1 - .../single-crate-write-anyway/quebec.rs | 4 +- .../single-merge-none-useless-write/quebec.rs | 11 -- .../transitive-finalize/auxiliary/quebec.rs | 5 - .../transitive-finalize/auxiliary/tango.rs | 8 -- .../transitive-finalize/sierra.rs | 20 ---- .../transitive-merge-none/auxiliary/quebec.rs | 3 +- .../transitive-merge-none/auxiliary/tango.rs | 3 +- .../transitive-merge-none/sierra.rs | 7 +- .../auxiliary/quebec.rs | 1 - .../auxiliary/tango.rs | 1 - .../transitive-merge-read-write/sierra.rs | 3 +- .../transitive-no-info/auxiliary/quebec.rs | 2 +- .../transitive-no-info/auxiliary/tango.rs | 2 +- .../transitive-no-info/sierra.rs | 5 +- .../two-separate-out-dir/auxiliary/foxtrot.rs | 2 +- .../two-separate-out-dir/echo.rs | 2 +- tests/rustdoc-js/auxiliary/merged-dep.rs | 3 +- tests/rustdoc-js/merged-doc.rs | 3 +- 50 files changed, 179 insertions(+), 223 deletions(-) delete mode 100644 tests/rustdoc-html/merge-cross-crate-info/single-merge-none-useless-write/quebec.rs delete mode 100644 tests/rustdoc-html/merge-cross-crate-info/transitive-finalize/auxiliary/quebec.rs delete mode 100644 tests/rustdoc-html/merge-cross-crate-info/transitive-finalize/auxiliary/tango.rs delete mode 100644 tests/rustdoc-html/merge-cross-crate-info/transitive-finalize/sierra.rs diff --git a/src/doc/rustdoc/src/unstable-features.md b/src/doc/rustdoc/src/unstable-features.md index cc6cf2f8a648c..26985e67abb6e 100644 --- a/src/doc/rustdoc/src/unstable-features.md +++ b/src/doc/rustdoc/src/unstable-features.md @@ -197,15 +197,26 @@ themselves marked as unstable. To use any of these options, pass `-Z unstable-op the flag in question to Rustdoc on the command-line. To do this from Cargo, you can either use the `RUSTDOCFLAGS` environment variable or the `cargo rustdoc` command. -### `--merge`, `--parts-out-dir`, and `--include-parts-dir` +### `--write-doc-meta-dir`, and `--read-doc-meta-dir` These options control how rustdoc handles files that combine data from multiple crates. -By default, they act like `--merge=shared` is set, and `--parts-out-dir` and `--include-parts-dir` -are turned off. The `--merge=shared` mode causes rustdoc to load the existing data in the out-dir, -combine the new crate data into it, and write the result. This is very easy to use in scripts that -manually invoke rustdoc, but it's also slow, because it performs O(crates) work on -every crate, meaning it performs O(crates2) work. +By default, rustdoc will read the doc meta from the doc output dir itself and merge them together. +This is very easy to use in scripts that manually invoke rustdoc, but it's also slow, because it +performs O(crates) work on every crate, meaning it performs O(crates2) work. When +`--write-doc-meta-dir` and/or `--read-doc-meta-dir` are supplied, this is turned off. + +When `--write-doc-meta-dir` is supplied, rustdoc will write the crate's metadata to that directory. +If this parameter is supplied but `--read-doc-meta-dir` isn't, it runs in *intermediate mode*: +some pages may be written to the output dir, but there is a lot of functionality that won't work +until rustdoc is run in *finalize mode*. + +When `--read-doc-meta-dir` is supplied, rustdoc runs in *finalize mode*. It will read the data from +the supplied directory, and will write it to the doc output directory in the form that the web +frontend will use. + +If both `--write-doc-meta-dir` and `--read-doc-meta-dir` are specified, the crate metadata will be +written to both the HTML `--out-dir` and to the supplied `--write-doc-meta-dir`. ```console $ rustdoc crate1.rs --out-dir=doc @@ -217,13 +228,13 @@ rd_("fcrate1fcrate2") ``` To delay shared-data merging until the end of a build, so that you only have to perform O(crates) -work, use `--merge=none` on every crate except the last one, which will use `--merge=finalize`. +work, use `--write-doc-meta-dir` on every crate, and the last will use `--read-doc-meta-dir`. ```console -$ rustdoc +nightly crate1.rs --merge=none --parts-out-dir=crate1.d -Zunstable-options +$ rustdoc +nightly crate1.rs --write-doc-meta=crate1.d -Zunstable-options $ cat doc/search.index/crateNames/* cat: 'doc/search.index/crateNames/*': No such file or directory -$ rustdoc +nightly crate2.rs --merge=finalize --include-parts-dir=crate1.d -Zunstable-options +$ rustdoc +nightly crate2.rs --read-doc-meta=crate1.d -Zunstable-options $ cat doc/search.index/crateNames/* rd_("fcrate1fcrate2") ``` diff --git a/src/librustdoc/config.rs b/src/librustdoc/config.rs index a8c27c5615007..87d2bdcd00d29 100644 --- a/src/librustdoc/config.rs +++ b/src/librustdoc/config.rs @@ -601,34 +601,66 @@ impl Options { let (lint_opts, describe_lints, lint_cap) = get_cmd_lint_options(early_dcx, matches); - let input = if describe_lints { - InputMode::HasFile(make_input(early_dcx, "")) - } else { - match matches.free.as_slice() { - [] if matches.opt_str("merge").as_deref() == Some("finalize") => { - InputMode::NoInputMergeFinalize - } - [] => dcx.fatal("missing file operand"), - [input] => InputMode::HasFile(make_input(early_dcx, input)), - _ => dcx.fatal("too many file operands"), - } - }; - let externs = parse_externs(early_dcx, matches, &unstable_opts); let extern_html_root_urls = match parse_extern_html_roots(matches) { Ok(ex) => ex, Err(err) => dcx.fatal(err), }; - let parts_out_dir = - match matches.opt_str("parts-out-dir").map(PathToParts::from_flag).transpose() { + let mut parts_out_dir = + match matches.opt_str("write-doc-meta-dir").map(PathToParts::from_flag).transpose() { Ok(parts_out_dir) => parts_out_dir, Err(e) => dcx.fatal(e), }; - let include_parts_dir = match parse_include_parts_dir(matches) { + let mut include_parts_dir = match parse_read_doc_meta(matches, "read-doc-meta-dir") { Ok(include_parts_dir) => include_parts_dir, Err(e) => dcx.fatal(e), }; + let mut should_merge = compute_should_merge(matches); + if parts_out_dir.is_none() && include_parts_dir.is_empty() { + // we'll need to get rid of this stuff once Cargo stops using them + parts_out_dir = + match matches.opt_str("parts-out-dir").map(PathToParts::from_flag).transpose() { + Ok(parts_out_dir) => parts_out_dir, + Err(e) => dcx.fatal(e), + }; + include_parts_dir = match parse_read_doc_meta(matches, "include-parts-dir") { + Ok(include_parts_dir) => include_parts_dir, + Err(e) => dcx.fatal(e), + }; + should_merge = match matches.opt_str("merge").as_deref() { + None => ShouldMerge { read_rendered_cci: true, write_rendered_cci: true }, + Some("none") => ShouldMerge { read_rendered_cci: false, write_rendered_cci: false }, + Some("shared") => ShouldMerge { read_rendered_cci: true, write_rendered_cci: true }, + Some("finalize") => { + ShouldMerge { read_rendered_cci: false, write_rendered_cci: true } + } + Some(_) => dcx.fatal("argument to --merge must be `none`, `shared`, or `finalize`"), + }; + } else if matches.opt_str("parts-out-dir").is_some() { + dcx.fatal( + "deprecated version of write-doc-meta-dir is used with new doc-meta-dir stuff", + ); + } else if matches.opt_str("include-parts-dir").is_some() { + dcx.fatal( + "deprecated version of read-doc-meta-dir is used with new doc-meta-dir stuff", + ); + } else if matches.opt_str("merge").is_some() { + dcx.fatal("deprecated parameter merge is used with new doc-meta-dir stuff"); + } + + let input = if describe_lints { + InputMode::HasFile(make_input(early_dcx, "")) + } else { + match matches.free.as_slice() { + [] if !include_parts_dir.is_empty() && should_merge.write_rendered_cci => { + InputMode::NoInputMergeFinalize + } + [] => dcx.fatal("missing file operand"), + [input] => InputMode::HasFile(make_input(early_dcx, input)), + _ => dcx.fatal("too many file operands"), + } + }; let default_settings: Vec> = vec![ matches @@ -853,10 +885,6 @@ impl Options { let extern_html_root_takes_precedence = matches.opt_present("extern-html-root-takes-precedence"); let html_no_source = matches.opt_present("html-no-source"); - let should_merge = match parse_merge(matches) { - Ok(result) => result, - Err(e) => dcx.fatal(format!("--merge option error: {e}")), - }; let merge_doctests = parse_merge_doctests(matches, edition, dcx); tracing::debug!("merge_doctests: {merge_doctests:?}"); @@ -1051,7 +1079,7 @@ impl PathToParts { // check here is for diagnostics if path.exists() && !path.is_dir() { Err(format!( - "--parts-out-dir and --include-parts-dir expect directories, found: {}", + "--write-doc-meta-dir and --read-doc-meta-dir expect directories, found: {}", path.display(), )) } else { @@ -1061,15 +1089,15 @@ impl PathToParts { } } -/// Reports error if --include-parts-dir is not a directory -fn parse_include_parts_dir(m: &getopts::Matches) -> Result, String> { +/// Reports error if --read-doc-meta-dir is not a directory +fn parse_read_doc_meta(m: &getopts::Matches, name: &str) -> Result, String> { let mut ret = Vec::new(); - for p in m.opt_strs("include-parts-dir") { + for p in m.opt_strs(name) { let p = PathToParts::from_flag(p)?; // this is just for diagnostic if !p.0.is_dir() { return Err(format!( - "--include-parts-dir expected {} to be a directory", + "--read-doc-meta-dir expected {} to be a directory", p.0.display() )); } @@ -1089,23 +1117,15 @@ pub(crate) struct ShouldMerge { /// Extracts read_rendered_cci and write_rendered_cci from command line arguments, or /// reports an error if an invalid option was provided -fn parse_merge(m: &getopts::Matches) -> Result { - match m.opt_str("merge").as_deref() { - // default = read-write - None => Ok(ShouldMerge { read_rendered_cci: true, write_rendered_cci: true }), - Some("none") if m.opt_present("include-parts-dir") => { - Err("--include-parts-dir not allowed if --merge=none") - } - Some("none") => Ok(ShouldMerge { read_rendered_cci: false, write_rendered_cci: false }), - Some("shared") if m.opt_present("parts-out-dir") || m.opt_present("include-parts-dir") => { - Err("--parts-out-dir and --include-parts-dir not allowed if --merge=shared") - } - Some("shared") => Ok(ShouldMerge { read_rendered_cci: true, write_rendered_cci: true }), - Some("finalize") if m.opt_present("parts-out-dir") => { - Err("--parts-out-dir not allowed if --merge=finalize") - } - Some("finalize") => Ok(ShouldMerge { read_rendered_cci: false, write_rendered_cci: true }), - Some(_) => Err("argument to --merge must be `none`, `shared`, or `finalize`"), +fn compute_should_merge(m: &getopts::Matches) -> ShouldMerge { + match (m.opt_present("read-doc-meta-dir"), m.opt_present("write-doc-meta-dir")) { + // shared mode + (false, false) => ShouldMerge { read_rendered_cci: true, write_rendered_cci: true }, + // intermediate mode + (false, true) => ShouldMerge { read_rendered_cci: false, write_rendered_cci: false }, + // finalize mode + (true, false) => ShouldMerge { read_rendered_cci: false, write_rendered_cci: true }, + (true, true) => ShouldMerge { read_rendered_cci: false, write_rendered_cci: true }, } } diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index 17f5af024ac7f..be830cad6c735 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -613,28 +613,41 @@ fn opts() -> Vec { Unstable, Opt, "", - "merge", - "Controls how rustdoc handles files from previously documented crates in the doc root\n\ - none = Do not write cross-crate information to the --out-dir\n\ - shared = Append current crate's info to files found in the --out-dir\n\ - finalize = Write current crate's info and --include-parts-dir info to the --out-dir, overwriting conflicting files", - "none|shared|finalize", + "write-doc-meta-dir", + "Writes trait implementations and other info for the current crate to provided path", + "path/to/doc.meta", + ), + opt( + Unstable, + Multi, + "", + "read-doc-meta-dir", + "Includes trait implementations and other crate info from provided path", + "path/to/doc.meta", ), opt( Unstable, Opt, "", "parts-out-dir", - "Writes trait implementations and other info for the current crate to provided path. Only use with --merge=none", - "path/to/doc.parts/", + "Deprecated synonym of write-doc-meta-dir", + "path/to/doc.meta", ), opt( Unstable, Multi, "", "include-parts-dir", - "Includes trait implementations and other crate info from provided path. Only use with --merge=finalize", - "path/to/doc.parts/", + "Deprecated synonym of read-doc-meta-dir", + "path/to/doc.meta", + ), + opt( + Unstable, + Opt, + "", + "merge", + "Deprecated option to specify read/write-doc-meta-dir mode", + "none, shared, finalize", ), opt(Unstable, Flag, "", "html-no-source", "Disable HTML source code pages generation", ""), opt( @@ -758,7 +771,7 @@ fn run_renderer< /// Renders and writes cross-crate info files, like the search index. This function exists so that /// we can run rustdoc without a crate root in the `--merge=finalize` mode. Cross-crate info files -/// discovered via `--include-parts-dir` are combined and written to the doc root. +/// discovered via `--read-doc-meta-dir` are combined and written to the doc root. fn run_merge_finalize(opt: config::RenderOptions) -> Result<(), error::Error> { assert!( opt.should_merge.write_rendered_cci, diff --git a/tests/run-make/rustdoc-default-output/output-default.stdout b/tests/run-make/rustdoc-default-output/output-default.stdout index 0a2da1099b820..78dfbf03c1b10 100644 --- a/tests/run-make/rustdoc-default-output/output-default.stdout +++ b/tests/run-make/rustdoc-default-output/output-default.stdout @@ -176,23 +176,19 @@ Options: --scrape-tests Include test code when scraping examples --with-examples path to function call information (for displaying examples in the documentation) - --merge none|shared|finalize - Controls how rustdoc handles files from previously - documented crates in the doc root - none = Do not write cross-crate information to the - --out-dir - shared = Append current crate's info to files found in - the --out-dir - finalize = Write current crate's info and - --include-parts-dir info to the --out-dir, overwriting - conflicting files - --parts-out-dir path/to/doc.parts/ + --write-doc-meta-dir path/to/doc.meta Writes trait implementations and other info for the - current crate to provided path. Only use with - --merge=none - --include-parts-dir path/to/doc.parts/ + current crate to provided path + --read-doc-meta-dir path/to/doc.meta Includes trait implementations and other crate info - from provided path. Only use with --merge=finalize + from provided path + --parts-out-dir path/to/doc.meta + Deprecated synonym of write-doc-meta-dir + --include-parts-dir path/to/doc.meta + Deprecated synonym of read-doc-meta-dir + --merge none, shared, finalize + Deprecated option to specify read/write-doc-meta-dir + mode --html-no-source Disable HTML source code pages generation --doctest-build-arg ARG diff --git a/tests/run-make/rustdoc-merge-directory-alias/rmake.rs b/tests/run-make/rustdoc-merge-directory-alias/rmake.rs index 096eb4a487c15..8a5c1aa2af723 100644 --- a/tests/run-make/rustdoc-merge-directory-alias/rmake.rs +++ b/tests/run-make/rustdoc-merge-directory-alias/rmake.rs @@ -1,4 +1,4 @@ -// Running --merge=finalize without an input crate root should not trigger ICE. +// Running --read-doc-meta-dir without an input crate root should not trigger ICE. // Issue: https://github.com/rust-lang/rust/issues/146646 //@ needs-target-std @@ -14,16 +14,14 @@ fn main() { .input("dep1.rs") .out_dir(&out_dir) .arg("-Zunstable-options") - .arg(format!("--parts-out-dir={}", parts_out_dir.display())) - .arg("--merge=none") + .arg(format!("--write-doc-meta-dir={}", parts_out_dir.display())) .run(); assert!(parts_out_dir.join("dep1.json").exists()); let output = rustdoc() .arg("-Zunstable-options") .out_dir(&out_dir) - .arg(format!("--include-parts-dir={}", parts_out_dir.display())) - .arg("--merge=finalize") + .arg(format!("--read-doc-meta-dir={}", parts_out_dir.display())) .run(); output.assert_stderr_not_contains("error: the compiler unexpectedly panicked. this is a bug."); @@ -31,16 +29,14 @@ fn main() { .input("dep2.rs") .out_dir(&out_dir) .arg("-Zunstable-options") - .arg(format!("--parts-out-dir={}", parts_out_dir.display())) - .arg("--merge=none") + .arg(format!("--write-doc-meta-dir={}", parts_out_dir.display())) .run(); assert!(parts_out_dir.join("dep2.json").exists()); let output2 = rustdoc() .arg("-Zunstable-options") .out_dir(&out_dir) - .arg(format!("--include-parts-dir={}", parts_out_dir.display())) - .arg("--merge=finalize") + .arg(format!("--read-doc-meta-dir={}", parts_out_dir.display())) .run(); output2.assert_stderr_not_contains("error: the compiler unexpectedly panicked. this is a bug."); @@ -48,20 +44,18 @@ fn main() { .input("dep1.rs") .out_dir(&out_dir) .arg("-Zunstable-options") - .arg(format!("--parts-out-dir={}", parts_out_dir.display())) - .arg("--merge=none") + .arg(format!("--write-doc-meta-dir={}", parts_out_dir.display())) .run(); assert!(parts_out_dir.join("dep1.json").exists()); let output3 = rustdoc() .arg("-Zunstable-options") .out_dir(&out_dir) - .arg(format!("--include-parts-dir={}", parts_out_dir.display())) - .arg("--merge=finalize") + .arg(format!("--read-doc-meta-dir={}", parts_out_dir.display())) .run(); output3.assert_stderr_not_contains("error: the compiler unexpectedly panicked. this is a bug."); - // dep_missing is different, because --parts-out-dir is not supplied + // dep_missing is different, because --write-doc-meta-dir is not supplied rustdoc().input("dep_missing.rs").out_dir(&out_dir).run(); assert!(parts_out_dir.join("dep2.json").exists()); @@ -69,16 +63,14 @@ fn main() { .input("dep1.rs") .out_dir(&out_dir) .arg("-Zunstable-options") - .arg(format!("--parts-out-dir={}", parts_out_dir.display())) - .arg("--merge=none") + .arg(format!("--write-doc-meta-dir={}", parts_out_dir.display())) .run(); assert!(parts_out_dir.join("dep1.json").exists()); let output4 = rustdoc() .arg("-Zunstable-options") .out_dir(&out_dir) - .arg(format!("--include-parts-dir={}", parts_out_dir.display())) - .arg("--merge=finalize") + .arg(format!("--read-doc-meta-dir={}", parts_out_dir.display())) .run(); output4.assert_stderr_not_contains("error: the compiler unexpectedly panicked. this is a bug."); diff --git a/tests/run-make/rustdoc-merge-directory/rmake.rs b/tests/run-make/rustdoc-merge-directory/rmake.rs index e4695ddad0b48..d2d31138bf3c6 100644 --- a/tests/run-make/rustdoc-merge-directory/rmake.rs +++ b/tests/run-make/rustdoc-merge-directory/rmake.rs @@ -1,4 +1,4 @@ -// Running --merge=finalize without an input crate root should not trigger ICE. +// Running --read-doc-meta without an input crate root should not trigger ICE. // Issue: https://github.com/rust-lang/rust/issues/146646 //@ needs-target-std @@ -14,8 +14,7 @@ fn main() { .input("dep1.rs") .out_dir(&out_dir) .arg("-Zunstable-options") - .arg(format!("--parts-out-dir={}", parts_out_dir.display())) - .arg("--merge=none") + .arg(format!("--write-doc-meta-dir={}", parts_out_dir.display())) .run(); assert!(parts_out_dir.join("dep1.json").exists()); @@ -23,20 +22,18 @@ fn main() { .input("dep2.rs") .out_dir(&out_dir) .arg("-Zunstable-options") - .arg(format!("--parts-out-dir={}", parts_out_dir.display())) - .arg("--merge=none") + .arg(format!("--write-doc-meta-dir={}", parts_out_dir.display())) .run(); assert!(parts_out_dir.join("dep2.json").exists()); - // dep_missing is different, because --parts-out-dir is not supplied + // dep_missing is different, because --write-doc-meta-dir is not supplied rustdoc().input("dep_missing.rs").out_dir(&out_dir).run(); assert!(parts_out_dir.join("dep2.json").exists()); let output = rustdoc() .arg("-Zunstable-options") .out_dir(&out_dir) - .arg(format!("--include-parts-dir={}", parts_out_dir.display())) - .arg("--merge=finalize") + .arg(format!("--read-doc-meta-dir={}", parts_out_dir.display())) .run(); output.assert_stderr_not_contains("error: the compiler unexpectedly panicked. this is a bug."); diff --git a/tests/run-make/rustdoc-merge-no-input-finalize/rmake.rs b/tests/run-make/rustdoc-merge-no-input-finalize/rmake.rs index 4dad01f341fef..6f7028bfbfbc1 100644 --- a/tests/run-make/rustdoc-merge-no-input-finalize/rmake.rs +++ b/tests/run-make/rustdoc-merge-no-input-finalize/rmake.rs @@ -1,4 +1,4 @@ -// Running --merge=finalize without an input crate root should not trigger ICE. +// Running --write-doc-meta-dir without an input crate root should not trigger ICE. // Issue: https://github.com/rust-lang/rust/issues/146646 //@ needs-target-std @@ -13,16 +13,14 @@ fn main() { .input("sierra.rs") .out_dir(&out_dir) .arg("-Zunstable-options") - .arg(format!("--parts-out-dir={}", parts_out_dir.display())) - .arg("--merge=none") + .arg(format!("--write-doc-meta-dir={}", parts_out_dir.display())) .run(); assert!(parts_out_dir.join("sierra.json").exists()); let output = rustdoc() .arg("-Zunstable-options") .out_dir(&out_dir) - .arg(format!("--include-parts-dir={}", parts_out_dir.display())) - .arg("--merge=finalize") + .arg(format!("--read-doc-meta-dir={}", parts_out_dir.display())) .run(); output.assert_not_ice(); } diff --git a/tests/rustdoc-html/merge-cross-crate-info/cargo-transitive-read-write/auxiliary/quebec.rs b/tests/rustdoc-html/merge-cross-crate-info/cargo-transitive-read-write/auxiliary/quebec.rs index fdafb3b7ac341..c4b3ce498576c 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/cargo-transitive-read-write/auxiliary/quebec.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/cargo-transitive-read-write/auxiliary/quebec.rs @@ -1,4 +1,3 @@ -//@ doc-flags:--merge=shared //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/cargo-transitive-read-write/auxiliary/tango.rs b/tests/rustdoc-html/merge-cross-crate-info/cargo-transitive-read-write/auxiliary/tango.rs index ff12fe98d82c2..299a673418713 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/cargo-transitive-read-write/auxiliary/tango.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/cargo-transitive-read-write/auxiliary/tango.rs @@ -1,6 +1,5 @@ //@ aux-build:quebec.rs //@ build-aux-docs -//@ doc-flags:--merge=shared //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/cargo-transitive-read-write/sierra.rs b/tests/rustdoc-html/merge-cross-crate-info/cargo-transitive-read-write/sierra.rs index 26292c50d35e6..10f12ad8d1184 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/cargo-transitive-read-write/sierra.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/cargo-transitive-read-write/sierra.rs @@ -1,6 +1,5 @@ //@ aux-build:tango.rs //@ build-aux-docs -//@ doc-flags:--merge=shared //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options @@ -18,7 +17,7 @@ //@ hasraw search.index/name/*.js 'Sierra' //@ hasraw search.index/name/*.js 'Quebec' -// similar to cargo-workflow-transitive, but we use --merge=read-write, +// similar to cargo-workflow-transitive, but we use shared mode, // which is the default. extern crate tango; pub struct Sierra; diff --git a/tests/rustdoc-html/merge-cross-crate-info/kitchen-sink-separate-dirs/auxiliary/quebec.rs b/tests/rustdoc-html/merge-cross-crate-info/kitchen-sink-separate-dirs/auxiliary/quebec.rs index d10bc0316ccad..d2af9af496bc3 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/kitchen-sink-separate-dirs/auxiliary/quebec.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/kitchen-sink-separate-dirs/auxiliary/quebec.rs @@ -1,6 +1,5 @@ //@ unique-doc-out-dir -//@ doc-flags:--merge=none -//@ doc-flags:--parts-out-dir=info/doc.parts/quebec +//@ doc-flags:--write-doc-meta-dir=info/doc.parts/quebec //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/kitchen-sink-separate-dirs/auxiliary/romeo.rs b/tests/rustdoc-html/merge-cross-crate-info/kitchen-sink-separate-dirs/auxiliary/romeo.rs index 6d0c8651db53f..bcccc05299a79 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/kitchen-sink-separate-dirs/auxiliary/romeo.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/kitchen-sink-separate-dirs/auxiliary/romeo.rs @@ -1,8 +1,7 @@ //@ aux-build:sierra.rs //@ build-aux-docs //@ unique-doc-out-dir -//@ doc-flags:--merge=none -//@ doc-flags:--parts-out-dir=info/doc.parts/romeo +//@ doc-flags:--write-doc-meta-dir=info/doc.parts/romeo //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/kitchen-sink-separate-dirs/auxiliary/sierra.rs b/tests/rustdoc-html/merge-cross-crate-info/kitchen-sink-separate-dirs/auxiliary/sierra.rs index 10898f3886477..9d5e564720169 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/kitchen-sink-separate-dirs/auxiliary/sierra.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/kitchen-sink-separate-dirs/auxiliary/sierra.rs @@ -1,8 +1,7 @@ //@ aux-build:tango.rs //@ build-aux-docs //@ unique-doc-out-dir -//@ doc-flags:--merge=none -//@ doc-flags:--parts-out-dir=info/doc.parts/sierra +//@ doc-flags:--write-doc-meta-dir=info/doc.parts/sierra //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/kitchen-sink-separate-dirs/auxiliary/tango.rs b/tests/rustdoc-html/merge-cross-crate-info/kitchen-sink-separate-dirs/auxiliary/tango.rs index 3c3721ee6eb7d..577c486a3adfb 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/kitchen-sink-separate-dirs/auxiliary/tango.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/kitchen-sink-separate-dirs/auxiliary/tango.rs @@ -1,8 +1,7 @@ //@ aux-build:quebec.rs //@ build-aux-docs //@ unique-doc-out-dir -//@ doc-flags:--merge=none -//@ doc-flags:--parts-out-dir=info/doc.parts/tango +//@ doc-flags:--write-doc-meta-dir=info/doc.parts/tango //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/kitchen-sink-separate-dirs/indigo.rs b/tests/rustdoc-html/merge-cross-crate-info/kitchen-sink-separate-dirs/indigo.rs index fd6ee0cbf2407..986c58deb5d6b 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/kitchen-sink-separate-dirs/indigo.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/kitchen-sink-separate-dirs/indigo.rs @@ -3,11 +3,10 @@ //@ aux-build:quebec.rs //@ aux-build:sierra.rs //@ build-aux-docs -//@ doc-flags:--merge=finalize -//@ doc-flags:--include-parts-dir=info/doc.parts/tango -//@ doc-flags:--include-parts-dir=info/doc.parts/romeo -//@ doc-flags:--include-parts-dir=info/doc.parts/quebec -//@ doc-flags:--include-parts-dir=info/doc.parts/sierra +//@ doc-flags:--read-doc-meta-dir=info/doc.parts/tango +//@ doc-flags:--read-doc-meta-dir=info/doc.parts/romeo +//@ doc-flags:--read-doc-meta-dir=info/doc.parts/quebec +//@ doc-flags:--read-doc-meta-dir=info/doc.parts/sierra //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/no-merge-separate/auxiliary/quebec.rs b/tests/rustdoc-html/merge-cross-crate-info/no-merge-separate/auxiliary/quebec.rs index 61210529fa6bc..d2af9af496bc3 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/no-merge-separate/auxiliary/quebec.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/no-merge-separate/auxiliary/quebec.rs @@ -1,5 +1,5 @@ //@ unique-doc-out-dir -//@ doc-flags:--merge=none +//@ doc-flags:--write-doc-meta-dir=info/doc.parts/quebec //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/no-merge-separate/auxiliary/tango.rs b/tests/rustdoc-html/merge-cross-crate-info/no-merge-separate/auxiliary/tango.rs index 70d8a4b91f549..577c486a3adfb 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/no-merge-separate/auxiliary/tango.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/no-merge-separate/auxiliary/tango.rs @@ -1,7 +1,7 @@ //@ aux-build:quebec.rs //@ build-aux-docs //@ unique-doc-out-dir -//@ doc-flags:--merge=none +//@ doc-flags:--write-doc-meta-dir=info/doc.parts/tango //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/no-merge-separate/sierra.rs b/tests/rustdoc-html/merge-cross-crate-info/no-merge-separate/sierra.rs index c3b8200f15107..9a6ca3c6dd41c 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/no-merge-separate/sierra.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/no-merge-separate/sierra.rs @@ -1,6 +1,6 @@ //@ aux-build:tango.rs //@ build-aux-docs -//@ doc-flags:--merge=none +//@ doc-flags:--write-doc-meta-dir=info/doc.parts/sierra //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options @@ -10,7 +10,7 @@ //@ !has trait.impl/tango/trait.Tango.js //@ !has search.index/name/*.js -// we don't generate any cross-crate info if --merge=none, even if we +// we don't generate any cross-crate info if --write-doc-meta-dir, even if we // document crates separately extern crate tango; pub struct Sierra; diff --git a/tests/rustdoc-html/merge-cross-crate-info/no-merge-write-anyway/auxiliary/quebec.rs b/tests/rustdoc-html/merge-cross-crate-info/no-merge-write-anyway/auxiliary/quebec.rs index 6ab921533b037..442eacb91f480 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/no-merge-write-anyway/auxiliary/quebec.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/no-merge-write-anyway/auxiliary/quebec.rs @@ -1,5 +1,4 @@ -//@ doc-flags:--merge=none -//@ doc-flags:--parts-out-dir=info/doc.parts/quebec +//@ doc-flags:--write-doc-meta-dir=info/doc.parts/quebec //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/no-merge-write-anyway/auxiliary/tango.rs b/tests/rustdoc-html/merge-cross-crate-info/no-merge-write-anyway/auxiliary/tango.rs index 9fa99d3be8af4..e10bab806ea0c 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/no-merge-write-anyway/auxiliary/tango.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/no-merge-write-anyway/auxiliary/tango.rs @@ -1,7 +1,6 @@ //@ aux-build:quebec.rs //@ build-aux-docs -//@ doc-flags:--merge=none -//@ doc-flags:--parts-out-dir=info/doc.parts/tango +//@ doc-flags:--write-doc-meta-dir=info/doc.parts/tango //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/no-merge-write-anyway/sierra.rs b/tests/rustdoc-html/merge-cross-crate-info/no-merge-write-anyway/sierra.rs index 2e47d42daff94..9d5a1a3c17bfa 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/no-merge-write-anyway/sierra.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/no-merge-write-anyway/sierra.rs @@ -1,7 +1,6 @@ //@ aux-build:tango.rs //@ build-aux-docs -//@ doc-flags:--merge=none -//@ doc-flags:--parts-out-dir=info/doc.parts/sierra +//@ doc-flags:--write-doc-meta-dir=info/doc.parts/sierra //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options @@ -12,7 +11,7 @@ //@ !has trait.impl/tango/trait.Tango.js //@ !has search.index/name/*.js -// we --merge=none, so --parts-out-dir doesn't do anything +// we don't use --read-doc-meta-dir, so no metadata is loaded extern crate tango; pub struct Sierra; impl tango::Tango for Sierra {} diff --git a/tests/rustdoc-html/merge-cross-crate-info/overwrite-but-include/auxiliary/quebec.rs b/tests/rustdoc-html/merge-cross-crate-info/overwrite-but-include/auxiliary/quebec.rs index 6ab921533b037..442eacb91f480 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/overwrite-but-include/auxiliary/quebec.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/overwrite-but-include/auxiliary/quebec.rs @@ -1,5 +1,4 @@ -//@ doc-flags:--merge=none -//@ doc-flags:--parts-out-dir=info/doc.parts/quebec +//@ doc-flags:--write-doc-meta-dir=info/doc.parts/quebec //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/overwrite-but-include/auxiliary/tango.rs b/tests/rustdoc-html/merge-cross-crate-info/overwrite-but-include/auxiliary/tango.rs index 9fa99d3be8af4..e10bab806ea0c 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/overwrite-but-include/auxiliary/tango.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/overwrite-but-include/auxiliary/tango.rs @@ -1,7 +1,6 @@ //@ aux-build:quebec.rs //@ build-aux-docs -//@ doc-flags:--merge=none -//@ doc-flags:--parts-out-dir=info/doc.parts/tango +//@ doc-flags:--write-doc-meta-dir=info/doc.parts/tango //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/overwrite-but-include/sierra.rs b/tests/rustdoc-html/merge-cross-crate-info/overwrite-but-include/sierra.rs index 337dc558f35d8..2d94321ed7465 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/overwrite-but-include/sierra.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/overwrite-but-include/sierra.rs @@ -1,7 +1,6 @@ //@ aux-build:tango.rs //@ build-aux-docs -//@ doc-flags:--merge=finalize -//@ doc-flags:--include-parts-dir=info/doc.parts/tango +//@ doc-flags:--read-doc-meta-dir=info/doc.parts/tango //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/overwrite-but-separate/auxiliary/quebec.rs b/tests/rustdoc-html/merge-cross-crate-info/overwrite-but-separate/auxiliary/quebec.rs index d10bc0316ccad..d2af9af496bc3 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/overwrite-but-separate/auxiliary/quebec.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/overwrite-but-separate/auxiliary/quebec.rs @@ -1,6 +1,5 @@ //@ unique-doc-out-dir -//@ doc-flags:--merge=none -//@ doc-flags:--parts-out-dir=info/doc.parts/quebec +//@ doc-flags:--write-doc-meta-dir=info/doc.parts/quebec //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/overwrite-but-separate/auxiliary/tango.rs b/tests/rustdoc-html/merge-cross-crate-info/overwrite-but-separate/auxiliary/tango.rs index 3c3721ee6eb7d..577c486a3adfb 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/overwrite-but-separate/auxiliary/tango.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/overwrite-but-separate/auxiliary/tango.rs @@ -1,8 +1,7 @@ //@ aux-build:quebec.rs //@ build-aux-docs //@ unique-doc-out-dir -//@ doc-flags:--merge=none -//@ doc-flags:--parts-out-dir=info/doc.parts/tango +//@ doc-flags:--write-doc-meta-dir=info/doc.parts/tango //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/overwrite-but-separate/sierra.rs b/tests/rustdoc-html/merge-cross-crate-info/overwrite-but-separate/sierra.rs index c07b30d2aa0cd..6a2dbb1c31ccc 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/overwrite-but-separate/sierra.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/overwrite-but-separate/sierra.rs @@ -1,8 +1,7 @@ //@ aux-build:tango.rs //@ build-aux-docs -//@ doc-flags:--merge=finalize -//@ doc-flags:--include-parts-dir=info/doc.parts/tango -//@ doc-flags:--include-parts-dir=info/doc.parts/quebec +//@ doc-flags:--read-doc-meta-dir=info/doc.parts/tango +//@ doc-flags:--read-doc-meta-dir=info/doc.parts/quebec //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/overwrite/auxiliary/quebec.rs b/tests/rustdoc-html/merge-cross-crate-info/overwrite/auxiliary/quebec.rs index 0e28d8e646647..35098e62cede9 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/overwrite/auxiliary/quebec.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/overwrite/auxiliary/quebec.rs @@ -1,4 +1,4 @@ -//@ doc-flags:--merge=none +//@ doc-flags:--write-doc-meta-dir=info/doc.parts/quebec.d //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/overwrite/auxiliary/tango.rs b/tests/rustdoc-html/merge-cross-crate-info/overwrite/auxiliary/tango.rs index 363b2d5508e63..dcb7965dde86e 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/overwrite/auxiliary/tango.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/overwrite/auxiliary/tango.rs @@ -1,6 +1,6 @@ //@ aux-build:quebec.rs //@ build-aux-docs -//@ doc-flags:--merge=finalize +//@ doc-flags:--read-doc-meta-dir=info/doc.parts //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/overwrite/sierra.rs b/tests/rustdoc-html/merge-cross-crate-info/overwrite/sierra.rs index cac978f3bb272..57c9732ba8dd7 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/overwrite/sierra.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/overwrite/sierra.rs @@ -1,6 +1,5 @@ //@ aux-build:tango.rs //@ build-aux-docs -//@ doc-flags:--merge=shared //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options @@ -13,7 +12,7 @@ //@ hasraw search.index/name/*.js 'Sierra' //@ !hasraw search.index/name/*.js 'Quebec' -// since tango is documented with --merge=finalize, we overwrite q's +// since tango is documented with "finalize mode", we overwrite q's // cross-crate information extern crate tango; pub struct Sierra; diff --git a/tests/rustdoc-html/merge-cross-crate-info/single-crate-finalize/quebec.rs b/tests/rustdoc-html/merge-cross-crate-info/single-crate-finalize/quebec.rs index 2ab08c112a18c..c157380edf1f9 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/single-crate-finalize/quebec.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/single-crate-finalize/quebec.rs @@ -1,4 +1,3 @@ -//@ doc-flags:--merge=finalize //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/single-crate-read-write/quebec.rs b/tests/rustdoc-html/merge-cross-crate-info/single-crate-read-write/quebec.rs index 1b9e8a3db08da..4fd510e31227c 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/single-crate-read-write/quebec.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/single-crate-read-write/quebec.rs @@ -1,4 +1,3 @@ -//@ doc-flags:--merge=shared //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/single-crate-write-anyway/quebec.rs b/tests/rustdoc-html/merge-cross-crate-info/single-crate-write-anyway/quebec.rs index 6b72615eb9dec..fde3635e62250 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/single-crate-write-anyway/quebec.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/single-crate-write-anyway/quebec.rs @@ -1,4 +1,4 @@ -//@ doc-flags:--parts-out-dir=info/doc.parts/quebec +//@ doc-flags:--read-doc-meta-dir=. //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options @@ -8,6 +8,6 @@ //@ has quebec/struct.Quebec.html //@ hasraw search.index/name/*.js 'Quebec' -// we can --parts-out-dir, but that doesn't do anything other than create +// we can --write-doc-meta-dir, but that doesn't do anything other than create // the file pub struct Quebec; diff --git a/tests/rustdoc-html/merge-cross-crate-info/single-merge-none-useless-write/quebec.rs b/tests/rustdoc-html/merge-cross-crate-info/single-merge-none-useless-write/quebec.rs deleted file mode 100644 index bfde21c9ed3c9..0000000000000 --- a/tests/rustdoc-html/merge-cross-crate-info/single-merge-none-useless-write/quebec.rs +++ /dev/null @@ -1,11 +0,0 @@ -//@ doc-flags:--merge=none -//@ doc-flags:--parts-out-dir=info/doc.parts/quebec -//@ doc-flags:--enable-index-page -//@ doc-flags:-Zunstable-options - -//@ !has index.html -//@ has quebec/struct.Quebec.html -//@ !has search.index/name/*.js - -// --merge=none doesn't write anything, despite --parts-out-dir -pub struct Quebec; diff --git a/tests/rustdoc-html/merge-cross-crate-info/transitive-finalize/auxiliary/quebec.rs b/tests/rustdoc-html/merge-cross-crate-info/transitive-finalize/auxiliary/quebec.rs deleted file mode 100644 index 1beca543f814f..0000000000000 --- a/tests/rustdoc-html/merge-cross-crate-info/transitive-finalize/auxiliary/quebec.rs +++ /dev/null @@ -1,5 +0,0 @@ -//@ doc-flags:--merge=finalize -//@ doc-flags:--enable-index-page -//@ doc-flags:-Zunstable-options - -pub struct Quebec; diff --git a/tests/rustdoc-html/merge-cross-crate-info/transitive-finalize/auxiliary/tango.rs b/tests/rustdoc-html/merge-cross-crate-info/transitive-finalize/auxiliary/tango.rs deleted file mode 100644 index 363b2d5508e63..0000000000000 --- a/tests/rustdoc-html/merge-cross-crate-info/transitive-finalize/auxiliary/tango.rs +++ /dev/null @@ -1,8 +0,0 @@ -//@ aux-build:quebec.rs -//@ build-aux-docs -//@ doc-flags:--merge=finalize -//@ doc-flags:--enable-index-page -//@ doc-flags:-Zunstable-options - -extern crate quebec; -pub trait Tango {} diff --git a/tests/rustdoc-html/merge-cross-crate-info/transitive-finalize/sierra.rs b/tests/rustdoc-html/merge-cross-crate-info/transitive-finalize/sierra.rs deleted file mode 100644 index b45895a40a1b6..0000000000000 --- a/tests/rustdoc-html/merge-cross-crate-info/transitive-finalize/sierra.rs +++ /dev/null @@ -1,20 +0,0 @@ -//@ aux-build:tango.rs -//@ build-aux-docs -//@ doc-flags:--merge=finalize -//@ doc-flags:--enable-index-page -//@ doc-flags:-Zunstable-options - -//@ has index.html -//@ has index.html '//h1' 'List of all crates' -//@ has index.html '//ul[@class="all-items"]//a[@href="sierra/index.html"]' 'sierra' -//@ has index.html '//ul[@class="all-items"]//a[@href="tango/index.html"]' 'tango' -//@ has sierra/struct.Sierra.html -//@ has tango/trait.Tango.html -//@ hasraw sierra/struct.Sierra.html 'Tango' -//@ hasraw trait.impl/tango/trait.Tango.js 'struct.Sierra.html' -//@ hasraw search.index/name/*.js 'Sierra' - -// write only overwrites stuff in the output directory -extern crate tango; -pub struct Sierra; -impl tango::Tango for Sierra {} diff --git a/tests/rustdoc-html/merge-cross-crate-info/transitive-merge-none/auxiliary/quebec.rs b/tests/rustdoc-html/merge-cross-crate-info/transitive-merge-none/auxiliary/quebec.rs index 6ab921533b037..442eacb91f480 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/transitive-merge-none/auxiliary/quebec.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/transitive-merge-none/auxiliary/quebec.rs @@ -1,5 +1,4 @@ -//@ doc-flags:--merge=none -//@ doc-flags:--parts-out-dir=info/doc.parts/quebec +//@ doc-flags:--write-doc-meta-dir=info/doc.parts/quebec //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/transitive-merge-none/auxiliary/tango.rs b/tests/rustdoc-html/merge-cross-crate-info/transitive-merge-none/auxiliary/tango.rs index 9fa99d3be8af4..e10bab806ea0c 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/transitive-merge-none/auxiliary/tango.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/transitive-merge-none/auxiliary/tango.rs @@ -1,7 +1,6 @@ //@ aux-build:quebec.rs //@ build-aux-docs -//@ doc-flags:--merge=none -//@ doc-flags:--parts-out-dir=info/doc.parts/tango +//@ doc-flags:--write-doc-meta-dir=info/doc.parts/tango //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/transitive-merge-none/sierra.rs b/tests/rustdoc-html/merge-cross-crate-info/transitive-merge-none/sierra.rs index be37137617936..945e8cf84dc7d 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/transitive-merge-none/sierra.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/transitive-merge-none/sierra.rs @@ -1,8 +1,7 @@ //@ aux-build:tango.rs //@ build-aux-docs -//@ doc-flags:--merge=finalize -//@ doc-flags:--include-parts-dir=info/doc.parts/tango -//@ doc-flags:--include-parts-dir=info/doc.parts/quebec +//@ doc-flags:--read-doc-meta-dir=info/doc.parts/tango +//@ doc-flags:--read-doc-meta-dir=info/doc.parts/quebec //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options @@ -21,7 +20,7 @@ //@ hasraw search.index/name/*.js 'Quebec' // We avoid writing any cross-crate information, preferring to include it -// with --include-parts-dir. +// with --read-doc-meta-dir. extern crate tango; pub struct Sierra; impl tango::Tango for Sierra {} diff --git a/tests/rustdoc-html/merge-cross-crate-info/transitive-merge-read-write/auxiliary/quebec.rs b/tests/rustdoc-html/merge-cross-crate-info/transitive-merge-read-write/auxiliary/quebec.rs index 1beca543f814f..c4b3ce498576c 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/transitive-merge-read-write/auxiliary/quebec.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/transitive-merge-read-write/auxiliary/quebec.rs @@ -1,4 +1,3 @@ -//@ doc-flags:--merge=finalize //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/transitive-merge-read-write/auxiliary/tango.rs b/tests/rustdoc-html/merge-cross-crate-info/transitive-merge-read-write/auxiliary/tango.rs index ff12fe98d82c2..299a673418713 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/transitive-merge-read-write/auxiliary/tango.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/transitive-merge-read-write/auxiliary/tango.rs @@ -1,6 +1,5 @@ //@ aux-build:quebec.rs //@ build-aux-docs -//@ doc-flags:--merge=shared //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/transitive-merge-read-write/sierra.rs b/tests/rustdoc-html/merge-cross-crate-info/transitive-merge-read-write/sierra.rs index dc10ec3de35b0..67ce91d1e225a 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/transitive-merge-read-write/sierra.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/transitive-merge-read-write/sierra.rs @@ -1,6 +1,5 @@ //@ aux-build:tango.rs //@ build-aux-docs -//@ doc-flags:--merge=shared //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options @@ -19,7 +18,7 @@ //@ hasraw search.index/name/*.js 'Quebec' // We can use read-write to emulate the default behavior of rustdoc, when -// --merge is left out. +// --read-doc-meta-dir is left out. extern crate tango; pub struct Sierra; impl tango::Tango for Sierra {} diff --git a/tests/rustdoc-html/merge-cross-crate-info/transitive-no-info/auxiliary/quebec.rs b/tests/rustdoc-html/merge-cross-crate-info/transitive-no-info/auxiliary/quebec.rs index 0e28d8e646647..442eacb91f480 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/transitive-no-info/auxiliary/quebec.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/transitive-no-info/auxiliary/quebec.rs @@ -1,4 +1,4 @@ -//@ doc-flags:--merge=none +//@ doc-flags:--write-doc-meta-dir=info/doc.parts/quebec //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/transitive-no-info/auxiliary/tango.rs b/tests/rustdoc-html/merge-cross-crate-info/transitive-no-info/auxiliary/tango.rs index 3827119f696f5..e10bab806ea0c 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/transitive-no-info/auxiliary/tango.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/transitive-no-info/auxiliary/tango.rs @@ -1,6 +1,6 @@ //@ aux-build:quebec.rs //@ build-aux-docs -//@ doc-flags:--merge=none +//@ doc-flags:--write-doc-meta-dir=info/doc.parts/tango //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options diff --git a/tests/rustdoc-html/merge-cross-crate-info/transitive-no-info/sierra.rs b/tests/rustdoc-html/merge-cross-crate-info/transitive-no-info/sierra.rs index 9eaa627419bb4..61c60cf7c9e15 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/transitive-no-info/sierra.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/transitive-no-info/sierra.rs @@ -1,6 +1,6 @@ //@ aux-build:tango.rs //@ build-aux-docs -//@ doc-flags:--merge=none +//@ doc-flags:--write-doc-meta-dir=info/doc.parts/sierra //@ doc-flags:--enable-index-page //@ doc-flags:-Zunstable-options @@ -11,7 +11,8 @@ //@ !has trait.impl/tango/trait.Tango.js //@ !has search.index/name/*.js -// --merge=none on all crates does not generate any cross-crate info +// --write-doc-meta-dir on all crates does not write the search index +// in the actual output folder extern crate tango; pub struct Sierra; impl tango::Tango for Sierra {} diff --git a/tests/rustdoc-html/merge-cross-crate-info/two-separate-out-dir/auxiliary/foxtrot.rs b/tests/rustdoc-html/merge-cross-crate-info/two-separate-out-dir/auxiliary/foxtrot.rs index e492b700dbc2b..713f8812a55a6 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/two-separate-out-dir/auxiliary/foxtrot.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/two-separate-out-dir/auxiliary/foxtrot.rs @@ -1,5 +1,5 @@ //@ unique-doc-out-dir -//@ doc-flags:--parts-out-dir=info/doc.parts/foxtrot +//@ doc-flags:--write-doc-meta-dir=info/doc.parts/foxtrot //@ doc-flags:-Zunstable-options pub trait Foxtrot {} diff --git a/tests/rustdoc-html/merge-cross-crate-info/two-separate-out-dir/echo.rs b/tests/rustdoc-html/merge-cross-crate-info/two-separate-out-dir/echo.rs index d79302e62cdc3..998bb559df8c1 100644 --- a/tests/rustdoc-html/merge-cross-crate-info/two-separate-out-dir/echo.rs +++ b/tests/rustdoc-html/merge-cross-crate-info/two-separate-out-dir/echo.rs @@ -1,6 +1,6 @@ //@ aux-build:foxtrot.rs //@ build-aux-docs -//@ doc-flags:--include-parts-dir=info/doc.parts/foxtrot +//@ doc-flags:--read-doc-meta-dir=info/doc.parts/foxtrot //@ doc-flags:-Zunstable-options //@ has echo/enum.Echo.html diff --git a/tests/rustdoc-js/auxiliary/merged-dep.rs b/tests/rustdoc-js/auxiliary/merged-dep.rs index fadeb6c65270e..0a3216ee5c03f 100644 --- a/tests/rustdoc-js/auxiliary/merged-dep.rs +++ b/tests/rustdoc-js/auxiliary/merged-dep.rs @@ -1,6 +1,5 @@ //@ unique-doc-out-dir -//@ doc-flags:--merge=none -//@ doc-flags:--parts-out-dir=info/doc.parts/merged-dep +//@ doc-flags:--write-doc-meta-dir=info/doc.parts/merged-dep //@ doc-flags:-Zunstable-options pub struct Dep; diff --git a/tests/rustdoc-js/merged-doc.rs b/tests/rustdoc-js/merged-doc.rs index ef7ce4b1fd365..7fc18f2e8bb4a 100644 --- a/tests/rustdoc-js/merged-doc.rs +++ b/tests/rustdoc-js/merged-doc.rs @@ -1,8 +1,7 @@ //@ revisions: merge nomerge //@ aux-build:merged-dep.rs //@ build-aux-docs -//@[merge] doc-flags:--merge=finalize -//@[merge] doc-flags:--include-parts-dir=info/doc.parts/merged-dep +//@[merge] doc-flags:--read-doc-meta-dir=info/doc.parts/merged-dep //@[merge] doc-flags:-Zunstable-options extern crate merged_dep;