about summary refs log tree commit diff
path: root/src/liballoc/btree
diff options
context:
space:
mode:
authorSteven Fackler <sfackler@gmail.com>2017-06-18 22:01:29 -0700
committerSteven Fackler <sfackler@gmail.com>2017-06-24 19:20:57 -0700
commit143206d54d7558c2326212df99efc98110904fdb (patch)
tree8c444d9522f0500f9c3a3217c7e227aa4aaf8916 /src/liballoc/btree
parentdc411e307ac76af0fd2128da5ea12562c84a48c6 (diff)
downloadrust-143206d54d7558c2326212df99efc98110904fdb.tar.gz
rust-143206d54d7558c2326212df99efc98110904fdb.zip
Stabilize RangeArgument
Move it and Bound to core::ops while we're at it.

Closes #30877
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, 3 insertions, 5 deletions
diff --git a/src/liballoc/btree/map.rs b/src/liballoc/btree/map.rs
index a51c70159db..5243fb6ae0e 100644
--- a/src/liballoc/btree/map.rs
+++ b/src/liballoc/btree/map.rs
@@ -13,12 +13,11 @@ use core::fmt::Debug;
 use core::hash::{Hash, Hasher};
 use core::iter::{FromIterator, Peekable, FusedIterator};
 use core::marker::PhantomData;
-use core::ops::Index;
+use core::ops::{Index, RangeArgument};
+use core::ops::Bound::{Excluded, Included, Unbounded};
 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 d32460da939..c755d2d8b85 100644
--- a/src/liballoc/btree/set.rs
+++ b/src/liballoc/btree/set.rs
@@ -16,12 +16,11 @@ 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};
+use core::ops::{BitOr, BitAnd, BitXor, Sub, RangeArgument};
 
 use borrow::Borrow;
 use btree_map::{BTreeMap, Keys};
 use super::Recover;
-use range::RangeArgument;
 
 // FIXME(conventions): implement bounded iterators