diff options
| author | bors <bors@rust-lang.org> | 2019-06-20 07:46:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-06-20 07:46:11 +0000 |
| commit | 4fb77a0398d0339f35f1b18595b375428babd431 (patch) | |
| tree | 5218a52f0662893cd3f4067c6349629a7205dc5f /src/libcore/tests | |
| parent | 3c805ce183840bd20bd81a54a02b3c8b6dccc9dd (diff) | |
| parent | 942a7fec30e93ca466a30287c8764cfdd8158d9e (diff) | |
| download | rust-4fb77a0398d0339f35f1b18595b375428babd431.tar.gz rust-4fb77a0398d0339f35f1b18595b375428babd431.zip | |
Auto merge of #61983 - Centril:rollup-wnfo07y, r=Centril
Rollup of 4 pull requests
Successful merges:
- #60454 (Add custom nth_back to Skip)
- #60772 (Implement nth_back for slice::{Iter, IterMut})
- #61782 (suggest tuple struct syntax)
- #61968 (rustc: disallow cloning HIR nodes.)
Failed merges:
r? @ghost
Diffstat (limited to 'src/libcore/tests')
| -rw-r--r-- | src/libcore/tests/iter.rs | 34 | ||||
| -rw-r--r-- | src/libcore/tests/slice.rs | 13 |
2 files changed, 47 insertions, 0 deletions
diff --git a/src/libcore/tests/iter.rs b/src/libcore/tests/iter.rs index 020618ae7ae..4d840ef24c8 100644 --- a/src/libcore/tests/iter.rs +++ b/src/libcore/tests/iter.rs @@ -2334,6 +2334,40 @@ fn test_skip_try_folds() { } #[test] +fn test_skip_nth_back() { + let xs = [0, 1, 2, 3, 4, 5]; + let mut it = xs.iter().skip(2); + assert_eq!(it.nth_back(0), Some(&5)); + assert_eq!(it.nth_back(1), Some(&3)); + assert_eq!(it.nth_back(0), Some(&2)); + assert_eq!(it.nth_back(0), None); + + let ys = [2, 3, 4, 5]; + let mut ity = ys.iter(); + let mut it = xs.iter().skip(2); + assert_eq!(it.nth_back(1), ity.nth_back(1)); + assert_eq!(it.clone().nth(0), ity.clone().nth(0)); + assert_eq!(it.nth_back(0), ity.nth_back(0)); + assert_eq!(it.clone().nth(0), ity.clone().nth(0)); + assert_eq!(it.nth_back(0), ity.nth_back(0)); + assert_eq!(it.clone().nth(0), ity.clone().nth(0)); + assert_eq!(it.nth_back(0), ity.nth_back(0)); + assert_eq!(it.clone().nth(0), ity.clone().nth(0)); + + let mut it = xs.iter().skip(2); + assert_eq!(it.nth_back(4), None); + assert_eq!(it.nth_back(0), None); + + let mut it = xs.iter(); + it.by_ref().skip(2).nth_back(3); + assert_eq!(it.next_back(), Some(&1)); + + let mut it = xs.iter(); + it.by_ref().skip(2).nth_back(10); + assert_eq!(it.next_back(), Some(&1)); +} + +#[test] fn test_take_try_folds() { let f = &|acc, x| i32::checked_add(2*acc, x); assert_eq!((10..30).take(10).try_fold(7, f), (10..20).try_fold(7, f)); diff --git a/src/libcore/tests/slice.rs b/src/libcore/tests/slice.rs index eaa799fa96e..03e65d2fe0b 100644 --- a/src/libcore/tests/slice.rs +++ b/src/libcore/tests/slice.rs @@ -89,6 +89,19 @@ fn test_iterator_nth() { } #[test] +fn test_iterator_nth_back() { + let v: &[_] = &[0, 1, 2, 3, 4]; + for i in 0..v.len() { + assert_eq!(v.iter().nth_back(i).unwrap(), &v[v.len() - i - 1]); + } + assert_eq!(v.iter().nth_back(v.len()), None); + + let mut iter = v.iter(); + assert_eq!(iter.nth_back(2).unwrap(), &v[2]); + assert_eq!(iter.nth_back(1).unwrap(), &v[0]); +} + +#[test] fn test_iterator_last() { let v: &[_] = &[0, 1, 2, 3, 4]; assert_eq!(v.iter().last().unwrap(), &4); |
