libstd: Fix merge fallout.
This commit is contained in:
parent
775ccadd25
commit
998a3bbae0
2 changed files with 2 additions and 2 deletions
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue