---

msullivan · msullivan · commit 855e6ae5a829 · 2013-07-11T15:51:10.000-07:00
yaml --- r: 142809 b: refs/heads/try2 c: 3fa5203 h: refs/heads/master i: 142807: b42d2ed v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 19446418bcc7ae48b23dd89d04e78c3d552e3001
+refs/heads/try2: 3fa5203273ad5a88b20b77b83a7a2e42cbcc3602
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/librustc/middle/lint.rs b/branches/try2/src/librustc/middle/lint.rs
@@ -236,7 +236,7 @@ static lint_table: &'static [(&'static str, LintSpec)] = &[
      LintSpec {
         lint: default_methods,
         desc: "allow default methods",
-        default: deny
+        default: allow
      }),
 
     ("unused_unsafe",
diff --git a/branches/try2/src/libstd/iterator.rs b/branches/try2/src/libstd/iterator.rs
@@ -17,7 +17,7 @@ implementing the `Iterator` trait.
 
 */
 
-#[allow(default_methods)]; // solid enough for the use case here
+#[allow(default_methods)]; // still off by default in stage0
 
 use cmp;
 use iter::Times;
diff --git a/branches/try2/src/test/auxiliary/issue_3979_traits.rs b/branches/try2/src/test/auxiliary/issue_3979_traits.rs
@@ -18,7 +18,6 @@ trait Positioned {
   fn X(&self) -> int;
 }
 
-#[allow(default_methods)]
 trait Movable: Positioned {
   fn translate(&self, dx: int) {
     self.SetX(self.X() + dx);
diff --git a/branches/try2/src/test/auxiliary/trait_default_method_xc_aux.rs b/branches/try2/src/test/auxiliary/trait_default_method_xc_aux.rs
@@ -1,4 +1,3 @@
-#[allow(default_methods)];
 
 pub struct Something { x: int }
 
diff --git a/branches/try2/src/test/run-pass/bug-7183-generics.rs b/branches/try2/src/test/run-pass/bug-7183-generics.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[allow(default_methods)]
 trait Speak {
     fn say(&self, s:&str) -> ~str;
     fn hi(&self) -> ~str { hello(self) }
diff --git a/branches/try2/src/test/run-pass/bug-7295.rs b/branches/try2/src/test/run-pass/bug-7295.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[allow(default_methods)];
 pub trait Foo<T> {
     pub fn func1<U>(&self, t: U);
 
diff --git a/branches/try2/src/test/run-pass/default-method-simple.rs b/branches/try2/src/test/run-pass/default-method-simple.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[allow(default_methods)];
 
 trait Foo {
     fn f(&self) {
diff --git a/branches/try2/src/test/run-pass/issue-3563-2.rs b/branches/try2/src/test/run-pass/issue-3563-2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[allow(default_methods)]
 trait Canvas {
     fn add_point(&self, point: &int);
     fn add_points(&self, shapes: &[int]) {
diff --git a/branches/try2/src/test/run-pass/issue-3563-3.rs b/branches/try2/src/test/run-pass/issue-3563-3.rs
@@ -113,7 +113,6 @@ impl ToStr for AsciiArt {
 
 // This is similar to an interface in other languages: it defines a protocol which
 // developers can implement for arbitrary concrete types.
-#[allow(default_methods)]
 trait Canvas {
     fn add_point(&mut self, shape: Point);
     fn add_rect(&mut self, shape: Rect);
diff --git a/branches/try2/src/test/run-pass/issue-3683.rs b/branches/try2/src/test/run-pass/issue-3683.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[allow(default_methods)];
 
 trait Foo {
     fn a(&self) -> int;
diff --git a/branches/try2/src/test/run-pass/issue-3979-generics.rs b/branches/try2/src/test/run-pass/issue-3979-generics.rs
@@ -14,7 +14,6 @@ trait Positioned<S> {
   fn X(&self) -> S;
 }
 
-#[allow(default_methods)]
 trait Movable<S, T>: Positioned<T> {
   fn translate(&self, dx: T) {
     self.SetX(self.X() + dx);
diff --git a/branches/try2/src/test/run-pass/issue-3979.rs b/branches/try2/src/test/run-pass/issue-3979.rs
@@ -16,7 +16,6 @@ trait Positioned {
   fn X(&self) -> int;
 }
 
-#[allow(default_methods)]
 trait Movable: Positioned {
   fn translate(&mut self, dx: int) {
     let x = self.X();
diff --git a/branches/try2/src/test/run-pass/trait-default-method-bound-subst.rs b/branches/try2/src/test/run-pass/trait-default-method-bound-subst.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[allow(default_methods)];
 
 trait A<T> {
     fn g<U>(&self, x: T, y: U) -> (T, U) { (x, y) }
diff --git a/branches/try2/src/test/run-pass/trait-default-method-bound-subst2.rs b/branches/try2/src/test/run-pass/trait-default-method-bound-subst2.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[allow(default_methods)];
 
 trait A<T> {
     fn g(&self, x: T) -> T { x }
diff --git a/branches/try2/src/test/run-pass/trait-default-method-bound-subst3.rs b/branches/try2/src/test/run-pass/trait-default-method-bound-subst3.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[allow(default_methods)];
 
 trait A {
     fn g<T>(&self, x: T, y: T) -> (T, T) { (x, y) }
diff --git a/branches/try2/src/test/run-pass/trait-default-method-bound-subst4.rs b/branches/try2/src/test/run-pass/trait-default-method-bound-subst4.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[allow(default_methods)];
 
 trait A<T> {
     fn g(&self, x: uint) -> uint { x }
diff --git a/branches/try2/src/test/run-pass/trait-default-method-bound.rs b/branches/try2/src/test/run-pass/trait-default-method-bound.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[allow(default_methods)];
 
 trait A {
     fn g(&self) -> int { 10 }
diff --git a/branches/try2/src/test/run-pass/trait-default-method-xc.rs b/branches/try2/src/test/run-pass/trait-default-method-xc.rs
@@ -1,7 +1,6 @@
 // xfail-fast
 // aux-build:trait_default_method_xc_aux.rs
 
-#[allow(default_methods)];
 
 extern mod aux(name = "trait_default_method_xc_aux");
 use aux::{A, TestEquality, Something};
diff --git a/branches/try2/src/test/run-pass/trait-with-bounds-default.rs b/branches/try2/src/test/run-pass/trait-with-bounds-default.rs
@@ -15,7 +15,6 @@ pub trait Clone2 {
     fn clone(&self) -> Self;
 }
 
-#[allow(default_methods)]
 trait Getter<T: Clone> {
     fn do_get(&self) -> T;
 
diff --git a/branches/try2/src/test/run-pass/traits-default-method-macro.rs b/branches/try2/src/test/run-pass/traits-default-method-macro.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[allow(default_methods)];
 
 trait Foo {
     fn bar(&self) -> ~str {
diff --git a/branches/try2/src/test/run-pass/traits-default-method-mut.rs b/branches/try2/src/test/run-pass/traits-default-method-mut.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[allow(default_methods)];
 
 trait Foo {
     fn foo(&self, mut v: int) { v = 1; }
diff --git a/branches/try2/src/test/run-pass/traits-default-method-self.rs b/branches/try2/src/test/run-pass/traits-default-method-self.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[allow(default_methods)];
 
 trait Cat {
     fn meow(&self) -> bool;
diff --git a/branches/try2/src/test/run-pass/traits-default-method-trivial.rs b/branches/try2/src/test/run-pass/traits-default-method-trivial.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[allow(default_methods)];
 
 trait Cat {
     fn meow(&self) -> bool;

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ trait Positioned {`
`18`	`18`	`fn X(&self) -> int;`
`19`	`19`	`}`
`20`	`20`
`21`		`-#[allow(default_methods)]`
`22`	`21`	`trait Movable: Positioned {`
`23`	`22`	`fn translate(&self, dx: int) {`
`24`	`23`	`self.SetX(self.X() + dx);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#[allow(default_methods)];`
`2`	`1`
`3`	`2`	`pub struct Something { x: int }`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ trait Positioned<S> {`
`14`	`14`	`fn X(&self) -> S;`
`15`	`15`	`}`
`16`	`16`
`17`		`-#[allow(default_methods)]`
`18`	`17`	`trait Movable<S, T>: Positioned<T> {`
`19`	`18`	`fn translate(&self, dx: T) {`
`20`	`19`	`self.SetX(self.X() + dx);`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ trait Positioned {`
`16`	`16`	`fn X(&self) -> int;`
`17`	`17`	`}`
`18`	`18`
`19`		`-#[allow(default_methods)]`
`20`	`19`	`trait Movable: Positioned {`
`21`	`20`	`fn translate(&mut self, dx: int) {`
`22`	`21`	`let x = self.X();`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ pub trait Clone2 {`
`15`	`15`	`fn clone(&self) -> Self;`
`16`	`16`	`}`
`17`	`17`
`18`		`-#[allow(default_methods)]`
`19`	`18`	`trait Getter<T: Clone> {`
`20`	`19`	`fn do_get(&self) -> T;`
`21`	`20`