Skip to content

Commit fccd6bb

Browse files
committed
---
yaml --- r: 80796 b: refs/heads/try c: 66c2965 h: refs/heads/master v: v3
1 parent fa9b277 commit fccd6bb

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cbd1eefbd350797b783df119fed7956d7e1c74ad
5-
refs/heads/try: bf7587f5510d146c1f8bce4cb1ec10379d5b7d78
5+
refs/heads/try: 66c2965b046029bec04b3f2c73e6619c15784145
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libstd/iter.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1829,11 +1829,11 @@ impl<A: Sub<A, A> + Integer + Ord + Clone> DoubleEndedIterator<A> for RangeInclu
18291829
let result = self.range.stop.clone();
18301830
self.range.stop = self.range.stop - self.range.one;
18311831
Some(result)
1832-
} else if self.done {
1833-
None
1834-
} else {
1832+
} else if !self.done && self.range.state == self.range.stop {
18351833
self.done = true;
18361834
Some(self.range.stop.clone())
1835+
} else {
1836+
None
18371837
}
18381838
}
18391839
}
@@ -2713,7 +2713,9 @@ mod tests {
27132713
assert_eq!(range_inclusive(0i, 5).collect::<~[int]>(), ~[0i, 1, 2, 3, 4, 5]);
27142714
assert_eq!(range_inclusive(0i, 5).invert().collect::<~[int]>(), ~[5i, 4, 3, 2, 1, 0]);
27152715
assert_eq!(range_inclusive(200, -5).collect::<~[int]>(), ~[]);
2716+
assert_eq!(range_inclusive(200, -5).invert().collect::<~[int]>(), ~[]);
27162717
assert_eq!(range_inclusive(200, 200).collect::<~[int]>(), ~[200]);
2718+
assert_eq!(range_inclusive(200, 200).invert().collect::<~[int]>(), ~[200]);
27172719
}
27182720

27192721
#[test]

0 commit comments

Comments
 (0)