Skip to content

Commit c3f634e

Browse files
committed
---
yaml --- r: 277350 b: refs/heads/try c: cfae4de h: refs/heads/master
1 parent 6b392ee commit c3f634e

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
33
refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
4-
refs/heads/try: 847d195e3c80e9de4f4acb141884f2fd12c9263d
4+
refs/heads/try: cfae4dea875ddcc5f23481106a149ea15b6be1e5
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/doc/book/const-and-static.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,5 @@ the result of a function call or anything similarly complex or at runtime.
7979

8080
Almost always, if you can choose between the two, choose `const`. It’s pretty
8181
rare that you actually want a memory location associated with your constant,
82-
and using a const allows for optimizations like constant propagation not only
82+
and using a `const` allows for optimizations like constant propagation not only
8383
in your crate but downstream crates.

branches/try/src/libcore/iter/iterator.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -598,13 +598,13 @@ pub trait Iterator {
598598
/// # Examples
599599
///
600600
/// ```
601-
/// let a = [1, 2, 3];
601+
/// let a = ['a', 'b', 'c'];
602602
///
603603
/// let mut iter = a.iter().enumerate();
604604
///
605-
/// assert_eq!(iter.next(), Some((0, &1)));
606-
/// assert_eq!(iter.next(), Some((1, &2)));
607-
/// assert_eq!(iter.next(), Some((2, &3)));
605+
/// assert_eq!(iter.next(), Some((0, &'a')));
606+
/// assert_eq!(iter.next(), Some((1, &'b')));
607+
/// assert_eq!(iter.next(), Some((2, &'c')));
608608
/// assert_eq!(iter.next(), None);
609609
/// ```
610610
#[inline]
@@ -2109,4 +2109,3 @@ impl<'a, I: Iterator + ?Sized> Iterator for &'a mut I {
21092109
fn next(&mut self) -> Option<I::Item> { (**self).next() }
21102110
fn size_hint(&self) -> (usize, Option<usize>) { (**self).size_hint() }
21112111
}
2112-

0 commit comments

Comments
 (0)