diff --git a/src/btreemap.rs b/src/btreemap.rs index 19ad8780..4c853ce2 100644 --- a/src/btreemap.rs +++ b/src/btreemap.rs @@ -698,14 +698,7 @@ where } /// Removes all elements from the map. - #[deprecated(since = "0.6.3", note = "please use `clear_new` instead")] - pub fn clear(self) -> Self { - let mem = self.allocator.into_memory(); - Self::new(mem) - } - - /// Removes all elements from the map. - pub fn clear_new(&mut self) { + pub fn clear(&mut self) { self.root_addr = NULL; self.length = 0; self.allocator.clear(); @@ -3221,7 +3214,7 @@ mod test { } #[test] - fn test_clear_new_bounded_type() { + fn test_clear_bounded_type() { let mem = make_memory(); let mut btree: BTreeMap, Blob<4>, _> = BTreeMap::new(mem.clone()); @@ -3234,7 +3227,7 @@ mod test { assert_ne!(btree.allocator.num_allocated_chunks(), 0); assert_ne!(btree.root_addr, NULL); - btree.clear_new(); + btree.clear(); let header_actual = BTreeMap::, Blob<4>, _>::read_header(&mem); @@ -3246,7 +3239,7 @@ mod test { } #[test] - fn test_clear_new_unbounded_type() { + fn test_clear_unbounded_type() { let mem = make_memory(); let mut btree: BTreeMap = BTreeMap::new(mem.clone()); btree.insert("asd".into(), "bce".into()); @@ -3255,7 +3248,7 @@ mod test { assert_ne!(btree.allocator.num_allocated_chunks(), 0); assert_ne!(btree.root_addr, NULL); - btree.clear_new(); + btree.clear(); let header_actual = BTreeMap::::read_header(&mem); diff --git a/src/btreeset.rs b/src/btreeset.rs index d4853b15..36cdbd80 100644 --- a/src/btreeset.rs +++ b/src/btreeset.rs @@ -353,7 +353,7 @@ where /// assert!(set.is_empty()); /// ``` pub fn clear(&mut self) { - self.map.clear_new(); + self.map.clear(); } /// Returns the first key in the set. This key diff --git a/tests/api_conformance.rs b/tests/api_conformance.rs index 3f81394c..5e9a4e4b 100644 --- a/tests/api_conformance.rs +++ b/tests/api_conformance.rs @@ -42,8 +42,7 @@ fn api_conformance_btreemap() { assert_eq!(stable.is_empty(), std.is_empty()); // Clear. - // Note: stable uses clear_new(); std uses clear(). - stable.clear_new(); + stable.clear(); std.clear(); assert_eq!(stable.len(), std.len() as u64); assert_eq!(stable.is_empty(), std.is_empty());