From 998a3bbae0c3d998edb7c3e36173c844492010a5 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Sat, 14 Dec 2013 14:53:20 -0800
Subject: [PATCH] libstd: Fix merge fallout.

---
 src/libstd/cast.rs                  | 2 +-
 src/test/run-pass/new-box-syntax.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libstd/cast.rs b/src/libstd/cast.rs
index fde3ed3f0fe6..c2dc7506105b 100644
--- a/src/libstd/cast.rs
+++ b/src/libstd/cast.rs
@@ -123,7 +123,7 @@ mod tests {
     fn test_bump_managed_refcount() {
         unsafe {
             let managed = @~"box box box";      // refcount 1
-            bump_managed_refcount(managed);     // refcount 2
+            bump_box_refcount(managed);     // refcount 2
             let ptr: *int = transmute(managed); // refcount 2
             let _box1: @~str = ::cast::transmute_copy(&ptr);
             let _box2: @~str = ::cast::transmute_copy(&ptr);
diff --git a/src/test/run-pass/new-box-syntax.rs b/src/test/run-pass/new-box-syntax.rs
index d5fd333411b8..2d6e7a4ef0a1 100644
--- a/src/test/run-pass/new-box-syntax.rs
+++ b/src/test/run-pass/new-box-syntax.rs
@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-fn main() {
+pub fn main() {
     let x: ~int = box 3;
     println!("{}", *x);
 }