From d5f1f5bc2596f9f6c2726b04189275ac6adc7133 Mon Sep 17 00:00:00 2001 From: djzin Date: Sat, 24 Dec 2016 23:10:00 +0000 Subject: [PATCH] use rangeargument for range_mut --- src/libcollections/btree/map.rs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/libcollections/btree/map.rs b/src/libcollections/btree/map.rs index 544053096fe..87465190a69 100644 --- a/src/libcollections/btree/map.rs +++ b/src/libcollections/btree/map.rs @@ -17,7 +17,7 @@ use core::{fmt, intrinsics, mem, ptr}; use borrow::Borrow; -use Bound::{self, Excluded, Included, Unbounded}; +use Bound::{Excluded, Included, Unbounded}; use range::RangeArgument; use super::node::{self, Handle, NodeRef, marker}; @@ -763,7 +763,7 @@ pub fn range(&self, range: R) -> Range /// let mut map: BTreeMap<&str, i32> = ["Alice", "Bob", "Carol", "Cheryl"].iter() /// .map(|&s| (s, 0)) /// .collect(); - /// for (_, balance) in map.range_mut(Included("B"), Excluded("Cheryl")) { + /// for (_, balance) in map.range_mut((Included("B"), Excluded("Cheryl"))) { /// *balance += 100; /// } /// for (name, balance) in &map { @@ -773,12 +773,11 @@ pub fn range(&self, range: R) -> Range #[unstable(feature = "btree_range", reason = "matches collection reform specification, waiting for dust to settle", issue = "27787")] - pub fn range_mut(&mut self, - min: Bound<&Min>, - max: Bound<&Max>) - -> RangeMut - where K: Borrow + Borrow + pub fn range_mut(&mut self, range: R) -> RangeMut + where T: Ord, K: Borrow, R: RangeArgument { + let min = range.start(); + let max = range.end(); let root1 = self.root.as_mut(); let root2 = unsafe { ptr::read(&root1) }; -- 2.44.0