mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #20500 from globin/fix/range-sugar

Browse Source 
Fix range sugar

Reviewed-by: nick29581
This commit is contained in:
bors 2015-01-04 21:36:39 +00:00
commit 612be77c1f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libcore/iter.rs
View File

@ -2726,10 +2726,10 @@ pub trait Step: Ord {
/// Change self to the previous object.
fn step_back(&mut self);
/// The steps_between two step objects.
/// a should always be less than b, so the result should never be negative.
/// start should always be less than end, so the result should never be negative.
/// Return None if it is not possible to calculate steps_between without
/// overflow.
fn steps_between(a: &Self, b: &Self) -> Option<uint>;
fn steps_between(start: &Self, end: &Self) -> Option<uint>;
}
macro_rules! step_impl {
@ -2741,9 +2741,9 @@ macro_rules! step_impl {
#[inline]
fn step_back(&mut self) { *self -= 1; }
#[inline]
fn steps_between(a: &$t, b: &$t) -> Option<uint> {
debug_assert!(a < b);
Some((*a - *b) as uint)
fn steps_between(start: &$t, end: &$t) -> Option<uint> {
debug_assert!(end >= start);
Some((*end - *start) as uint)
}
}
)*)
@ -2758,7 +2758,7 @@ macro_rules! step_impl_no_between {
#[inline]
fn step_back(&mut self) { *self -= 1; }
#[inline]
fn steps_between(_a: &$t, _b: &$t) -> Option<uint> {
fn steps_between(_start: &$t, _end: &$t) -> Option<uint> {
None
}
}

2
src/libcore/ops.rs
View File

@ -943,7 +943,7 @@ impl<Idx: Clone + Step> Iterator for Range<Idx> {
#[inline]
fn size_hint(&self) -> (uint, Option<uint>) {
if let Some(hint) = Step::steps_between(&self.end, &self.start) {
if let Some(hint) = Step::steps_between(&self.start, &self.end) {
(hint, Some(hint))
} else {
(0, None)