rollup merge of #20725: tomjakubowski/rustdoc-misc

Conflicts:
	src/librustdoc/html/format.rs

diff --cc src/librustdoc/html/format.rs
index b3cef19e56705123659045b01aab381cfec45c58,0757441ed878db9960c5203741d11fdcb2531258..244f5926a123db5d94a29886f56849359743cc88
--- 1/src/librustdoc/html/format.rs
--- 2/src/librustdoc/html/format.rs
+++ b/src/librustdoc/html/format.rs
@@@ -727,6 -875,27 +737,12 @@@ impl fmt::String for clean::ViewListIde
      }
  }
  
 -//NOTE(stage0): remove impl after snapshot
 -impl fmt::Show for clean::TypeBinding {
 -    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 -        fmt::String::fmt(self, f)
 -    }
 -}
 -
+ impl fmt::String for clean::TypeBinding {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+         write!(f, "{}={}", self.name, self.ty)
+     }
+ }
+ 
 -//NOTE(stage0): remove impl after snapshot
 -#[cfg(stage0)]
 -impl fmt::Show for MutableSpace {
 -    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 -        fmt::String::fmt(self, f)
 -    }
 -}
 -
  impl fmt::String for MutableSpace {
      fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
          match *self {