Skip to content

Commit 998a3bb

Browse files
committed
libstd: Fix merge fallout.
1 parent 775ccad commit 998a3bb

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/libstd/cast.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ mod tests {
123123
fn test_bump_managed_refcount() {
124124
unsafe {
125125
let managed = @~"box box box"; // refcount 1
126-
bump_managed_refcount(managed); // refcount 2
126+
bump_box_refcount(managed); // refcount 2
127127
let ptr: *int = transmute(managed); // refcount 2
128128
let _box1: @~str = ::cast::transmute_copy(&ptr);
129129
let _box2: @~str = ::cast::transmute_copy(&ptr);

src/test/run-pass/new-box-syntax.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* Any copyright is dedicated to the Public Domain.
22
* http://creativecommons.org/publicdomain/zero/1.0/ */
33

4-
fn main() {
4+
pub fn main() {
55
let x: ~int = box 3;
66
println!("{}", *x);
77
}

0 commit comments

Comments
 (0)