Skip to content

Commit db29814

Browse files
committed
auto merge of #14957 : alexcrichton/rust/rustdoc-fixups, r=huonw
Fixing some of rustdoc's rendering to use newer syntaxes rather than older syntaxes.
2 parents acc944a + 7b42e38 commit db29814

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

src/librustdoc/html/format.rs

+4-7
Original file line numberDiff line numberDiff line change
@@ -316,11 +316,8 @@ fn tybounds(w: &mut fmt::Formatter,
316316
typarams: &Option<Vec<clean::TyParamBound> >) -> fmt::Result {
317317
match *typarams {
318318
Some(ref params) => {
319-
try!(write!(w, ":"));
320-
for (i, param) in params.iter().enumerate() {
321-
if i > 0 {
322-
try!(write!(w, " + "));
323-
}
319+
for param in params.iter() {
320+
try!(write!(w, " + "));
324321
try!(write!(w, "{}", *param));
325322
}
326323
Ok(())
@@ -432,8 +429,8 @@ impl fmt::Show for clean::Type {
432429
format!("[{}, ..{}]", **t, *s).as_slice())
433430
}
434431
clean::Bottom => f.write("!".as_bytes()),
435-
clean::Unique(ref t) => write!(f, "~{}", **t),
436-
clean::Managed(ref t) => write!(f, "@{}", **t),
432+
clean::Unique(ref t) => write!(f, "Box<{}>", **t),
433+
clean::Managed(ref t) => write!(f, "Gc<{}>", **t),
437434
clean::RawPointer(m, ref t) => {
438435
write!(f, "*{}{}", MutableSpace(m), **t)
439436
}

0 commit comments

Comments
 (0)