Skip to content

Commit fb267a2

Browse files
borsbors
committed
---
yaml --- r: 64785 b: refs/heads/snap-stage3 c: 82b29ae h: refs/heads/master i: 64783: f0d577c v: v3
1 parent 01c0903 commit fb267a2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+2241
-1174
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 34a27db8bf90d9cc3727a1c6654eccdc7018eb29
4+
refs/heads/snap-stage3: 82b29ae5a583366d30e8052cab390fce031ab708
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

‎branches/snap-stage3/doc/rust.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1494,7 +1494,7 @@ mod m1 {
14941494
This example shows how one can use `allow` and `warn` to toggle
14951495
a particular check on and off.
14961496

1497-
~~~
1497+
~~~{.xfail-test}
14981498
#[warn(missing_doc)]
14991499
mod m2{
15001500
#[allow(missing_doc)]

‎branches/snap-stage3/doc/tutorial.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,6 +1154,7 @@ let mut x = 5;
11541154
let y = &x; // x is now frozen, it cannot be modified
11551155
}
11561156
// x is now unfrozen again
1157+
# x = 3;
11571158
~~~~
11581159
11591160
Mutable managed boxes handle freezing dynamically when any of their contents

‎branches/snap-stage3/mk/target.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(3)): \
8484
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)): CFG_COMPILER_TRIPLE = $(2)
8585
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)): \
8686
$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
87+
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
8788
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(3)) \
8889
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(3)) \
8990
| $$(TLIB$(1)_T_$(2)_H_$(3))/
@@ -94,6 +95,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)): \
9495

9596
$$(TBIN$(1)_T_$(2)_H_$(3))/rustc$$(X_$(3)): \
9697
$$(DRIVER_CRATE) \
98+
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
9799
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)) \
98100
| $$(TBIN$(1)_T_$(2)_H_$(3))/
99101
@$$(call E, compile_and_link: $$@)

‎branches/snap-stage3/mk/tests.mk

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,50 +319,58 @@ endif
319319

320320
$(3)/stage$(1)/test/stdtest-$(2)$$(X_$(2)): \
321321
$$(STDLIB_CRATE) $$(STDLIB_INPUTS) \
322+
$$(SREQ$(1)_T_$(2)_H_$(3)) \
322323
$$(STDTESTDEP_$(1)_$(2)_$(3))
323324
@$$(call E, compile_and_link: $$@)
324325
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
325326

326327
$(3)/stage$(1)/test/extratest-$(2)$$(X_$(2)): \
327328
$$(EXTRALIB_CRATE) $$(EXTRALIB_INPUTS) \
329+
$$(SREQ$(1)_T_$(2)_H_$(3)) \
328330
$$(STDTESTDEP_$(1)_$(2)_$(3))
329331
@$$(call E, compile_and_link: $$@)
330332
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
331333

332334
$(3)/stage$(1)/test/syntaxtest-$(2)$$(X_$(2)): \
333335
$$(LIBSYNTAX_CRATE) $$(LIBSYNTAX_INPUTS) \
336+
$$(SREQ$(1)_T_$(2)_H_$(3)) \
334337
$$(STDTESTDEP_$(1)_$(2)_$(3))
335338
@$$(call E, compile_and_link: $$@)
336339
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
337340

338341
$(3)/stage$(1)/test/rustctest-$(2)$$(X_$(2)): CFG_COMPILER_TRIPLE = $(2)
339342
$(3)/stage$(1)/test/rustctest-$(2)$$(X_$(2)): \
340343
$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
344+
$$(SREQ$(1)_T_$(2)_H_$(3)) \
341345
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUSTLLVM_$(2)) \
342346
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX_$(2))
343347
@$$(call E, compile_and_link: $$@)
344348
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
345349

346350
$(3)/stage$(1)/test/rustpkgtest-$(2)$$(X_$(2)): \
347351
$$(RUSTPKG_LIB) $$(RUSTPKG_INPUTS) \
352+
$$(SREQ$(1)_T_$(2)_H_$(3)) \
348353
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
349354
@$$(call E, compile_and_link: $$@)
350355
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
351356

352357
$(3)/stage$(1)/test/rustitest-$(2)$$(X_$(2)): \
353358
$$(RUSTI_LIB) $$(RUSTI_INPUTS) \
359+
$$(SREQ$(1)_T_$(2)_H_$(3)) \
354360
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
355361
@$$(call E, compile_and_link: $$@)
356362
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
357363

358364
$(3)/stage$(1)/test/rusttest-$(2)$$(X_$(2)): \
359365
$$(RUST_LIB) $$(RUST_INPUTS) \
366+
$$(SREQ$(1)_T_$(2)_H_$(3)) \
360367
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
361368
@$$(call E, compile_and_link: $$@)
362369
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
363370

364371
$(3)/stage$(1)/test/rustdoctest-$(2)$$(X_$(2)): \
365372
$$(RUSTDOC_LIB) $$(RUSTDOC_INPUTS) \
373+
$$(SREQ$(1)_T_$(2)_H_$(3)) \
366374
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
367375
@$$(call E, compile_and_link: $$@)
368376
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test

‎branches/snap-stage3/mk/tools.mk

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,14 @@ define TOOLS_STAGE_N_TARGET
3737

3838
$$(TBIN$(1)_T_$(4)_H_$(3))/compiletest$$(X_$(4)): \
3939
$$(COMPILETEST_CRATE) $$(COMPILETEST_INPUTS) \
40-
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
41-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_STDLIB_$(4)) \
42-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_EXTRALIB_$(4)) \
40+
$$(SREQ$(1)_T_$(4)_H_$(3)) \
4341
| $$(TBIN$(1)_T_$(4)_H_$(3))/
4442
@$$(call E, compile_and_link: $$@)
4543
$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$<
4644

4745
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTPKG_$(4)): \
4846
$$(RUSTPKG_LIB) $$(RUSTPKG_INPUTS) \
49-
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
50-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_STDLIB_$(4)) \
51-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_EXTRALIB_$(4)) \
47+
$$(SREQ$(1)_T_$(4)_H_$(3)) \
5248
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTC_$(4)) \
5349
| $$(TLIB$(1)_T_$(4)_H_$(3))/
5450
@$$(call E, compile_and_link: $$@)
@@ -58,16 +54,15 @@ $$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTPKG_$(4)): \
5854

5955
$$(TBIN$(1)_T_$(4)_H_$(3))/rustpkg$$(X_$(4)): \
6056
$$(DRIVER_CRATE) \
61-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTPKG_$(4)) \
57+
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
58+
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTPKG_$(4)) \
6259
| $$(TBIN$(1)_T_$(4)_H_$(3))/
6360
@$$(call E, compile_and_link: $$@)
6461
$$(STAGE$(1)_T_$(4)_H_$(3)) --cfg rustpkg -o $$@ $$<
6562

6663
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTDOC_$(4)): \
6764
$$(RUSTDOC_LIB) $$(RUSTDOC_INPUTS) \
68-
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
69-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_STDLIB_$(4)) \
70-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_EXTRALIB_$(4)) \
65+
$$(SREQ$(1)_T_$(4)_H_$(3)) \
7166
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTC_$(4)) \
7267
| $$(TLIB$(1)_T_$(4)_H_$(3))/
7368
@$$(call E, compile_and_link: $$@)
@@ -77,16 +72,15 @@ $$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTDOC_$(4)): \
7772

7873
$$(TBIN$(1)_T_$(4)_H_$(3))/rustdoc$$(X_$(4)): \
7974
$$(DRIVER_CRATE) \
75+
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
8076
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTDOC_$(4)) \
8177
| $$(TBIN$(1)_T_$(4)_H_$(3))/
8278
@$$(call E, compile_and_link: $$@)
8379
$$(STAGE$(1)_T_$(4)_H_$(3)) --cfg rustdoc -o $$@ $$<
8480

8581
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTI_$(4)): \
8682
$$(RUSTI_LIB) $$(RUSTI_INPUTS) \
87-
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
88-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_STDLIB_$(4)) \
89-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_EXTRALIB_$(4)) \
83+
$$(SREQ$(1)_T_$(4)_H_$(3)) \
9084
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTC_$(4)) \
9185
| $$(TLIB$(1)_T_$(4)_H_$(3))/
9286
@$$(call E, compile_and_link: $$@)
@@ -96,16 +90,15 @@ $$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTI_$(4)): \
9690

9791
$$(TBIN$(1)_T_$(4)_H_$(3))/rusti$$(X_$(4)): \
9892
$$(DRIVER_CRATE) \
93+
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
9994
$$(TLIB$(1)_T_$(4)_H_$(4))/$(CFG_LIBRUSTI_$(4)) \
10095
| $$(TBIN$(1)_T_$(4)_H_$(3))/
10196
@$$(call E, compile_and_link: $$@)
10297
$$(STAGE$(1)_T_$(4)_H_$(3)) --cfg rusti -o $$@ $$<
10398

10499
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUST_$(4)): \
105100
$$(RUST_LIB) $$(RUST_INPUTS) \
106-
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
107-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_STDLIB_$(4)) \
108-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_EXTRALIB_$(4)) \
101+
$$(SREQ$(1)_T_$(4)_H_$(3)) \
109102
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTPKG_$(4)) \
110103
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTI_$(4)) \
111104
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTDOC_$(4)) \
@@ -118,6 +111,7 @@ $$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUST_$(4)): \
118111

119112
$$(TBIN$(1)_T_$(4)_H_$(3))/rust$$(X_$(4)): \
120113
$$(DRIVER_CRATE) \
114+
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
121115
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUST_$(4)) \
122116
| $$(TBIN$(1)_T_$(4)_H_$(3))/
123117
@$$(call E, compile_and_link: $$@)

‎branches/snap-stage3/src/compiletest/runtest.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ fn make_out_name(config: &config, testfile: &Path, extension: &str) -> Path {
681681
}
682682

683683
fn aux_output_dir_name(config: &config, testfile: &Path) -> Path {
684-
output_base_name(config, testfile).with_filetype("libaux")
684+
Path(output_base_name(config, testfile).to_str() + ".libaux")
685685
}
686686

687687
fn output_testname(testfile: &Path) -> Path {

‎branches/snap-stage3/src/etc/extract-tests.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,10 @@
5959
block = "fn main() {\n" + block + "\n}\n"
6060
if not re.search(r"\bextern mod extra\b", block):
6161
block = "extern mod extra;\n" + block
62-
block = """#[ forbid(ctypes) ];
63-
#[ forbid(path_statement) ];
64-
#[ forbid(type_limits) ];
65-
#[ forbid(unrecognized_lint) ];
66-
#[ forbid(unused_imports) ];
67-
#[ forbid(while_true) ];
68-
69-
#[ warn(non_camel_case_types) ];\n
62+
block = """#[ deny(warnings) ];
63+
#[ allow(unused_variable) ];\n
64+
#[ allow(dead_assignment) ];\n
65+
#[ allow(unused_mut) ];\n
7066
""" + block
7167
if xfail:
7268
block = "// xfail-test\n" + block

‎branches/snap-stage3/src/libextra/bitv.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -703,8 +703,8 @@ impl cmp::Eq for BitvSet {
703703
}
704704

705705
impl Container for BitvSet {
706+
#[inline]
706707
fn len(&self) -> uint { self.size }
707-
fn is_empty(&self) -> bool { self.size == 0 }
708708
}
709709

710710
impl Mutable for BitvSet {

‎branches/snap-stage3/src/libextra/dlist.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ impl<T> DList<T> {
356356

357357
/// Provide a reverse iterator
358358
#[inline]
359-
pub fn rev_iter<'a>(&'a self) -> InvertIterator<&'a T, DListIterator<'a, T>> {
359+
pub fn rev_iter<'a>(&'a self) -> InvertIterator<DListIterator<'a, T>> {
360360
self.iter().invert()
361361
}
362362

@@ -376,8 +376,7 @@ impl<T> DList<T> {
376376
}
377377
/// Provide a reverse iterator with mutable references
378378
#[inline]
379-
pub fn mut_rev_iter<'a>(&'a mut self) -> InvertIterator<&'a mut T,
380-
MutDListIterator<'a, T>> {
379+
pub fn mut_rev_iter<'a>(&'a mut self) -> InvertIterator<MutDListIterator<'a, T>> {
381380
self.mut_iter().invert()
382381
}
383382

@@ -390,7 +389,7 @@ impl<T> DList<T> {
390389

391390
/// Consume the list into an iterator yielding elements by value, in reverse
392391
#[inline]
393-
pub fn consume_rev_iter(self) -> InvertIterator<T, ConsumeIterator<T>> {
392+
pub fn consume_rev_iter(self) -> InvertIterator<ConsumeIterator<T>> {
394393
self.consume_iter().invert()
395394
}
396395
}

‎branches/snap-stage3/src/libextra/priority_queue.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ pub struct PriorityQueue<T> {
2727
impl<T:Ord> Container for PriorityQueue<T> {
2828
/// Returns the length of the queue
2929
fn len(&self) -> uint { self.data.len() }
30-
31-
/// Returns true if a queue contains no elements
32-
fn is_empty(&self) -> bool { self.len() == 0 }
3330
}
3431

3532
impl<T:Ord> Mutable for PriorityQueue<T> {

‎branches/snap-stage3/src/libextra/ringbuf.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ pub struct RingBuf<T> {
3434
impl<T> Container for RingBuf<T> {
3535
/// Return the number of elements in the RingBuf
3636
fn len(&self) -> uint { self.nelts }
37-
38-
/// Return true if the RingBufcontains no elements
39-
fn is_empty(&self) -> bool { self.len() == 0 }
4037
}
4138

4239
impl<T> Mutable for RingBuf<T> {
@@ -184,7 +181,7 @@ impl<T> RingBuf<T> {
184181
}
185182

186183
/// Back-to-front iterator.
187-
pub fn rev_iter<'a>(&'a self) -> InvertIterator<&'a T, RingBufIterator<'a, T>> {
184+
pub fn rev_iter<'a>(&'a self) -> InvertIterator<RingBufIterator<'a, T>> {
188185
self.iter().invert()
189186
}
190187

@@ -195,7 +192,7 @@ impl<T> RingBuf<T> {
195192
}
196193

197194
/// Back-to-front iterator which returns mutable values.
198-
pub fn mut_rev_iter<'a>(&'a mut self) -> InvertIterator<&'a mut T, RingBufMutIterator<'a, T>> {
195+
pub fn mut_rev_iter<'a>(&'a mut self) -> InvertIterator<RingBufMutIterator<'a, T>> {
199196
self.mut_iter().invert()
200197
}
201198
}

‎branches/snap-stage3/src/libextra/smallintmap.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ impl<V> Container for SmallIntMap<V> {
3737
}
3838
sz
3939
}
40-
41-
/// Return true if the map contains no elements
42-
fn is_empty(&self) -> bool { self.len() == 0 }
4340
}
4441

4542
impl<V> Mutable for SmallIntMap<V> {
@@ -207,7 +204,7 @@ impl<V> SmallIntMap<V> {
207204
/// Empties the hash map, moving all values into the specified closure
208205
pub fn consume(&mut self)
209206
-> FilterMapIterator<(uint, Option<V>), (uint, V),
210-
EnumerateIterator<Option<V>, VecConsumeIterator<Option<V>>>>
207+
EnumerateIterator<VecConsumeIterator<Option<V>>>>
211208
{
212209
let values = replace(&mut self.v, ~[]);
213210
values.consume_iter().enumerate().filter_map(|(i, v)| {
@@ -293,8 +290,7 @@ pub struct SmallIntMapIterator<'self, T> {
293290

294291
iterator!(impl SmallIntMapIterator -> (uint, &'self T), get_ref)
295292
double_ended_iterator!(impl SmallIntMapIterator -> (uint, &'self T), get_ref)
296-
pub type SmallIntMapRevIterator<'self, T> = InvertIterator<(uint, &'self T),
297-
SmallIntMapIterator<'self, T>>;
293+
pub type SmallIntMapRevIterator<'self, T> = InvertIterator<SmallIntMapIterator<'self, T>>;
298294

299295
pub struct SmallIntMapMutIterator<'self, T> {
300296
priv front: uint,
@@ -304,8 +300,7 @@ pub struct SmallIntMapMutIterator<'self, T> {
304300

305301
iterator!(impl SmallIntMapMutIterator -> (uint, &'self mut T), get_mut_ref)
306302
double_ended_iterator!(impl SmallIntMapMutIterator -> (uint, &'self mut T), get_mut_ref)
307-
pub type SmallIntMapMutRevIterator<'self, T> = InvertIterator<(uint, &'self mut T),
308-
SmallIntMapMutIterator<'self, T>>;
303+
pub type SmallIntMapMutRevIterator<'self, T> = InvertIterator<SmallIntMapMutIterator<'self, T>>;
309304

310305
#[cfg(test)]
311306
mod test_map {

‎branches/snap-stage3/src/libextra/treemap.rs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -135,19 +135,6 @@ impl<K: TotalOrd, V> MutableMap<K, V> for TreeMap<K, V> {
135135
find_mut(&mut self.root, key)
136136
}
137137

138-
/// Insert a key-value pair into the map. An existing value for a
139-
/// key is replaced by the new value. Return true if the key did
140-
/// not already exist in the map.
141-
fn insert(&mut self, key: K, value: V) -> bool {
142-
self.swap(key, value).is_none()
143-
}
144-
145-
/// Remove a key-value pair from the map. Return true if the key
146-
/// was present in the map, otherwise false.
147-
fn remove(&mut self, key: &K) -> bool {
148-
self.pop(key).is_some()
149-
}
150-
151138
/// Insert a key-value pair from the map. If the key already had a value
152139
/// present in the map, that value is returned. Otherwise None is returned.
153140
fn swap(&mut self, key: K, value: V) -> Option<V> {

0 commit comments

Comments
 (0)