about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorJosh Stone <jistone@redhat.com>2020-04-16 12:44:57 -0700
committerJosh Stone <jistone@redhat.com>2020-04-16 12:44:57 -0700
commit2edd123a233fff2fbccd17299e0c14d2203e1acc (patch)
tree0a17e3a35ef2901f28cc637693889a057f77910f /src/liballoc
parent7fb5187d0423f4cd0441526571b8cd61927123c9 (diff)
downloadrust-2edd123a233fff2fbccd17299e0c14d2203e1acc.tar.gz
rust-2edd123a233fff2fbccd17299e0c14d2203e1acc.zip
Dogfood or_patterns in the standard library
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/collections/btree/map.rs7
-rw-r--r--src/liballoc/lib.rs1
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)]