Skip to content

Commit b5de5b9

Browse files
committed
---
yaml --- r: 21927 b: refs/heads/snap-stage3 c: 9173508 h: refs/heads/master i: 21925: 0faea85 21923: c56a133 21919: fc7845e v: v3
1 parent 42bec2b commit b5de5b9

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
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: ebd3203eaf12551ad7ab936db1615d59a4fedaae
4+
refs/heads/snap-stage3: 9173508aa461cf7789d3620947ff0ecd3a174a11
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/arena.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
// overhead when initializing plain-old-data and means we don't need
2323
// to waste time running the destructors of POD.
2424

25+
#[forbid(deprecated_mode)];
26+
#[forbid(deprecated_pattern)];
27+
2528
export Arena, arena_with_size;
2629

2730
use list::{List, Cons, Nil};
@@ -56,9 +59,9 @@ struct Arena {
5659
priv mut chunks: @List<Chunk>,
5760
drop {
5861
unsafe {
59-
destroy_chunk(self.head);
62+
destroy_chunk(&self.head);
6063
for list::each(self.chunks) |chunk| {
61-
if !chunk.is_pod { destroy_chunk(chunk); }
64+
if !chunk.is_pod { destroy_chunk(&chunk); }
6265
}
6366
}
6467
}
@@ -87,7 +90,7 @@ fn round_up_to(base: uint, align: uint) -> uint {
8790

8891
// Walk down a chunk, running the destructors for any objects stored
8992
// in it.
90-
unsafe fn destroy_chunk(chunk: Chunk) {
93+
unsafe fn destroy_chunk(chunk: &Chunk) {
9194
let mut idx = 0;
9295
let buf = vec::raw::to_ptr(chunk.data);
9396
let fill = chunk.fill;

0 commit comments

Comments
 (0)