squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

auto merge of #5751 : metajack/rust/at-clones, r=thestinger

Browse source 
The borrowck-borrow-from-expr-block test had to be updated. I'm not sure why
it compiled before since ~int was already clonable.
This commit is contained in:
bors 2013-04-06 00:06:47 -07:00
commit d09835d2e3
2 changed files with 34 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/libcore/clone.rs
View file

@ -1,4 +1,4 @@
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
@ -36,6 +36,16 @@ impl<T:Clone> Clone for ~T {
fn clone(&self) -> ~T { ~(**self).clone() }
}
impl<T:Clone> Clone for @T {
#[inline(always)]
fn clone(&self) -> @T { @(**self).clone() }
}
impl<T:Clone> Clone for @mut T {
#[inline(always)]
fn clone(&self) -> @mut T { @mut (**self).clone() }
}
macro_rules! clone_impl(
($t:ty) => {
impl Clone for $t {
@ -63,3 +73,24 @@ clone_impl!(f64)
clone_impl!(bool)
clone_impl!(char)
#[test]
fn test_owned_clone() {
let a : ~int = ~5i;
let b : ~int = a.clone();
assert!(a == b);
}
#[test]
fn test_managed_clone() {
let a : @int = @5i;
let b : @int = a.clone();
assert!(a == b);
}
#[test]
fn test_managed_mut_clone() {
let a : @int = @5i;
let b : @int = a.clone();
assert!(a == b);
}

4
src/test/run-pass/borrowck-borrow-from-expr-block.rs
View file

@ -1,4 +1,4 @@
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
@ -13,7 +13,7 @@ fn borrow(x: &int, f: &fn(x: &int)) {
}
fn test1(x: @~int) {
do borrow(&*x.clone()) |p| {
do borrow(&**x.clone()) |p| {
let x_a = ptr::addr_of(&(**x));
assert!((x_a as uint) != ptr::to_uint(p));
assert!(unsafe{*x_a} == *p);