]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #26957 - wesleywiser:rename_connect_to_join, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 12 Jul 2015 22:05:59 +0000 (22:05 +0000)
committerbors <bors@rust-lang.org>
Sun, 12 Jul 2015 22:05:59 +0000 (22:05 +0000)
Fixes #26900

15 files changed:
1  2 
src/libcollections/slice.rs
src/libcollections/str.rs
src/libcollectionstest/slice.rs
src/libcollectionstest/str.rs
src/libgetopts/lib.rs
src/librustc/metadata/encoder.rs
src/librustc/middle/infer/mod.rs
src/librustc_trans/trans/debuginfo/metadata.rs
src/librustc_trans/trans/type_of.rs
src/librustc_typeck/check/mod.rs
src/librustc_typeck/coherence/mod.rs
src/librustc_typeck/collect.rs
src/librustdoc/clean/mod.rs
src/librustdoc/passes.rs
src/libtest/lib.rs

Simple merge
index 7f86209bd2ac9c514f5def488724cb726fb163c7,7e4a219fc422f4f06917a412458941918eb53eb5..f92db5353b39ebb997d8799f726c70983d2d7855
@@@ -130,8 -132,16 +130,12 @@@ impl<S: Borrow<str>> SliceConcatExt<str
          }
          result
      }
+     fn connect(&self, sep: &str) -> String {
+         self.join(sep)
+     }
  }
  
 -/*
 -Section: Iterators
 -*/
 -
  // Helper functions used for Unicode normalization
  fn canonical_sort(comb: &mut [(char, u8)]) {
      let len = comb.len();
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge