diff options
| author | bors <bors@rust-lang.org> | 2015-09-27 11:01:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-09-27 11:01:11 +0000 |
| commit | 638b2608a70171593471b45fb344741a37230b0d (patch) | |
| tree | dc53b7eac13b589e6e4135493bf24892cd09eb06 /src/libcollections | |
| parent | 219eca11b044de3644b3e9101124513c1a842b09 (diff) | |
| parent | c34f3eaebc2f805864d3de9c7ce257eb41a6def2 (diff) | |
Auto merge of #28689 - Manishearth:rollup, r=Manishearth
- Successful merges: #28664, #28673, #28681, #28682, #28688 - Failed merges:
Diffstat (limited to 'src/libcollections')
| -rw-r--r-- | src/libcollections/enum_set.rs | 11 | ||||
| -rw-r--r-- | src/libcollections/str.rs | 2 | ||||
| -rw-r--r-- | src/libcollections/vec.rs | 2 | ||||
| -rw-r--r-- | src/libcollections/vec_deque.rs | 13 |
4 files changed, 2 insertions, 26 deletions
diff --git a/src/libcollections/enum_set.rs b/src/libcollections/enum_set.rs index 7e7e8ba2356..32cd4193d88 100644 --- a/src/libcollections/enum_set.rs +++ b/src/libcollections/enum_set.rs @@ -49,16 +49,7 @@ impl<E> Clone for EnumSet<E> { #[stable(feature = "rust1", since = "1.0.0")] impl<E:CLike + fmt::Debug> fmt::Debug for EnumSet<E> { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { - try!(write!(fmt, "{{")); - let mut first = true; - for e in self { - if !first { - try!(write!(fmt, ", ")); - } - try!(write!(fmt, "{:?}", e)); - first = false; - } - write!(fmt, "}}") + fmt.debug_set().entries(self).finish() } } diff --git a/src/libcollections/str.rs b/src/libcollections/str.rs index a3d38bdd1b3..124fe3fab56 100644 --- a/src/libcollections/str.rs +++ b/src/libcollections/str.rs @@ -506,8 +506,6 @@ impl str { /// /// # Examples /// ``` - /// #![feature(str_split_at)] - /// /// let s = "Löwe 老虎 Léopard"; /// let first_space = s.find(' ').unwrap_or(s.len()); /// let (a, b) = s.split_at(first_space); diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs index a145393e0e3..d645de028ce 100644 --- a/src/libcollections/vec.rs +++ b/src/libcollections/vec.rs @@ -753,8 +753,6 @@ impl<T> Vec<T> { /// # Examples /// /// ``` - /// #![feature(split_off)] - /// /// let mut vec = vec![1,2,3]; /// let vec2 = vec.split_off(1); /// assert_eq!(vec, [1]); diff --git a/src/libcollections/vec_deque.rs b/src/libcollections/vec_deque.rs index 4ee9787c9ec..f7efe9a38df 100644 --- a/src/libcollections/vec_deque.rs +++ b/src/libcollections/vec_deque.rs @@ -1319,8 +1319,6 @@ impl<T> VecDeque<T> { /// # Examples /// /// ``` - /// #![feature(split_off)] - /// /// use std::collections::VecDeque; /// /// let mut buf: VecDeque<_> = vec![1,2,3].into_iter().collect(); @@ -1406,8 +1404,6 @@ impl<T> VecDeque<T> { /// # Examples /// /// ``` - /// #![feature(vec_deque_retain)] - /// /// use std::collections::VecDeque; /// /// let mut buf = VecDeque::new(); @@ -1787,14 +1783,7 @@ impl<'a, T: 'a + Copy> Extend<&'a T> for VecDeque<T> { #[stable(feature = "rust1", since = "1.0.0")] impl<T: fmt::Debug> fmt::Debug for VecDeque<T> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - try!(write!(f, "[")); - - for (i, e) in self.iter().enumerate() { - if i != 0 { try!(write!(f, ", ")); } - try!(write!(f, "{:?}", *e)); - } - - write!(f, "]") + f.debug_list().entries(self).finish() } } |
