Skip to content

Commit 908a4cf

Browse files
committed
---
yaml --- r: 194943 b: refs/heads/auto c: c5370be h: refs/heads/master i: 194941: 09de218 194939: 97d140e 194935: cee1ac6 194927: 5a12ace 194911: 4624b6e 194879: 7fb95ff 194815: b75f535 v: v3
1 parent 2d4330f commit 908a4cf

File tree

27 files changed

+314
-522
lines changed

27 files changed

+314
-522
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: 8fe7f1fa97884c233eb4b8128197431a9b1506ed
13+
refs/heads/auto: c5370be36ec6601c4a816f0341d1acd81e08d345
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/AUTHORS.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ Peter Schuller <[email protected]>
606606
Peter Williams <[email protected]>
607607
Peter Zotov <[email protected]>
608608
Petter Remen <[email protected]>
609-
Phil Dawes <[email protected]>
609+
Phil Dawes <[email protected]>
610610
Phil Ruffwind <[email protected]>
611611
Philip Munksgaard <[email protected]>
612612
Philipp Brüschweiler <[email protected]>

branches/auto/src/doc/trpl/SUMMARY.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
* [Looping](looping.md)
1414
* [Strings](strings.md)
1515
* [Arrays, Vectors, and Slices](arrays-vectors-and-slices.md)
16-
* [Standard Input](standard-input.md)
1716
* [Intermediate Rust](intermediate.md)
1817
* [Crates and Modules](crates-and-modules.md)
1918
* [Testing](testing.md)

branches/auto/src/doc/trpl/documentation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ can be useful when changing some options, or when writing a macro.
517517

518518
### Re-exports
519519

520-
`rustdoc` will show the documentation for a publc re-export in both places:
520+
`rustdoc` will show the documentation for a public re-export in both places:
521521

522522
```ignore
523523
extern crate foo;

branches/auto/src/doc/trpl/standard-input.md

Lines changed: 0 additions & 166 deletions
This file was deleted.

branches/auto/src/libcollections/btree/map.rs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -904,14 +904,7 @@ impl<K: Ord, V: Ord> Ord for BTreeMap<K, V> {
904904
#[stable(feature = "rust1", since = "1.0.0")]
905905
impl<K: Debug, V: Debug> Debug for BTreeMap<K, V> {
906906
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
907-
try!(write!(f, "{{"));
908-
909-
for (i, (k, v)) in self.iter().enumerate() {
910-
if i != 0 { try!(write!(f, ", ")); }
911-
try!(write!(f, "{:?}: {:?}", *k, *v));
912-
}
913-
914-
write!(f, "}}")
907+
self.iter().fold(f.debug_map(), |b, (k, v)| b.entry(k, v)).finish()
915908
}
916909
}
917910

branches/auto/src/libcollections/btree/set.rs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -628,14 +628,7 @@ impl<'a, 'b, T: Ord + Clone> BitOr<&'b BTreeSet<T>> for &'a BTreeSet<T> {
628628
#[stable(feature = "rust1", since = "1.0.0")]
629629
impl<T: Debug> Debug for BTreeSet<T> {
630630
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
631-
try!(write!(f, "{{"));
632-
633-
for (i, x) in self.iter().enumerate() {
634-
if i != 0 { try!(write!(f, ", ")); }
635-
try!(write!(f, "{:?}", *x));
636-
}
637-
638-
write!(f, "}}")
631+
self.iter().fold(f.debug_set(), |b, e| b.entry(e)).finish()
639632
}
640633
}
641634

branches/auto/src/libcollections/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
#![feature(str_char)]
4141
#![feature(convert)]
4242
#![feature(slice_patterns)]
43+
#![feature(debug_builders)]
4344
#![cfg_attr(test, feature(rand, rustc_private, test, hash, collections))]
4445
#![cfg_attr(test, allow(deprecated))] // rand
4546

branches/auto/src/libcollections/linked_list.rs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -927,14 +927,7 @@ impl<A: Clone> Clone for LinkedList<A> {
927927
#[stable(feature = "rust1", since = "1.0.0")]
928928
impl<A: fmt::Debug> fmt::Debug for LinkedList<A> {
929929
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
930-
try!(write!(f, "["));
931-
932-
for (i, e) in self.iter().enumerate() {
933-
if i != 0 { try!(write!(f, ", ")); }
934-
try!(write!(f, "{:?}", *e));
935-
}
936-
937-
write!(f, "]")
930+
self.iter().fold(f.debug_list(), |b, e| b.entry(e)).finish()
938931
}
939932
}
940933

branches/auto/src/libcollections/slice.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
//!
5151
//! ## Iteration
5252
//!
53-
//! The slices implement `IntoIterator`. The iterators of yield references
54-
//! to the slice elements.
53+
//! The slices implement `IntoIterator`. The iterator yields references to the
54+
//! slice elements.
5555
//!
5656
//! ```
5757
//! let numbers = &[0, 1, 2];

0 commit comments

Comments
 (0)