diff options
| author | bors <bors@rust-lang.org> | 2024-09-10 11:15:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-10 11:15:51 +0000 |
| commit | f827364a95b93ab70afd0383fcf3caa9da40e1fb (patch) | |
| tree | e73c5c7e673ec42d8f4766c14ffc11742b202776 /src/librustdoc/html/render/write_shared | |
| parent | 26b2b8d162ff6cc399c7e8005230beea7eb12037 (diff) | |
| parent | 548b6e197d9bafef6fae86098ea2afabbe99a90a (diff) | |
Auto merge of #129337 - EtomicBomb:rfc, r=notriddle
rustdoc rfc#3662 changes under unstable flags * All new functionality is under unstable options * Adds `--merge=shared|none|finalize` flags * Adds `--parts-out-dir=<crate specific directory>` for `--merge=none` to write cross-crate info file for a single crate * Adds `--include-parts-dir=<previously specified directory>` for `--merge=finalize` to write cross-crate info files * `tests/rustdoc/` tests for the new flags
Diffstat (limited to 'src/librustdoc/html/render/write_shared')
| -rw-r--r-- | src/librustdoc/html/render/write_shared/tests.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/librustdoc/html/render/write_shared/tests.rs b/src/librustdoc/html/render/write_shared/tests.rs index e282cd99e43..a235f1d3724 100644 --- a/src/librustdoc/html/render/write_shared/tests.rs +++ b/src/librustdoc/html/render/write_shared/tests.rs @@ -1,3 +1,4 @@ +use crate::config::ShouldMerge; use crate::html::render::ordered_json::{EscapedJson, OrderedJson}; use crate::html::render::sorted_template::{Html, SortedTemplate}; use crate::html::render::write_shared::*; @@ -192,16 +193,17 @@ fn read_template_test() { let path = path.path().join("file.html"); let make_blank = || SortedTemplate::<Html>::from_before_after("<div>", "</div>"); - let template = read_template_or_blank(make_blank, &path).unwrap(); + let should_merge = ShouldMerge { read_rendered_cci: true, write_rendered_cci: true }; + let template = read_template_or_blank(make_blank, &path, &should_merge).unwrap(); assert_eq!(but_last_line(&template.to_string()), "<div></div>"); fs::write(&path, template.to_string()).unwrap(); - let mut template = read_template_or_blank(make_blank, &path).unwrap(); + let mut template = read_template_or_blank(make_blank, &path, &should_merge).unwrap(); template.append("<img/>".to_string()); fs::write(&path, template.to_string()).unwrap(); - let mut template = read_template_or_blank(make_blank, &path).unwrap(); + let mut template = read_template_or_blank(make_blank, &path, &should_merge).unwrap(); template.append("<br/>".to_string()); fs::write(&path, template.to_string()).unwrap(); - let template = read_template_or_blank(make_blank, &path).unwrap(); + let template = read_template_or_blank(make_blank, &path, &should_merge).unwrap(); assert_eq!(but_last_line(&template.to_string()), "<div><br/><img/></div>"); } |