about summary refs log tree commit diff
path: root/src/liballoc/btree
diff options
context:
space:
mode:
authorSteven Fackler <sfackler@gmail.com>2017-06-30 08:34:53 -1000
committerSteven Fackler <sfackler@gmail.com>2017-06-30 08:34:53 -1000
commit0a9c13624d2fede5c6ce8e5aa7f486403098bde6 (patch)
tree0eab912d432fe03866fdaf362710bd7bf0752703 /src/liballoc/btree
parente72580cf091190c6258648e4cfbca083f20ece3d (diff)
downloadrust-0a9c13624d2fede5c6ce8e5aa7f486403098bde6.tar.gz
rust-0a9c13624d2fede5c6ce8e5aa7f486403098bde6.zip
Revert "Stabilize RangeArgument"
This reverts commit 143206d54d7558c2326212df99efc98110904fdb.
Diffstat (limited to 'src/liballoc/btree')
-rw-r--r--src/liballoc/btree/map.rs5
-rw-r--r--src/liballoc/btree/set.rs3
2 files changed, 5 insertions, 3 deletions
diff --git a/src/liballoc/btree/map.rs b/src/liballoc/btree/map.rs
index 5243fb6ae0e..a51c70159db 100644
--- a/src/liballoc/btree/map.rs
+++ b/src/liballoc/btree/map.rs
@@ -13,11 +13,12 @@ use core::fmt::Debug;
 use core::hash::{Hash, Hasher};
 use core::iter::{FromIterator, Peekable, FusedIterator};
 use core::marker::PhantomData;
-use core::ops::{Index, RangeArgument};
-use core::ops::Bound::{Excluded, Included, Unbounded};
+use core::ops::Index;
 use core::{fmt, intrinsics, mem, ptr};
 
 use borrow::Borrow;
+use Bound::{Excluded, Included, Unbounded};
+use range::RangeArgument;
 
 use super::node::{self, Handle, NodeRef, marker};
 use super::search;
diff --git a/src/liballoc/btree/set.rs b/src/liballoc/btree/set.rs
index c755d2d8b85..d32460da939 100644
--- a/src/liballoc/btree/set.rs
+++ b/src/liballoc/btree/set.rs
@@ -16,11 +16,12 @@ use core::cmp::{min, max};
 use core::fmt::Debug;
 use core::fmt;
 use core::iter::{Peekable, FromIterator, FusedIterator};
-use core::ops::{BitOr, BitAnd, BitXor, Sub, RangeArgument};
+use core::ops::{BitOr, BitAnd, BitXor, Sub};
 
 use borrow::Borrow;
 use btree_map::{BTreeMap, Keys};
 use super::Recover;
+use range::RangeArgument;
 
 // FIXME(conventions): implement bounded iterators