rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

merge with master to pick up pulldown switch

Browse Source
This commit is contained in:
QuietMisdreavus
2017-04-09 10:38:38 -05:00
parent bfd01b7f40 2c48ae6f7f
commit 8dd4c44ef6
1196 changed files with 28940 additions and 37303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/librustdoc/html/format.rs
View File

@@ -508,7 +508,7 @@ fn resolved_path(w: &mut fmt::Formatter, did: DefId, path: &clean::Path,
if is_not_debug {
write!(w, "{:#}{:#}", HRef::new(did, &last.name), last.params)?;
} else {
write!(w, "{:?}{:?}", HRef::new(did, &last.name), last.params)?;
write!(w, "{:?}{}", HRef::new(did, &last.name), last.params)?;
}
} else {
if is_not_debug {
@@ -534,7 +534,7 @@ fn resolved_path(w: &mut fmt::Formatter, did: DefId, path: &clean::Path,
} else {
format!("{:?}", HRef::new(did, &last.name))
};
write!(w, "{}{:?}", path, last.params)?;
write!(w, "{}{}", path, last.params)?;
}
}
Ok(())
@@ -1114,9 +1114,9 @@ impl fmt::Display for clean::ImportSource {
impl fmt::Display for clean::TypeBinding {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
if f.alternate() {
write!(f, "{}={:#}", self.name, self.ty)
write!(f, "{} = {:#}", self.name, self.ty)
} else {
write!(f, "{}={}", self.name, self.ty)
write!(f, "{} = {}", self.name, self.ty)
}
}
}