diff options
| author | bors <bors@rust-lang.org> | 2020-04-17 04:15:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-17 04:15:18 +0000 |
| commit | 861996e13820a2e401df60756a373606b50948e5 (patch) | |
| tree | 7b70bbcac40629669a01366657b05d910289c77b /src/liballoc | |
| parent | 318726b301db2a0718d05f166d3d6c578273189c (diff) | |
| parent | 65243a8f7c03425c399d990d0802e4506bbcd754 (diff) | |
| download | rust-861996e13820a2e401df60756a373606b50948e5.tar.gz rust-861996e13820a2e401df60756a373606b50948e5.zip | |
Auto merge of #71230 - Dylan-DPC:rollup-rofigbv, r=Dylan-DPC
Rollup of 7 pull requests Successful merges: - #70578 (Add long error explanation for E0657) - #70910 (Hides default fns inside Fuse impl to avoid exposing it to any crate) - #71164 (reword Miri validity errors: undefined -> uninitialized) - #71182 (Add some regression tests) - #71206 (Miri error messages: avoid try terminology) - #71220 (Dogfood or_patterns in the standard library) - #71225 (Fix typo in Default trait docs: Provides -> Provide) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/collections/btree/map.rs | 7 | ||||
| -rw-r--r-- | src/liballoc/lib.rs | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/liballoc/collections/btree/map.rs b/src/liballoc/collections/btree/map.rs index 3fc1b5e16b3..38196b2d4b4 100644 --- a/src/liballoc/collections/btree/map.rs +++ b/src/liballoc/collections/btree/map.rs @@ -2058,12 +2058,7 @@ where (Excluded(s), Excluded(e)) if s == e => { panic!("range start and end are equal and excluded in BTreeMap") } - (Included(s), Included(e)) - | (Included(s), Excluded(e)) - | (Excluded(s), Included(e)) - | (Excluded(s), Excluded(e)) - if s > e => - { + (Included(s) | Excluded(s), Included(e) | Excluded(e)) if s > e => { panic!("range start is greater than range end in BTreeMap") } _ => {} diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index 121c1cde548..a2071844d5d 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -103,6 +103,7 @@ #![feature(new_uninit)] #![feature(nll)] #![feature(optin_builtin_traits)] +#![feature(or_patterns)] #![feature(pattern)] #![feature(ptr_internals)] #![feature(ptr_offset_from)] |
