diff options
| author | bors <bors@rust-lang.org> | 2013-07-20 10:55:34 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-07-20 10:55:34 -0700 |
| commit | 5c999d4ecac0b4fb4b64c3e174f89bb5165abfd3 (patch) | |
| tree | 4b39e15a052cec1cd0fb69fb911a7b7ca0641c59 /src/libstd | |
| parent | 8aae6edce09a8e2a32a154acb55c9879dbebf99c (diff) | |
| parent | 9089cf2ec9297a3b558d24352cde6a5206a08444 (diff) | |
| download | rust-5c999d4ecac0b4fb4b64c3e174f89bb5165abfd3.tar.gz rust-5c999d4ecac0b4fb4b64c3e174f89bb5165abfd3.zip | |
auto merge of #7894 : pcwalton/rust/and-pointers-in-at-boxes, r=brson
r? @brson
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/clone.rs | 4 | ||||
| -rw-r--r-- | src/libstd/num/num.rs | 4 | ||||
| -rw-r--r-- | src/libstd/rand.rs | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/libstd/clone.rs b/src/libstd/clone.rs index 6fd06c95191..d7220fdeb60 100644 --- a/src/libstd/clone.rs +++ b/src/libstd/clone.rs @@ -112,7 +112,7 @@ impl<T: DeepClone> DeepClone for ~T { } // FIXME: #6525: should also be implemented for `T: Send + DeepClone` -impl<T: Freeze + DeepClone> DeepClone for @T { +impl<T: Freeze + DeepClone + 'static> DeepClone for @T { /// Return a deep copy of the managed box. The `Freeze` trait is required to prevent performing /// a deep clone of a potentially cyclical type. #[inline] @@ -120,7 +120,7 @@ impl<T: Freeze + DeepClone> DeepClone for @T { } // FIXME: #6525: should also be implemented for `T: Send + DeepClone` -impl<T: Freeze + DeepClone> DeepClone for @mut T { +impl<T: Freeze + DeepClone + 'static> DeepClone for @mut T { /// Return a deep copy of the managed box. The `Freeze` trait is required to prevent performing /// a deep clone of a potentially cyclical type. #[inline] diff --git a/src/libstd/num/num.rs b/src/libstd/num/num.rs index fc199876902..f35f495def3 100644 --- a/src/libstd/num/num.rs +++ b/src/libstd/num/num.rs @@ -446,12 +446,12 @@ pub fn pow_with_uint<T:NumCast+One+Zero+Div<T,T>+Mul<T,T>>(radix: uint, pow: uin total } -impl<T: Zero> Zero for @mut T { +impl<T: Zero + 'static> Zero for @mut T { fn zero() -> @mut T { @mut Zero::zero() } fn is_zero(&self) -> bool { (**self).is_zero() } } -impl<T: Zero> Zero for @T { +impl<T: Zero + 'static> Zero for @T { fn zero() -> @T { @Zero::zero() } fn is_zero(&self) -> bool { (**self).is_zero() } } diff --git a/src/libstd/rand.rs b/src/libstd/rand.rs index 9583e37d002..c2fb94f37bb 100644 --- a/src/libstd/rand.rs +++ b/src/libstd/rand.rs @@ -242,7 +242,7 @@ impl<T: Rand> Rand for ~T { fn rand<R: Rng>(rng: &mut R) -> ~T { ~rng.gen() } } -impl<T: Rand> Rand for @T { +impl<T: Rand + 'static> Rand for @T { #[inline] fn rand<R: Rng>(rng: &mut R) -> @T { @rng.gen() } } |