diff options
| author | Valerii Hiora <valerii.hiora@gmail.com> | 2014-12-11 18:31:09 +0200 |
|---|---|---|
| committer | Valerii Hiora <valerii.hiora@gmail.com> | 2014-12-13 07:52:00 +0200 |
| commit | 319c379bac07c6213ac4de817be0dac202a249f8 (patch) | |
| tree | 0879d6dd405f91460e02b12eba84fd3efa90ae65 /src | |
| parent | c38e73fef53e8520e5170c40713e32ab965a8abe (diff) | |
| download | rust-319c379bac07c6213ac4de817be0dac202a249f8.tar.gz rust-319c379bac07c6213ac4de817be0dac202a249f8.zip | |
Add `Copy` to bitflags-generated structures
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc/middle/resolve.rs | 2 | ||||
| -rw-r--r-- | src/librustc/middle/ty.rs | 2 | ||||
| -rw-r--r-- | src/librustc_llvm/lib.rs | 1 | ||||
| -rw-r--r-- | src/libstd/bitflags.rs | 10 | ||||
| -rw-r--r-- | src/libstd/io/mod.rs | 1 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 1 |
6 files changed, 1 insertions, 16 deletions
diff --git a/src/librustc/middle/resolve.rs b/src/librustc/middle/resolve.rs index 36b87bbd423..840675d60bb 100644 --- a/src/librustc/middle/resolve.rs +++ b/src/librustc/middle/resolve.rs @@ -633,8 +633,6 @@ bitflags! { } } -impl Copy for DefModifiers {} - // Records a possibly-private type definition. #[deriving(Clone)] struct TypeNsDef { diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index 4c4b5d07f50..9435268c2ef 100644 --- a/src/librustc/middle/ty.rs +++ b/src/librustc/middle/ty.rs @@ -800,8 +800,6 @@ bitflags! { } } -impl Copy for TypeFlags {} - #[deriving(Show)] pub struct TyS<'tcx> { pub sty: sty<'tcx>, diff --git a/src/librustc_llvm/lib.rs b/src/librustc_llvm/lib.rs index 23dad21e530..f6ac6fb6c70 100644 --- a/src/librustc_llvm/lib.rs +++ b/src/librustc_llvm/lib.rs @@ -149,7 +149,6 @@ bitflags! { } } -impl Copy for Attribute {} #[repr(u64)] pub enum OtherAttribute { diff --git a/src/libstd/bitflags.rs b/src/libstd/bitflags.rs index ffcd6505dad..8a6d329ec46 100644 --- a/src/libstd/bitflags.rs +++ b/src/libstd/bitflags.rs @@ -33,8 +33,6 @@ /// } /// } /// -/// impl Copy for Flags {} -/// /// fn main() { /// let e1 = FLAG_A | FLAG_C; /// let e2 = FLAG_B | FLAG_C; @@ -57,8 +55,6 @@ /// } /// } /// -/// impl Copy for Flags {} -/// /// impl Flags { /// pub fn clear(&mut self) { /// self.bits = 0; // The `bits` field can be accessed from within the @@ -121,7 +117,7 @@ macro_rules! bitflags { ($(#[$attr:meta])* flags $BitFlags:ident: $T:ty { $($(#[$Flag_attr:meta])* const $Flag:ident = $value:expr),+ }) => { - #[deriving(PartialEq, Eq, Clone, PartialOrd, Ord, Hash)] + #[deriving(Copy, PartialEq, Eq, Clone, PartialOrd, Ord, Hash)] $(#[$attr])* pub struct $BitFlags { bits: $T, @@ -288,16 +284,12 @@ mod tests { } } - impl Copy for Flags {} - bitflags! { flags AnotherSetOfFlags: i8 { const AnotherFlag = -1_i8, } } - impl Copy for AnotherSetOfFlags {} - #[test] fn test_bits(){ assert_eq!(Flags::empty().bits(), 0x00000000); diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index dc212e7cab3..8be48114418 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -1904,7 +1904,6 @@ bitflags! { } } -impl Copy for FilePermission {} impl Default for FilePermission { #[inline] diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 4929ee885ac..ab398603b61 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -98,7 +98,6 @@ bitflags! { } } -impl Copy for Restrictions {} type ItemInfo = (Ident, Item_, Option<Vec<Attribute> >); |