librustc: Allow the new UFCS explicit self in trait definitions, and

remove `~self` from the test suite.

Author: pcwalton

src/librustdoc/clean/mod.rs

@@ -1003,7 +1003,7 @@ impl Clean<Item> for ty::Method {
                 };
                 let s = match s {
                     ty::ByReferenceExplicitSelfCategory(..) => {
-                        match ty::get(*self.fty.sig.inputs[0]).sty {
+                        match ty::get(self.fty.sig.inputs[0]).sty {
                             ty::ty_rptr(r, mt) => {
                                 SelfBorrowed(r.clean(), mt.mutbl.clean())
                             }

src/test/compile-fail/issue-5153.rs

@@ -11,11 +11,11 @@
 // error-pattern: type `&Foo` does not implement any method in scope named `foo`
 
 trait Foo {
-    fn foo(~self);
+    fn foo(self: Box<Self>);
 }
 
 impl Foo for int {
-    fn foo(~self) { }
+    fn foo(self: Box<int>) { }
 }
 
 fn main() {

src/test/compile-fail/lint-unused-mut-self.rs

@@ -16,7 +16,7 @@
 struct Foo;
 impl Foo {
     fn foo(mut self) {} //~ ERROR: variable does not need to be mutable
-    fn bar(mut ~self) {} //~ ERROR: variable does not need to be mutable
+    fn bar(mut self: Box<Foo>) {} //~ ERROR: variable does not need to be mutable
 }
 
 fn main() {}

src/test/compile-fail/object-pointer-types.rs

@@ -13,7 +13,7 @@ trait Foo {
     fn borrowed(&self);
     fn borrowed_mut(&mut self);
 
-    fn owned(~self);
+    fn owned(self: Box<Self>);
 }
 
 fn borrowed_receiver(x: &Foo) {

src/test/debuginfo/generic-method-on-generic-struct.rs

@@ -134,7 +134,7 @@ impl<T1> Struct<T1> {
         arg1
     }
 
-    fn self_owned<T2>(~self, arg1: int, arg2: T2) -> int {
+    fn self_owned<T2>(self: Box<Struct<T1>>, arg1: int, arg2: T2) -> int {
         zzz(); // #break
         arg1
     }

src/test/debuginfo/method-on-enum.rs

@@ -136,7 +136,7 @@ impl Enum {
         arg1 + arg2
     }
 
-    fn self_owned(~self, arg1: int, arg2: int) -> int {
+    fn self_owned(self: Box<Enum>, arg1: int, arg2: int) -> int {
         zzz(); // #break
         arg1 + arg2
     }

src/test/debuginfo/method-on-generic-struct.rs

@@ -134,7 +134,7 @@ impl<T> Struct<T> {
         arg1 + arg2
     }
 
-    fn self_owned(~self, arg1: int, arg2: int) -> int {
+    fn self_owned(self: Box<Struct<T>>, arg1: int, arg2: int) -> int {
         zzz(); // #break
         arg1 + arg2
     }

src/test/debuginfo/method-on-struct.rs

@@ -133,7 +133,7 @@ impl Struct {
         self.x + arg1 + arg2
     }
 
-    fn self_owned(~self, arg1: int, arg2: int) -> int {
+    fn self_owned(self: Box<Struct>, arg1: int, arg2: int) -> int {
         zzz(); // #break
         self.x + arg1 + arg2
     }

src/test/debuginfo/method-on-trait.rs

@@ -124,7 +124,7 @@ struct Struct {
 trait Trait {
     fn self_by_ref(&self, arg1: int, arg2: int) -> int;
     fn self_by_val(self, arg1: int, arg2: int) -> int;
-    fn self_owned(~self, arg1: int, arg2: int) -> int;
+    fn self_owned(self: Box<Self>, arg1: int, arg2: int) -> int;
 }
 
 impl Trait for Struct {
@@ -139,7 +139,7 @@ impl Trait for Struct {
         self.x + arg1 + arg2
     }
 
-    fn self_owned(~self, arg1: int, arg2: int) -> int {
+    fn self_owned(self: Box<Struct>, arg1: int, arg2: int) -> int {
         zzz(); // #break
         self.x + arg1 + arg2
     }

src/test/debuginfo/method-on-tuple-struct.rs

@@ -131,7 +131,7 @@ impl TupleStruct {
         arg1 + arg2
     }
 
-    fn self_owned(~self, arg1: int, arg2: int) -> int {
+    fn self_owned(self: Box<TupleStruct>, arg1: int, arg2: int) -> int {
         zzz(); // #break
         arg1 + arg2
     }