Skip to content

Commit 2839805

Browse files
committed
Fixed uses of get() to unwrap() in doc examples in std::iter
1 parent b4197ae commit 2839805

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

src/libstd/iter.rs

+28-28
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ pub trait Iterator<A> {
115115
/// let a = [0];
116116
/// let b = [1];
117117
/// let mut it = a.iter().chain(b.iter());
118-
/// assert_eq!(it.next().get(), &0);
119-
/// assert_eq!(it.next().get(), &1);
118+
/// assert_eq!(it.next().unwrap(), &0);
119+
/// assert_eq!(it.next().unwrap(), &1);
120120
/// assert!(it.next().is_none());
121121
/// ```
122122
#[inline]
@@ -135,7 +135,7 @@ pub trait Iterator<A> {
135135
/// let a = [0];
136136
/// let b = [1];
137137
/// let mut it = a.iter().zip(b.iter());
138-
/// assert_eq!(it.next().get(), (&0, &1));
138+
/// assert_eq!(it.next().unwrap(), (&0, &1));
139139
/// assert!(it.next().is_none());
140140
/// ```
141141
#[inline]
@@ -151,8 +151,8 @@ pub trait Iterator<A> {
151151
/// ```rust
152152
/// let a = [1, 2];
153153
/// let mut it = a.iter().map(|&x| 2 * x);
154-
/// assert_eq!(it.next().get(), 2);
155-
/// assert_eq!(it.next().get(), 4);
154+
/// assert_eq!(it.next().unwrap(), 2);
155+
/// assert_eq!(it.next().unwrap(), 4);
156156
/// assert!(it.next().is_none());
157157
/// ```
158158
#[inline]
@@ -169,7 +169,7 @@ pub trait Iterator<A> {
169169
/// ```rust
170170
/// let a = [1, 2];
171171
/// let mut it = a.iter().filter(|&x| *x > 1);
172-
/// assert_eq!(it.next().get(), &2);
172+
/// assert_eq!(it.next().unwrap(), &2);
173173
/// assert!(it.next().is_none());
174174
/// ```
175175
#[inline]
@@ -186,7 +186,7 @@ pub trait Iterator<A> {
186186
/// ```rust
187187
/// let a = [1, 2];
188188
/// let mut it = a.iter().filter_map(|&x| if x > 1 {Some(2 * x)} else {None});
189-
/// assert_eq!(it.next().get(), 4);
189+
/// assert_eq!(it.next().unwrap(), 4);
190190
/// assert!(it.next().is_none());
191191
/// ```
192192
#[inline]
@@ -202,8 +202,8 @@ pub trait Iterator<A> {
202202
/// ```rust
203203
/// let a = [100, 200];
204204
/// let mut it = a.iter().enumerate();
205-
/// assert_eq!(it.next().get(), (0, &100));
206-
/// assert_eq!(it.next().get(), (1, &200));
205+
/// assert_eq!(it.next().unwrap(), (0, &100));
206+
/// assert_eq!(it.next().unwrap(), (1, &200));
207207
/// assert!(it.next().is_none());
208208
/// ```
209209
#[inline]
@@ -243,9 +243,9 @@ pub trait Iterator<A> {
243243
/// ```rust
244244
/// let a = [1, 2, 3, 2, 1];
245245
/// let mut it = a.iter().skip_while(|&a| *a < 3);
246-
/// assert_eq!(it.next().get(), &3);
247-
/// assert_eq!(it.next().get(), &2);
248-
/// assert_eq!(it.next().get(), &1);
246+
/// assert_eq!(it.next().unwrap(), &3);
247+
/// assert_eq!(it.next().unwrap(), &2);
248+
/// assert_eq!(it.next().unwrap(), &1);
249249
/// assert!(it.next().is_none());
250250
/// ```
251251
#[inline]
@@ -262,8 +262,8 @@ pub trait Iterator<A> {
262262
/// ```rust
263263
/// let a = [1, 2, 3, 2, 1];
264264
/// let mut it = a.iter().take_while(|&a| *a < 3);
265-
/// assert_eq!(it.next().get(), &1);
266-
/// assert_eq!(it.next().get(), &2);
265+
/// assert_eq!(it.next().unwrap(), &1);
266+
/// assert_eq!(it.next().unwrap(), &2);
267267
/// assert!(it.next().is_none());
268268
/// ```
269269
#[inline]
@@ -279,8 +279,8 @@ pub trait Iterator<A> {
279279
/// ```rust
280280
/// let a = [1, 2, 3, 4, 5];
281281
/// let mut it = a.iter().skip(3);
282-
/// assert_eq!(it.next().get(), &4);
283-
/// assert_eq!(it.next().get(), &5);
282+
/// assert_eq!(it.next().unwrap(), &4);
283+
/// assert_eq!(it.next().unwrap(), &5);
284284
/// assert!(it.next().is_none());
285285
/// ```
286286
#[inline]
@@ -296,9 +296,9 @@ pub trait Iterator<A> {
296296
/// ```rust
297297
/// let a = [1, 2, 3, 4, 5];
298298
/// let mut it = a.iter().take(3);
299-
/// assert_eq!(it.next().get(), &1);
300-
/// assert_eq!(it.next().get(), &2);
301-
/// assert_eq!(it.next().get(), &3);
299+
/// assert_eq!(it.next().unwrap(), &1);
300+
/// assert_eq!(it.next().unwrap(), &2);
301+
/// assert_eq!(it.next().unwrap(), &3);
302302
/// assert!(it.next().is_none());
303303
/// ```
304304
#[inline]
@@ -319,11 +319,11 @@ pub trait Iterator<A> {
319319
/// *fac = *fac * x;
320320
/// Some(*fac)
321321
/// });
322-
/// assert_eq!(it.next().get(), 1);
323-
/// assert_eq!(it.next().get(), 2);
324-
/// assert_eq!(it.next().get(), 6);
325-
/// assert_eq!(it.next().get(), 24);
326-
/// assert_eq!(it.next().get(), 120);
322+
/// assert_eq!(it.next().unwrap(), 1);
323+
/// assert_eq!(it.next().unwrap(), 2);
324+
/// assert_eq!(it.next().unwrap(), 6);
325+
/// assert_eq!(it.next().unwrap(), 24);
326+
/// assert_eq!(it.next().unwrap(), 120);
327327
/// assert!(it.next().is_none());
328328
/// ```
329329
#[inline]
@@ -485,7 +485,7 @@ pub trait Iterator<A> {
485485
/// ```rust
486486
/// let a = [1, 2, 3, 4, 5];
487487
/// let mut it = a.iter();
488-
/// assert!(it.nth(2).get() == &3);
488+
/// assert!(it.nth(2).unwrap() == &3);
489489
/// assert!(it.nth(2) == None);
490490
/// ```
491491
#[inline]
@@ -506,7 +506,7 @@ pub trait Iterator<A> {
506506
///
507507
/// ```rust
508508
/// let a = [1, 2, 3, 4, 5];
509-
/// assert!(a.iter().last().get() == &5);
509+
/// assert!(a.iter().last().unwrap() == &5);
510510
/// ```
511511
#[inline]
512512
fn last(&mut self) -> Option<A> {
@@ -865,7 +865,7 @@ pub trait OrdIterator<A> {
865865
///
866866
/// ```rust
867867
/// let a = [1, 2, 3, 4, 5];
868-
/// assert!(a.iter().max().get() == &5);
868+
/// assert!(a.iter().max().unwrap() == &5);
869869
/// ```
870870
fn max(&mut self) -> Option<A>;
871871

@@ -875,7 +875,7 @@ pub trait OrdIterator<A> {
875875
///
876876
/// ```rust
877877
/// let a = [1, 2, 3, 4, 5];
878-
/// assert!(a.iter().min().get() == &1);
878+
/// assert!(a.iter().min().unwrap() == &1);
879879
/// ```
880880
fn min(&mut self) -> Option<A>;
881881
}

0 commit comments

Comments
 (0)