bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

auto merge of #14957 : alexcrichton/rust/rustdoc-fixups, r=huonw

Browse source 
Fixing some of rustdoc's rendering to use newer syntaxes rather than older
syntaxes.
This commit is contained in:
bors 2014-06-17 16:26:33 +00:00
commit db298145c7
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/librustdoc/html/format.rs
View file

@ -316,11 +316,8 @@ fn tybounds(w: &mut fmt::Formatter,
typarams: &Option<Vec<clean::TyParamBound> >) -> fmt::Result { typarams: &Option<Vec<clean::TyParamBound> >) -> fmt::Result {
match *typarams { match *typarams {
Some(ref params) => { Some(ref params) => {
try!(write!(w, ":")); for param in params.iter() {
for (i, param) in params.iter().enumerate() { try!(write!(w, " + "));
if i > 0 {
try!(write!(w, " + "));
}
try!(write!(w, "{}", *param)); try!(write!(w, "{}", *param));
} }
Ok(()) Ok(())
@ -432,8 +429,8 @@ impl fmt::Show for clean::Type {
format!("[{}, ..{}]", **t, *s).as_slice()) format!("[{}, ..{}]", **t, *s).as_slice())
} }
clean::Bottom => f.write("!".as_bytes()), clean::Bottom => f.write("!".as_bytes()),
clean::Unique(ref t) => write!(f, "~{}", **t), clean::Unique(ref t) => write!(f, "Box<{}>", **t),
clean::Managed(ref t) => write!(f, "@{}", **t), clean::Managed(ref t) => write!(f, "Gc<{}>", **t),
clean::RawPointer(m, ref t) => { clean::RawPointer(m, ref t) => {
write!(f, "*{}{}", MutableSpace(m), **t) write!(f, "*{}{}", MutableSpace(m), **t)
} }