Skip to content

Commit 82cd179

Browse files
committed
---
yaml --- r: 149614 b: refs/heads/try2 c: 0c8731e h: refs/heads/master v: v3
1 parent 50c9728 commit 82cd179

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 52524bfe880f3722d8d70e4433429c1b4a3f31d3
8+
refs/heads/try2: 0c8731e65ce535254114c6404d46b2074d96ab07
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libarena/lib.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
extern crate collections;
2626

2727
use collections::list::{List, Cons, Nil};
28-
use collections::list;
2928

3029
use std::cast::{transmute, transmute_mut, transmute_mut_region};
3130
use std::cast;
@@ -44,7 +43,7 @@ use std::vec;
4443
// The way arena uses arrays is really deeply awful. The arrays are
4544
// allocated, and have capacities reserved, but the fill for the array
4645
// will always stay at 0.
47-
#[deriving(Clone)]
46+
#[deriving(Clone, Eq)]
4847
struct Chunk {
4948
data: Rc<RefCell<~[u8]>>,
5049
fill: Cell<uint>,
@@ -119,13 +118,11 @@ impl Drop for Arena {
119118
fn drop(&mut self) {
120119
unsafe {
121120
destroy_chunk(&self.head);
122-
123-
list::each(self.chunks.get(), |chunk| {
121+
for chunk in self.chunks.get().iter() {
124122
if !chunk.is_pod.get() {
125123
destroy_chunk(chunk);
126124
}
127-
true
128-
});
125+
}
129126
}
130127
}
131128
}

0 commit comments

Comments
 (0)