diff options
| author | Giacomo Stevanato <giaco.stevanato@gmail.com> | 2021-02-01 17:16:54 +0100 |
|---|---|---|
| committer | Giacomo Stevanato <giaco.stevanato@gmail.com> | 2021-02-01 17:16:54 +0100 |
| commit | c6c8f3bf12bdeba01ba16eaacc5808e5321302f8 (patch) | |
| tree | 868e85a5182fe739852bed88b749153090b76e2f | |
| parent | 524b0c9c614d4691b2e21ace47fce4df15900701 (diff) | |
| download | rust-c6c8f3bf12bdeba01ba16eaacc5808e5321302f8.tar.gz rust-c6c8f3bf12bdeba01ba16eaacc5808e5321302f8.zip | |
Move test
| -rw-r--r-- | library/alloc/tests/vec.rs | 4 | ||||
| -rw-r--r-- | library/core/tests/iter/mod.rs | 26 |
2 files changed, 2 insertions, 28 deletions
diff --git a/library/alloc/tests/vec.rs b/library/alloc/tests/vec.rs index e19406d7a06..9ae333ce2c3 100644 --- a/library/alloc/tests/vec.rs +++ b/library/alloc/tests/vec.rs @@ -931,9 +931,9 @@ fn test_from_iter_specialization_with_iterator_adapters() { .map_while(Option::Some) .peekable() .skip(1) - .map(|e| std::num::NonZeroUsize::new(e)); + .map(|e| if e != 0 { Ok(e) } else { Err(()) }); assert_in_place_trait(&iter); - let sink = iter.collect::<Vec<_>>(); + let sink = iter.collect::<Result<Vec<_>, _>>().unwrap(); let sinkptr = sink.as_ptr(); assert_eq!(srcptr, sinkptr as *const usize); } diff --git a/library/core/tests/iter/mod.rs b/library/core/tests/iter/mod.rs index b88f2f2089d..770b6f7601f 100644 --- a/library/core/tests/iter/mod.rs +++ b/library/core/tests/iter/mod.rs @@ -100,29 +100,3 @@ pub fn extend_for_unit() { } assert_eq!(x, 5); } - -#[test] -pub fn inplace_result_collect() { - let src = vec![0usize; 256]; - let srcptr = src.as_ptr(); - let sink = src.into_iter().map(|i| Ok(i)).collect::<Result<Vec<_>, ()>>().unwrap(); - let sinkptr = sink.as_ptr(); - assert_eq!(srcptr, sinkptr); - - let src: Vec<usize> = vec![0usize; 256]; - let srcptr = src.as_ptr(); - let iter = src - .into_iter() - .enumerate() - .map(|i| i.0 + i.1) - .zip(std::iter::repeat(1usize)) - .map(|(a, b)| a + b) - .map_while(Option::Some) - .peekable() - .skip(1) - .map(|e| std::num::NonZeroUsize::new(e)) - .map(|z| z.map(|u| u.get()).ok_or(())); - let sink = iter.collect::<Result<Vec<_>, _>>().unwrap(); - let sinkptr = sink.as_ptr(); - assert_eq!(srcptr, sinkptr as *const usize); -} |
