Skip to content

Commit 404c2f6

Browse files
committed
---
yaml --- r: 209271 b: refs/heads/auto c: c7f9201 h: refs/heads/master i: 209269: 25c6211 209267: bee155f 209263: 8951f20 v: v3
1 parent 6110302 commit 404c2f6

File tree

4 files changed

+8
-19
lines changed

4 files changed

+8
-19
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: 0d64659c30c2fc92a0d179b52ec0689ce1f09f29
13+
refs/heads/auto: c7f92018accf8fd27fdac5acbe7fe3506c338ed1
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/doc/trpl/the-stack-and-the-heap.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ At the end of `bar()`, it calls `baz()`:
454454
| (2<sup>30</sup>) - 1 | | 5 |
455455
| ... | ... | ... |
456456
| 12 | g | 100 |
457-
| 11 | f | 4 |
457+
| 11 | f | 9 |
458458
| 10 | e | 9 |
459459
| 9 | d | (2<sup>30</sup>) - 1 |
460460
| 8 | c | 5 |

branches/auto/src/libcore/iter.rs

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,19 +1009,8 @@ pub trait Iterator {
10091009
(ts, us)
10101010
}
10111011

1012-
/// Creates an iterator that clones the elements it yields.
1013-
///
1014-
/// This is useful for converting an Iterator<&T> to an Iterator<T>,
1015-
/// so it's a more convenient form of `map(|&x| x)`.
1016-
///
1017-
/// # Examples
1018-
///
1019-
/// ```
1020-
/// let a = [0, 1, 2];
1021-
/// let v_cloned: Vec<_> = a.iter().cloned().collect();
1022-
/// let v_map: Vec<_> = a.iter().map(|&x| x).collect();
1023-
/// assert_eq!(v_cloned, v_map);
1024-
/// ```
1012+
/// Creates an iterator that clones the elements it yields. Useful for
1013+
/// converting an Iterator<&T> to an Iterator<T>.
10251014
#[stable(feature = "rust1", since = "1.0.0")]
10261015
fn cloned<'a, T: 'a>(self) -> Cloned<Self>
10271016
where Self: Sized + Iterator<Item=&'a T>, T: Clone
@@ -1068,7 +1057,7 @@ pub trait Iterator {
10681057
/// # #![feature(core)]
10691058
///
10701059
/// let a = [1, 2, 3, 4, 5];
1071-
/// let it = a.iter();
1060+
/// let mut it = a.iter().cloned();
10721061
/// assert_eq!(it.sum::<i32>(), 15);
10731062
/// ```
10741063
#[unstable(feature="core")]

branches/auto/src/libstd/path.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ mod platform {
258258
/// Path prefixes (Windows only).
259259
///
260260
/// Windows uses a variety of path styles, including references to drive
261-
/// volumes (like `C:`), network shared folders (like `\\server\share`) and
261+
/// volumes (like `C:`), network shared (like `\\server\share`) and
262262
/// others. In addition, some path prefixes are "verbatim", in which case
263263
/// `/` is *not* treated as a separator and essentially no normalization is
264264
/// performed.
@@ -312,14 +312,14 @@ impl<'a> Prefix<'a> {
312312

313313
}
314314

315-
/// Determines if the prefix is verbatim, i.e. begins with `\\?\`.
315+
/// Determines if the prefix is verbatim, i.e. begins `\\?\`.
316316
#[inline]
317317
#[stable(feature = "rust1", since = "1.0.0")]
318318
pub fn is_verbatim(&self) -> bool {
319319
use self::Prefix::*;
320320
match *self {
321321
Verbatim(_) | VerbatimDisk(_) | VerbatimUNC(_, _) => true,
322-
_ => false,
322+
_ => false
323323
}
324324
}
325325

0 commit comments

Comments
 (0)