From 243c8e91cffa9acfbbf8c1a81e5af0d8e6498299 Mon Sep 17 00:00:00 2001 From: Camelid Date: Tue, 20 Oct 2020 13:23:11 -0700 Subject: [PATCH] Apply some review suggestions --- src/librustdoc/html/sources.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/librustdoc/html/sources.rs b/src/librustdoc/html/sources.rs index 8dc30895762d9..b487b39952174 100644 --- a/src/librustdoc/html/sources.rs +++ b/src/librustdoc/html/sources.rs @@ -8,7 +8,7 @@ use crate::html::layout; use crate::html::render::{SharedContext, BASIC_KEYWORDS}; use rustc_hir::def_id::LOCAL_CRATE; use rustc_span::source_map::FileName; -use std::ffi::{OsStr, OsString}; +use std::ffi::OsStr; use std::fs; use std::path::{Component, Path, PathBuf}; @@ -100,13 +100,13 @@ impl<'a> SourceCollector<'a> { }); self.scx.ensure_dir(&cur)?; - let src_fname = - String::from(p.file_name().expect("source has no filename").to_string_lossy()); - let fname = OsString::from(src_fname.clone() + ".html"); + let src_fname = p.file_name().expect("source has no filename").to_os_string(); + let mut fname = src_fname.clone(); + fname.push(".html"); cur.push(&fname); href.push_str(&fname.to_string_lossy()); - let title = format!("{} – source", src_fname,); + let title = format!("{} - source", src_fname.to_string_lossy()); let desc = format!("Source of the Rust file `{}`.", filename); let page = layout::Page { title: &title,