]> git.lizzy.rs Git - rust.git/commitdiff
rollup merge of #20722: alexcrichton/audit-show
authorAlex Crichton <alex@alexcrichton.com>
Thu, 8 Jan 2015 01:18:59 +0000 (17:18 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Thu, 8 Jan 2015 01:18:59 +0000 (17:18 -0800)
Conflicts:
src/libcollections/vec.rs
src/libcore/fmt/mod.rs
src/librustdoc/html/format.rs

1  2 
src/liballoc/arc.rs
src/liballoc/boxed.rs
src/liballoc/rc.rs
src/libcollections/string.rs
src/libcollections/vec.rs
src/libcore/borrow.rs
src/libcore/fmt/mod.rs
src/librustdoc/html/format.rs
src/libstd/path/posix.rs
src/libstd/path/windows.rs

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index c7ec687bc1a56a4ec22682d9b7dac4b3e5e053a9,a818c92241e6983ca40e2e7648ae939a03968ab5..b3cef19e56705123659045b01aab381cfec45c58
@@@ -64,6 -66,24 +66,16 @@@ impl UnsafetySpace 
      }
  }
  
 -//NOTE(stage0): remove impl after snapshot
 -#[cfg(stage0)]
 -impl<'a> fmt::Show for TyParamBounds<'a> {
 -    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 -        fmt::String::fmt(self, f)
 -    }
 -}
 -
+ impl<'a, T: fmt::String> fmt::String for CommaSep<'a, T> {
+     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+         for (i, item) in self.0.iter().enumerate() {
+             if i != 0 { try!(write!(f, ", ")); }
+             try!(write!(f, "{}", item));
+         }
+         Ok(())
+     }
+ }
  impl<'a> fmt::String for TyParamBounds<'a> {
      fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
          let &TyParamBounds(bounds) = self;
Simple merge
Simple merge