X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Flibcore%2Fkinds.rs;h=b0f46e3d68c908a1850962274d83ba5007f03945;hb=de7abcf6d3d2d0928fa03a7522e23f4aba0d5254;hp=bf1a7ec299901030d4af1a2230b0e58c5438f751;hpb=14a5992ef614a76cd36972191ea4507a3d3daccb;p=rust.git diff --git a/src/libcore/kinds.rs b/src/libcore/kinds.rs index bf1a7ec2999..b0f46e3d68c 100644 --- a/src/libcore/kinds.rs +++ b/src/libcore/kinds.rs @@ -235,11 +235,9 @@ fn clone(&self) -> InvariantType { *self } /// For more information about variance, refer to this Wikipedia /// article . #[lang="covariant_lifetime"] - #[deriving(Clone, PartialEq, Eq, PartialOrd, Ord)] + #[deriving(Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] pub struct CovariantLifetime<'a>; - impl<'a> Copy for CovariantLifetime<'a> {} - /// As `ContravariantType`, but for lifetime parameters. Using /// `ContravariantLifetime<'a>` indicates that it is ok to /// substitute a *shorter* lifetime for `'a` than the one you @@ -253,11 +251,9 @@ impl<'a> Copy for CovariantLifetime<'a> {} /// For more information about variance, refer to this Wikipedia /// article . #[lang="contravariant_lifetime"] - #[deriving(Clone, PartialEq, Eq, PartialOrd, Ord)] + #[deriving(Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] pub struct ContravariantLifetime<'a>; - impl<'a> Copy for ContravariantLifetime<'a> {} - /// As `InvariantType`, but for lifetime parameters. Using /// `InvariantLifetime<'a>` indicates that it is not ok to /// substitute any other lifetime for `'a` besides its original @@ -266,11 +262,9 @@ impl<'a> Copy for ContravariantLifetime<'a> {} /// and this pointer is itself stored in an inherently mutable /// location (such as a `Cell`). #[lang="invariant_lifetime"] - #[deriving(Clone, PartialEq, Eq, PartialOrd, Ord)] + #[deriving(Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] pub struct InvariantLifetime<'a>; - impl<'a> Copy for InvariantLifetime<'a> {} - /// A type which is considered "not sendable", meaning that it cannot /// be safely sent between tasks, even if it is owned. This is /// typically embedded in other types, such as `Gc`, to ensure that