diff options
| author | bors <bors@rust-lang.org> | 2019-05-19 01:56:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-19 01:56:14 +0000 |
| commit | 26ab32499c0114ae6e01e76374ae06bcd7a973bd (patch) | |
| tree | 7d49276d07c041e3c8958d2d03778be4ec4a46f6 /src/liballoc/tests | |
| parent | 963184bbb670c1ffa97fc28a98cd5e8473118859 (diff) | |
| parent | 9389c694155f4bad4d1aaf5a78ee864155e8ae57 (diff) | |
| download | rust-26ab32499c0114ae6e01e76374ae06bcd7a973bd.tar.gz rust-26ab32499c0114ae6e01e76374ae06bcd7a973bd.zip | |
Auto merge of #60949 - Centril:rollup-f918e1v, r=Centril
Rollup of 8 pull requests Successful merges: - #60370 (Mark core::alloc::Layout::from_size_align_unchecked const) - #60678 (Stabilize vecdeque_rotate) - #60924 (Explain that ? converts the error type using From) - #60931 (Use iter() for iterating arrays by slice) - #60934 (Declare DefIndex with the newtype_index macro) - #60943 (fix copy-paste typo in docs for ptr::read_volatile) - #60945 (Simplify BufRead::fill_buf doc example using NLL) - #60947 (Fix typos in docs of GlobalAlloc) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc/tests')
| -rw-r--r-- | src/liballoc/tests/btree/set.rs | 4 | ||||
| -rw-r--r-- | src/liballoc/tests/lib.rs | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/liballoc/tests/btree/set.rs b/src/liballoc/tests/btree/set.rs index d52814118b3..989beb3b1bf 100644 --- a/src/liballoc/tests/btree/set.rs +++ b/src/liballoc/tests/btree/set.rs @@ -143,8 +143,8 @@ fn test_union() { #[test] // Only tests the simple function definition with respect to intersection fn test_is_disjoint() { - let one = [1].into_iter().collect::<BTreeSet<_>>(); - let two = [2].into_iter().collect::<BTreeSet<_>>(); + let one = [1].iter().collect::<BTreeSet<_>>(); + let two = [2].iter().collect::<BTreeSet<_>>(); assert!(one.is_disjoint(&two)); } diff --git a/src/liballoc/tests/lib.rs b/src/liballoc/tests/lib.rs index b736750c576..ddb3120e89d 100644 --- a/src/liballoc/tests/lib.rs +++ b/src/liballoc/tests/lib.rs @@ -6,7 +6,6 @@ #![feature(repeat_generic_slice)] #![feature(try_reserve)] #![feature(unboxed_closures)] -#![feature(vecdeque_rotate)] #![deny(rust_2018_idioms)] use std::hash::{Hash, Hasher}; |