about summary refs log tree commit diff
path: root/src/liballoc/btree
diff options
context:
space:
mode:
authorCory Sherman <coryshrmn@gmail.com>2018-05-24 04:39:35 -0700
committerCory Sherman <coryshrmn@gmail.com>2018-05-24 05:01:40 -0700
commit1440f300d848610b0cb798a735e2c75a94998aa9 (patch)
tree02c294e0de1006f3fd964f9e68d427ee400b324f /src/liballoc/btree
parentb4463d788bfd30b622a87a0e6f8e9271b9102e50 (diff)
downloadrust-1440f300d848610b0cb798a735e2c75a94998aa9.tar.gz
rust-1440f300d848610b0cb798a735e2c75a94998aa9.zip
stabilize RangeBounds collections_range #30877
rename RangeBounds::start() -> start_bound()
rename RangeBounds::end() -> end_bound()
Diffstat (limited to 'src/liballoc/btree')
-rw-r--r--src/liballoc/btree/map.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/liballoc/btree/map.rs b/src/liballoc/btree/map.rs
index bb2c68a27ba..28c42144b2a 100644
--- a/src/liballoc/btree/map.rs
+++ b/src/liballoc/btree/map.rs
@@ -1834,7 +1834,7 @@ fn range_search<BorrowType, K, V, Q: ?Sized, R: RangeBounds<Q>>(
      Handle<NodeRef<BorrowType, K, V, marker::Leaf>, marker::Edge>)
         where Q: Ord, K: Borrow<Q>
 {
-    match (range.start(), range.end()) {
+    match (range.start_bound(), range.end_bound()) {
         (Excluded(s), Excluded(e)) if s==e =>
             panic!("range start and end are equal and excluded in BTreeMap"),
         (Included(s), Included(e)) |
@@ -1852,7 +1852,7 @@ fn range_search<BorrowType, K, V, Q: ?Sized, R: RangeBounds<Q>>(
     let mut diverged = false;
 
     loop {
-        let min_edge = match (min_found, range.start()) {
+        let min_edge = match (min_found, range.start_bound()) {
             (false, Included(key)) => match search::search_linear(&min_node, key) {
                 (i, true) => { min_found = true; i },
                 (i, false) => i,
@@ -1866,7 +1866,7 @@ fn range_search<BorrowType, K, V, Q: ?Sized, R: RangeBounds<Q>>(
             (true, Excluded(_)) => 0,
         };
 
-        let max_edge = match (max_found, range.end()) {
+        let max_edge = match (max_found, range.end_bound()) {
             (false, Included(key)) => match search::search_linear(&max_node, key) {
                 (i, true) => { max_found = true; i+1 },
                 (i, false) => i,