librustc: Stop parsing impl Type : Trait and fix several declarations that slipped through. r=tjc

Author: pcwalton

src/libcargo/cargo.rc

@@ -71,7 +71,7 @@ pub struct Package {
     versions: ~[(~str, ~str)]
 }
 
-pub impl Package : cmp::Ord {
+pub impl cmp::Ord for Package {
     pure fn lt(&self, other: &Package) -> bool {
         if (*self).name.lt(&(*other).name) { return true; }
         if (*other).name.lt(&(*self).name) { return false; }

src/libcore/at_vec.rs

@@ -173,7 +173,7 @@ pub mod traits {
     use kinds::Copy;
     use ops::Add;
 
-    pub impl<T: Copy> @[T] : Add<&[const T],@[T]> {
+    pub impl<T: Copy> Add<&[const T],@[T]> for @[T] {
         #[inline(always)]
         pure fn add(&self, rhs: & &self/[const T]) -> @[T] {
             append(*self, (*rhs))

src/libcore/num/f32.rs

@@ -282,7 +282,7 @@ impl num::One for f32 {
     static pure fn one() -> f32 { 1.0 }
 }
 
-pub impl f32: NumCast {
+pub impl NumCast for f32 {
     /**
      * Cast `n` to an `f32`
      */

src/libcore/num/f64.rs

@@ -297,7 +297,7 @@ impl cmp::Ord for f64 {
     pure fn gt(&self, other: &f64) -> bool { (*self) > (*other) }
 }
 
-pub impl f64: NumCast {
+pub impl NumCast for f64 {
     /**
      * Cast `n` to an `f64`
      */

src/libcore/num/float.rs

@@ -415,7 +415,7 @@ impl num::One for float {
     static pure fn one() -> float { 1.0 }
 }
 
-pub impl float: NumCast {
+pub impl NumCast for float {
     /**
      * Cast `n` to a `float`
      */

src/libcore/num/int-template/i16.rs

@@ -17,7 +17,7 @@ mod inst {
     pub const bits: uint = ::u16::bits;
 }
 
-pub impl i16: NumCast {
+pub impl NumCast for i16 {
     /**
      * Cast `n` to a `i16`
      */

src/libcore/num/int-template/i32.rs

@@ -17,7 +17,7 @@ mod inst {
     pub const bits: uint = ::u32::bits;
 }
 
-pub impl i32: NumCast {
+pub impl NumCast for i32 {
     /**
      * Cast `n` to a `i32`
      */

src/libcore/num/int-template/i64.rs

@@ -17,7 +17,7 @@ mod inst {
     pub const bits: uint = ::u64::bits;
 }
 
-pub impl i64: NumCast {
+pub impl NumCast for i64 {
     /**
      * Cast `n` to a `i64`
      */

src/libcore/num/int-template/i8.rs

@@ -17,7 +17,7 @@ mod inst {
     pub const bits: uint = ::u8::bits;
 }
 
-pub impl i8: NumCast {
+pub impl NumCast for i8 {
     /**
      * Cast `n` to a `i8`
      */

src/libcore/num/int-template/int.rs

@@ -58,7 +58,7 @@ mod inst {
     }
 }
 
-pub impl int: NumCast {
+pub impl NumCast for int {
     /**
      * Cast `n` to a `int`
      */

src/libcore/num/uint-template/u16.rs

@@ -19,7 +19,7 @@ mod inst {
     pub const bits: uint = 16;
 }
 
-pub impl u16: NumCast {
+pub impl NumCast for u16 {
     /**
      * Cast `n` to a `u16`
      */

src/libcore/num/uint-template/u32.rs

@@ -19,7 +19,7 @@ mod inst {
     pub const bits: uint = 32;
 }
 
-pub impl u32: NumCast {
+pub impl NumCast for u32 {
     /**
      * Cast `n` to a `u32`
      */

src/libcore/num/uint-template/u64.rs

@@ -19,7 +19,7 @@ mod inst {
     pub const bits: uint = 64;
 }
 
-pub impl u64: num::NumCast {
+pub impl NumCast for u64 {
     /**
      * Cast `n` to a `u64`
      */

src/libcore/num/uint-template/u8.rs

@@ -26,7 +26,7 @@ mod inst {
     pub pure fn is_ascii(x: T) -> bool { return 0 as T == x & 128 as T; }
 }
 
-pub impl u8: NumCast {
+pub impl NumCast for u8 {
     /**
      * Cast `n` to a `u8`
      */

src/libcore/num/uint-template/uint.rs

@@ -110,7 +110,7 @@ pub mod inst {
         return true;
     }
 
-    pub impl uint: iter::Times {
+    pub impl iter::Times for uint {
         #[inline(always)]
         /**
         * A convenience form for basic iteration. Given a uint `x`,
@@ -209,7 +209,7 @@ pub mod inst {
     }
 }
 
-pub impl uint: NumCast {
+pub impl NumCast for uint {
     /**
      * Cast `n` to a `uint`
      */

src/libcore/pipes.rs

@@ -1211,11 +1211,11 @@ pub trait Select2<T: Owned, U: Owned> {
     fn select() -> Either<T, U>;
 }
 
-impl<T: Owned, U: Owned,
+impl<T: Owned,
+     U: Owned,
      Left: Selectable GenericPort<T>,
      Right: Selectable GenericPort<U>>
-    (Left, Right): Select2<T, U> {
-
+     Select2<T,U> for (Left, Right) {
     fn select() -> Either<T, U> {
         match self {
           (ref lp, ref rp) => match select2i(lp, rp) {

src/libcore/str.rs

@@ -2328,7 +2328,7 @@ pub trait OwnedStr {
     fn push_char(&mut self, c: char);
 }
 
-pub impl ~str : OwnedStr {
+pub impl OwnedStr for ~str {
     fn push_str(&mut self, v: &str) {
         push_str(self, v);
     }

src/libcore/to_bytes.rs

@@ -170,7 +170,7 @@ impl IterBytes for char {
 pub mod x32 {
     use to_bytes::{Cb, IterBytes};
 
-    pub impl uint: IterBytes {
+    pub impl IterBytes for uint {
         #[inline(always)]
         pure fn iter_bytes(&self, lsb0: bool, f: Cb) {
             (*self as u32).iter_bytes(lsb0, f)
@@ -182,7 +182,7 @@ pub mod x32 {
 pub mod x64 {
     use to_bytes::{Cb, IterBytes};
 
-    pub impl uint: IterBytes {
+    pub impl IterBytes for uint {
         #[inline(always)]
         pure fn iter_bytes(&self, lsb0: bool, f: Cb) {
             (*self as u64).iter_bytes(lsb0, f)

src/librustc/driver/driver.rs

@@ -175,6 +175,7 @@ pub fn time<T>(do_it: bool, what: ~str, thunk: fn() -> T) -> T {
     rv
 }
 
+#[deriving_eq]
 pub enum compile_upto {
     cu_parse,
     cu_expand,
@@ -183,13 +184,6 @@ pub enum compile_upto {
     cu_everything,
 }
 
-pub impl compile_upto : cmp::Eq {
-    pure fn eq(&self, other: &compile_upto) -> bool {
-        ((*self) as uint) == ((*other) as uint)
-    }
-    pure fn ne(&self, other: &compile_upto) -> bool { !(*self).eq(other) }
-}
-
 pub fn compile_upto(sess: Session, cfg: ast::crate_cfg,
                     input: input, upto: compile_upto,
                     outputs: Option<output_filenames>)

src/librustc/driver/session.rs

@@ -29,24 +29,12 @@ use syntax::parse::parse_sess;
 use syntax::{ast, codemap};
 use syntax;
 
+#[deriving_eq]
 pub enum os { os_win32, os_macos, os_linux, os_android, os_freebsd, }
 
-pub impl os : cmp::Eq {
-    pure fn eq(&self, other: &os) -> bool {
-        ((*self) as uint) == ((*other) as uint)
-    }
-    pure fn ne(&self, other: &os) -> bool { !(*self).eq(other) }
-}
-
+#[deriving_eq]
 pub enum arch { arch_x86, arch_x86_64, arch_arm, }
 
-pub impl arch : cmp::Eq {
-    pure fn eq(&self, other: &arch) -> bool {
-        ((*self) as uint) == ((*other) as uint)
-    }
-    pure fn ne(&self, other: &arch) -> bool { !(*self).eq(other) }
-}
-
 pub enum crate_type { bin_crate, lib_crate, unknown_crate, }
 
 pub type config =
@@ -117,20 +105,14 @@ pub fn debugging_opts_map() -> ~[(~str, ~str, uint)] {
     ]
 }
 
+#[deriving_eq]
 pub enum OptLevel {
     No, // -O0
     Less, // -O1
     Default, // -O2
     Aggressive // -O3
 }
 
-pub impl OptLevel : cmp::Eq {
-    pure fn eq(&self, other: &OptLevel) -> bool {
-        ((*self) as uint) == ((*other) as uint)
-    }
-    pure fn ne(&self, other: &OptLevel) -> bool { !(*self).eq(other) }
-}
-
 pub type options =
     // The crate config requested for the session, which may be combined
     // with additional crate configurations during the compile process

src/librustc/lib/llvm.rs

@@ -132,6 +132,7 @@ pub enum RealPredicate {
 
 // enum for the LLVM TypeKind type - must stay in sync with the def of
 // LLVMTypeKind in llvm/include/llvm-c/Core.h
+#[deriving_eq]
 pub enum TypeKind {
     Void      = 0,
     Half      = 1,
@@ -151,46 +152,6 @@ pub enum TypeKind {
     X86_MMX   = 15
 }
 
-pub impl TypeKind : cmp::Eq {
-    pure fn eq(&self, other: &TypeKind) -> bool {
-        match ((*self), (*other)) {
-            (Void, Void) => true,
-            (Half, Half) => true,
-            (Float, Float) => true,
-            (Double, Double) => true,
-            (X86_FP80, X86_FP80) => true,
-            (FP128, FP128) => true,
-            (PPC_FP128, PPC_FP128) => true,
-            (Label, Label) => true,
-            (Integer, Integer) => true,
-            (Function, Function) => true,
-            (Struct, Struct) => true,
-            (Array, Array) => true,
-            (Pointer, Pointer) => true,
-            (Vector, Vector) => true,
-            (Metadata, Metadata) => true,
-            (X86_MMX, X86_MMX) => true,
-            (Void, _) => false,
-            (Half, _) => false,
-            (Float, _) => false,
-            (Double, _) => false,
-            (X86_FP80, _) => false,
-            (FP128, _) => false,
-            (PPC_FP128, _) => false,
-            (Label, _) => false,
-            (Integer, _) => false,
-            (Function, _) => false,
-            (Struct, _) => false,
-            (Array, _) => false,
-            (Pointer, _) => false,
-            (Vector, _) => false,
-            (Metadata, _) => false,
-            (X86_MMX, _) => false,
-        }
-    }
-    pure fn ne(&self, other: &TypeKind) -> bool { !(*self).eq(other) }
-}
-
 pub enum AtomicBinOp {
     Xchg = 0,
     Add  = 1,

src/librustc/middle/borrowck/mod.rs

@@ -449,7 +449,7 @@ impl LoanKind {
 
 /// Creates and returns a new root_map
 
-pub impl root_map_key : to_bytes::IterBytes {
+pub impl to_bytes::IterBytes for root_map_key {
     pure fn iter_bytes(&self, +lsb0: bool, f: to_bytes::Cb) {
         to_bytes::iter_bytes_2(&self.id, &self.derefs, lsb0, f);
     }

src/librustc/middle/mem_categorization.rs

@@ -281,12 +281,12 @@ pub trait ast_node {
     fn span() -> span;
 }
 
-pub impl @ast::expr: ast_node {
+pub impl ast_node for @ast::expr {
     fn id() -> ast::node_id { self.id }
     fn span() -> span { self.span }
 }
 
-pub impl @ast::pat: ast_node {
+pub impl ast_node for @ast::pat {
     fn id() -> ast::node_id { self.id }
     fn span() -> span { self.span }
 }
@@ -295,7 +295,7 @@ pub trait get_type_for_node {
     fn ty<N: ast_node>(node: N) -> ty::t;
 }
 
-pub impl ty::ctxt: get_type_for_node {
+pub impl get_type_for_node for ty::ctxt {
     fn ty<N: ast_node>(node: N) -> ty::t {
         ty::node_id_to_type(self, node.id())
     }

src/librustc/middle/trans/base.rs

@@ -108,7 +108,7 @@ pub trait get_insn_ctxt {
     fn insn_ctxt(s: &str) -> icx_popper;
 }
 
-pub impl @crate_ctxt: get_insn_ctxt {
+pub impl get_insn_ctxt for @crate_ctxt {
     fn insn_ctxt(s: &str) -> icx_popper {
         debug!("new insn_ctxt: %s", s);
         if self.sess.count_llvm_insns() {
@@ -118,13 +118,13 @@ pub impl @crate_ctxt: get_insn_ctxt {
     }
 }
 
-pub impl block: get_insn_ctxt {
+pub impl get_insn_ctxt for block {
     fn insn_ctxt(s: &str) -> icx_popper {
         self.ccx().insn_ctxt(s)
     }
 }
 
-pub impl fn_ctxt: get_insn_ctxt {
+pub impl get_insn_ctxt for fn_ctxt {
     fn insn_ctxt(s: &str) -> icx_popper {
         self.ccx.insn_ctxt(s)
     }