Skip to content

Commit d2677a5

Browse files
bjadamsonalexcrichton
authored andcommitted
---
yaml --- r: 110427 b: refs/heads/try c: 2ae2924 h: refs/heads/master i: 110425: 695cc1f 110423: 79eba95 v: v3
1 parent 1039a17 commit d2677a5

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: e415c25bcd81dc1f9a5a3d25d9b48ed2d545336b
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: c7fac4471201977fdb1c0c0a26c87287e12dc644
5-
refs/heads/try: b4f7b6d6729e3d255477833b05e0fd0b58c9ee34
5+
refs/heads/try: 2ae292473e2b96ea8429dff5f2f3581bc026582c
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libarena/lib.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -23,8 +23,6 @@
2323
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
2424
html_root_url = "http://static.rust-lang.org/doc/master")]
2525
#![allow(missing_doc)]
26-
#![feature(managed_boxes)]
27-
2826
#![allow(visible_private_types)] // NOTE: remove after a stage0 snap
2927

3028
extern crate collections;
@@ -301,7 +299,7 @@ fn test_arena_destructors() {
301299
for i in range(0u, 10) {
302300
// Arena allocate something with drop glue to make sure it
303301
// doesn't leak.
304-
arena.alloc(|| @i);
302+
arena.alloc(|| Rc::new(i));
305303
// Allocate something with funny size and alignment, to keep
306304
// things interesting.
307305
arena.alloc(|| [0u8, 1u8, 2u8]);
@@ -316,13 +314,13 @@ fn test_arena_destructors_fail() {
316314
for i in range(0u, 10) {
317315
// Arena allocate something with drop glue to make sure it
318316
// doesn't leak.
319-
arena.alloc(|| { @i });
317+
arena.alloc(|| { Rc::new(i) });
320318
// Allocate something with funny size and alignment, to keep
321319
// things interesting.
322320
arena.alloc(|| { [0u8, 1u8, 2u8] });
323321
}
324322
// Now, fail while allocating
325-
arena.alloc::<@int>(|| {
323+
arena.alloc::<Rc<int>>(|| {
326324
// Now fail.
327325
fail!();
328326
});

0 commit comments

Comments
 (0)