mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #78094 - camelid:rustdoc-fix-source-title, r=jyn514

Browse Source 
rustdoc: Show the correct source filename in page titles, without `.html`

Previously the title would be

    lib.rs.html -- source

if `lib.rs` was the actual source filename. Now the title is

    lib.rs - source
This commit is contained in:
Yuki Okushi 2020-10-21 13:59:41 +09:00 committed by GitHub
commit 72ae00bc1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/librustdoc/html/sources.rs
View File

@ -84,7 +84,7 @@ impl<'a> SourceCollector<'a> {
}; };
// Remove the utf-8 BOM if any // Remove the utf-8 BOM if any
if contents.starts_with("\u{feff}") { if contents.starts_with('\u{feff}') {
contents.drain(..3); contents.drain(..3);
} }
@ -99,16 +99,15 @@ impl<'a> SourceCollector<'a> {
href.push('/'); href.push('/');
}); });
self.scx.ensure_dir(&cur)?; self.scx.ensure_dir(&cur)?;
let mut fname = p.file_name().expect("source has no filename").to_os_string();
let src_fname = p.file_name().expect("source has no filename").to_os_string();
let mut fname = src_fname.clone();
fname.push(".html"); fname.push(".html");
cur.push(&fname); cur.push(&fname);
href.push_str(&fname.to_string_lossy()); href.push_str(&fname.to_string_lossy());
let title = format!( let title = format!("{} - source", src_fname.to_string_lossy());
"{} -- source", let desc = format!("Source of the Rust file `{}`.", filename);
cur.file_name().expect("failed to get file name").to_string_lossy()
);
let desc = format!("Source to the Rust file `{}`.", filename);
let page = layout::Page { let page = layout::Page {
title: &title, title: &title,
css_class: "source", css_class: "source",