Skip to content

Commit 5ca98b1

Browse files
committed
---
yaml --- r: 20797 b: refs/heads/snap-stage3 c: 6fdd1ef h: refs/heads/master i: 20795: 332db94 v: v3
1 parent 3504fc1 commit 5ca98b1

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
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: e430a699f2c60890d9b86069fd0c68a70ece7120
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 0c3158b3a57129e8fb2a71ae0d0fceb985fc2098
4+
refs/heads/snap-stage3: 6fdd1ef9b18039eb29d8c8ba322883a565e94e43
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libcore/send_map.rs

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ mod linear {
229229
self.insert_bucket(bucket);
230230
idx = self.next_bucket(idx, len_buckets);
231231
}
232+
self.size -= 1;
232233
ret true;
233234
}
234235
}
@@ -240,10 +241,14 @@ mod linear {
240241
}
241242

242243
impl public_methods<K,V> for &const linear_map<K,V> {
243-
fn size() -> uint {
244+
fn len() -> uint {
244245
self.size
245246
}
246247

248+
fn is_empty() -> bool {
249+
self.len() == 0
250+
}
251+
247252
fn contains_key(k: &K) -> bool {
248253
alt self.bucket_for_key(self.buckets, k) {
249254
found_entry(_) => {true}
@@ -377,6 +382,15 @@ mod test {
377382
assert m.get(&5) == 3;
378383
}
379384

385+
#[test]
386+
fn empty() {
387+
let mut m = ~linear::linear_map_with_capacity(uint_hash, uint_eq, 4);
388+
assert m.insert(1, 2);
389+
assert !m.is_empty();
390+
assert m.remove(&1);
391+
assert m.is_empty();
392+
}
393+
380394
#[test]
381395
fn iterate() {
382396
let mut m = linear::linear_map_with_capacity(uint_hash, uint_eq, 4);

0 commit comments

Comments
 (0)