From 126b71f69099df4ee2b0654f56709ab937eceb2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9F=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2=20=5BArtyom=20Pavlov=5D?= Date: Sun, 18 Nov 2018 21:39:23 +0300 Subject: [PATCH 1/3] revert --- src/libcore/iter/mod.rs | 82 ++++----------------------------------- src/libcore/tests/iter.rs | 7 +--- 2 files changed, 9 insertions(+), 80 deletions(-) diff --git a/src/libcore/iter/mod.rs b/src/libcore/iter/mod.rs index c42fb7019c771..509068843d193 100644 --- a/src/libcore/iter/mod.rs +++ b/src/libcore/iter/mod.rs @@ -319,10 +319,9 @@ use cmp; use fmt; use iter_private::TrustedRandomAccess; -use ops::{self, Try}; +use ops::Try; use usize; use intrinsics; -use mem; #[stable(feature = "rust1", since = "1.0.0")] pub use self::iterator::Iterator; @@ -673,7 +672,12 @@ impl Iterator for StepBy where I: Iterator { #[inline] fn next(&mut self) -> Option { - ::spec_next(self) + if self.first_take { + self.first_take = false; + self.iter.next() + } else { + self.iter.nth(self.step) + } } #[inline] @@ -733,78 +737,6 @@ impl Iterator for StepBy where I: Iterator { } } -// hidden trait for specializing iterator methods -// could be generalized but is currently only used for StepBy -trait StepBySpecIterator { - type Item; - fn spec_next(&mut self) -> Option; -} - -impl StepBySpecIterator for StepBy -where - I: Iterator, -{ - type Item = I::Item; - - #[inline] - default fn spec_next(&mut self) -> Option { - if self.first_take { - self.first_take = false; - self.iter.next() - } else { - self.iter.nth(self.step) - } - } -} - -impl StepBySpecIterator for StepBy> -where - T: Step, -{ - #[inline] - fn spec_next(&mut self) -> Option { - self.first_take = false; - if !(self.iter.start < self.iter.end) { - return None; - } - // add 1 to self.step to get original step size back - // it was decremented for the general case on construction - if let Some(n) = self.iter.start.add_usize(self.step+1) { - let next = mem::replace(&mut self.iter.start, n); - Some(next) - } else { - let last = self.iter.start.clone(); - self.iter.start = self.iter.end.clone(); - Some(last) - } - } -} - -impl StepBySpecIterator for StepBy> -where - T: Step, -{ - #[inline] - fn spec_next(&mut self) -> Option { - self.first_take = false; - self.iter.compute_is_empty(); - if self.iter.is_empty.unwrap_or_default() { - return None; - } - // add 1 to self.step to get original step size back - // it was decremented for the general case on construction - if let Some(n) = self.iter.start.add_usize(self.step+1) { - self.iter.is_empty = Some(!(n <= self.iter.end)); - let next = mem::replace(&mut self.iter.start, n); - Some(next) - } else { - let last = self.iter.start.clone(); - self.iter.is_empty = Some(true); - Some(last) - } - } -} - // StepBy can only make the iterator shorter, so the len will still fit. #[stable(feature = "iterator_step_by", since = "1.28.0")] impl ExactSizeIterator for StepBy where I: ExactSizeIterator {} diff --git a/src/libcore/tests/iter.rs b/src/libcore/tests/iter.rs index 2476c07cbd9ca..fcf7f0cd5d705 100644 --- a/src/libcore/tests/iter.rs +++ b/src/libcore/tests/iter.rs @@ -1619,11 +1619,8 @@ fn test_range_step() { } #[test] -fn test_range_inclusive_step() { - assert_eq!((0..=50).step_by(10).collect::>(), [0, 10, 20, 30, 40, 50]); - assert_eq!((0..=5).step_by(1).collect::>(), [0, 1, 2, 3, 4, 5]); - assert_eq!((200..=255u8).step_by(10).collect::>(), [200, 210, 220, 230, 240, 250]); - assert_eq!((250..=255u8).step_by(1).collect::>(), [250, 251, 252, 253, 254, 255]); +fn test_step_by_skip() { + assert_eq!((0..640).step_by(128).skip(1).collect::>(), [128, 256, 384, 512]); } #[test] From 6ad61b9c3b07e47b225f1c8b155a9a64bd3a926b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9F=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2=20=5BArtyom=20Pavlov=5D?= Date: Sun, 18 Nov 2018 23:14:52 +0300 Subject: [PATCH 2/3] tests --- src/libcore/tests/iter.rs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/libcore/tests/iter.rs b/src/libcore/tests/iter.rs index fcf7f0cd5d705..b9452e65ae3bd 100644 --- a/src/libcore/tests/iter.rs +++ b/src/libcore/tests/iter.rs @@ -1621,6 +1621,16 @@ fn test_range_step() { #[test] fn test_step_by_skip() { assert_eq!((0..640).step_by(128).skip(1).collect::>(), [128, 256, 384, 512]); + assert_eq!((0..=50).step_by(10).nth(3), Some(30)); + assert_eq!((250..=255u8).step_by(10).nth(3), Some(230)); +} + +#[test] +fn test_range_inclusive_step() { + assert_eq!((0..=50).step_by(10).collect::>(), [0, 10, 20, 30, 40, 50]); + assert_eq!((0..=5).step_by(1).collect::>(), [0, 1, 2, 3, 4, 5]); + assert_eq!((200..=255u8).step_by(10).collect::>(), [200, 210, 220, 230, 240, 250]); + assert_eq!((250..=255u8).step_by(1).collect::>(), [250, 251, 252, 253, 254, 255]); } #[test] From 6357021294614deebbcb3a1c9fbb64bb9aaa1a43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9F=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=BE=D0=B2=20=5BArtyom=20Pavlov=5D?= Date: Mon, 19 Nov 2018 01:01:06 +0300 Subject: [PATCH 3/3] fix test --- src/libcore/tests/iter.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcore/tests/iter.rs b/src/libcore/tests/iter.rs index b9452e65ae3bd..ec09071b3d0f0 100644 --- a/src/libcore/tests/iter.rs +++ b/src/libcore/tests/iter.rs @@ -1622,7 +1622,7 @@ fn test_range_step() { fn test_step_by_skip() { assert_eq!((0..640).step_by(128).skip(1).collect::>(), [128, 256, 384, 512]); assert_eq!((0..=50).step_by(10).nth(3), Some(30)); - assert_eq!((250..=255u8).step_by(10).nth(3), Some(230)); + assert_eq!((200..=255u8).step_by(10).nth(3), Some(230)); } #[test]