Skip to content

Commit 13fd1bc

Browse files
author
Jorge Aparicio
committed
---
yaml --- r: 165882 b: refs/heads/try c: 86f8c12 h: refs/heads/master v: v3
1 parent aedfffb commit 13fd1bc

File tree

20 files changed

+78
-217
lines changed

20 files changed

+78
-217
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 18842f89f084c52588fe7cffe07f87bf6e90796a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 658529467d9d69ac9e09cacf98a6d61d781c2c76
5-
refs/heads/try: a77e8a63d5d4c0fa04a878995824e727870135f9
5+
refs/heads/try: 86f8c127dd806940fe201b510b9284750fb17271
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/libsyntax/abi.rs

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub use self::AbiArchitecture::*;
1515

1616
use std::fmt;
1717

18-
#[deriving(PartialEq)]
18+
#[deriving(Copy, PartialEq)]
1919
pub enum Os {
2020
OsWindows,
2121
OsMacos,
@@ -26,9 +26,7 @@ pub enum Os {
2626
OsDragonfly,
2727
}
2828

29-
impl Copy for Os {}
30-
31-
#[deriving(PartialEq, Eq, Hash, Encodable, Decodable, Clone)]
29+
#[deriving(Copy, PartialEq, Eq, Hash, Encodable, Decodable, Clone)]
3230
pub enum Abi {
3331
// NB: This ordering MUST match the AbiDatas array below.
3432
// (This is ensured by the test indices_are_correct().)
@@ -48,10 +46,8 @@ pub enum Abi {
4846
RustCall,
4947
}
5048

51-
impl Copy for Abi {}
52-
5349
#[allow(non_camel_case_types)]
54-
#[deriving(PartialEq)]
50+
#[deriving(Copy, PartialEq)]
5551
pub enum Architecture {
5652
X86,
5753
X86_64,
@@ -60,17 +56,15 @@ pub enum Architecture {
6056
Mipsel
6157
}
6258

63-
impl Copy for Architecture {}
64-
59+
#[deriving(Copy)]
6560
pub struct AbiData {
6661
abi: Abi,
6762

6863
// Name of this ABI as we like it called.
6964
name: &'static str,
7065
}
7166

72-
impl Copy for AbiData {}
73-
67+
#[deriving(Copy)]
7468
pub enum AbiArchitecture {
7569
/// Not a real ABI (e.g., intrinsic)
7670
RustArch,
@@ -80,9 +74,6 @@ pub enum AbiArchitecture {
8074
Archs(u32)
8175
}
8276

83-
#[allow(non_upper_case_globals)]
84-
impl Copy for AbiArchitecture {}
85-
8677
#[allow(non_upper_case_globals)]
8778
static AbiDatas: &'static [AbiData] = &[
8879
// Platform-specific ABIs

0 commit comments

Comments
 (0)