Skip to content

Commit f2373b6

Browse files
committed
code from this morning
1 parent 5746982 commit f2373b6

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/librustdoc/html/render/write_shared.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -399,8 +399,6 @@ impl CciPart for CratesIndexPart {
399399

400400
impl CratesIndexPart {
401401
fn blank_template(cx: &Context<'_>) -> SortedTemplate<<Self as CciPart>::FileFormat> {
402-
// users are being naughty if they have this
403-
const MAGIC: &str = "\u{FFFC}";
404402
let page = layout::Page {
405403
title: "Index of crates",
406404
css_class: "mod sys",
@@ -412,12 +410,13 @@ impl CratesIndexPart {
412410
};
413411
let layout = &cx.shared.layout;
414412
let style_files = &cx.shared.style_files;
413+
const MAGIC: &str = "\u{FFFC}"; // users are being naughty if they have this
415414
let content = format!("<h1>List of all crates</h1><ul class=\"all-items\">{MAGIC}</ul>");
416415
let template = layout::render(layout, &page, "", content, &style_files);
417416
match SortedTemplate::magic(&template, MAGIC) {
418417
Ok(template) => template,
419-
Err(_) => panic!(
420-
"Object Replacement Character (U+FFFC) should not appear in your --index-page"
418+
Err(e) => panic!(
419+
"{e}: Object Replacement Character (U+FFFC) should not appear in the --index-page"
421420
),
422421
}
423422
}

src/tools/compiletest/src/runtest.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1869,6 +1869,8 @@ impl<'test> TestCx<'test> {
18691869
}
18701870
}
18711871

1872+
/// `root_testpaths` refers to the path of the original test.
1873+
/// the auxiliary and the test with an aux-build have the same `root_testpaths`.
18721874
fn compose_and_run_compiler(
18731875
&self,
18741876
mut rustc: Command,

0 commit comments

Comments
 (0)