From 3fa5203273ad5a88b20b77b83a7a2e42cbcc3602 Mon Sep 17 00:00:00 2001
From: Michael Sullivan <sully@msully.net>
Date: Thu, 11 Jul 2013 14:09:42 -0700
Subject: [PATCH] Take default methods out from behind the flag.

---
 src/librustc/middle/lint.rs                            | 2 +-
 src/libstd/iterator.rs                                 | 2 +-
 src/test/auxiliary/issue_3979_traits.rs                | 1 -
 src/test/auxiliary/trait_default_method_xc_aux.rs      | 1 -
 src/test/run-pass/bug-7183-generics.rs                 | 1 -
 src/test/run-pass/bug-7295.rs                          | 1 -
 src/test/run-pass/default-method-simple.rs             | 1 -
 src/test/run-pass/issue-3563-2.rs                      | 1 -
 src/test/run-pass/issue-3563-3.rs                      | 1 -
 src/test/run-pass/issue-3683.rs                        | 1 -
 src/test/run-pass/issue-3979-generics.rs               | 1 -
 src/test/run-pass/issue-3979.rs                        | 1 -
 src/test/run-pass/trait-default-method-bound-subst.rs  | 1 -
 src/test/run-pass/trait-default-method-bound-subst2.rs | 1 -
 src/test/run-pass/trait-default-method-bound-subst3.rs | 1 -
 src/test/run-pass/trait-default-method-bound-subst4.rs | 1 -
 src/test/run-pass/trait-default-method-bound.rs        | 1 -
 src/test/run-pass/trait-default-method-xc.rs           | 1 -
 src/test/run-pass/trait-with-bounds-default.rs         | 1 -
 src/test/run-pass/traits-default-method-macro.rs       | 1 -
 src/test/run-pass/traits-default-method-mut.rs         | 1 -
 src/test/run-pass/traits-default-method-self.rs        | 1 -
 src/test/run-pass/traits-default-method-trivial.rs     | 1 -
 23 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/librustc/middle/lint.rs b/src/librustc/middle/lint.rs
index 0fc19ffd78e5..bd942f62032b 100644
--- a/src/librustc/middle/lint.rs
+++ b/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/src/libstd/iterator.rs b/src/libstd/iterator.rs
index a17fea24b2c2..b9593d845a4c 100644
--- a/src/libstd/iterator.rs
+++ b/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/src/test/auxiliary/issue_3979_traits.rs b/src/test/auxiliary/issue_3979_traits.rs
index bf3167f60511..1e56dab1559c 100644
--- a/src/test/auxiliary/issue_3979_traits.rs
+++ b/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/src/test/auxiliary/trait_default_method_xc_aux.rs b/src/test/auxiliary/trait_default_method_xc_aux.rs
index 6bd679f1304d..4d910385cd68 100644
--- a/src/test/auxiliary/trait_default_method_xc_aux.rs
+++ b/src/test/auxiliary/trait_default_method_xc_aux.rs
@@ -1,4 +1,3 @@
-#[allow(default_methods)];
 
 pub struct Something { x: int }
 
diff --git a/src/test/run-pass/bug-7183-generics.rs b/src/test/run-pass/bug-7183-generics.rs
index 532b2312a987..52264da2e80b 100644
--- a/src/test/run-pass/bug-7183-generics.rs
+++ b/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/src/test/run-pass/bug-7295.rs b/src/test/run-pass/bug-7295.rs
index 080a0dbd91a7..2a1a0e35c56e 100644
--- a/src/test/run-pass/bug-7295.rs
+++ b/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/src/test/run-pass/default-method-simple.rs b/src/test/run-pass/default-method-simple.rs
index 378852d81503..4072d1d2bb83 100644
--- a/src/test/run-pass/default-method-simple.rs
+++ b/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/src/test/run-pass/issue-3563-2.rs b/src/test/run-pass/issue-3563-2.rs
index 7d0ba866faf3..0b49e43235ae 100644
--- a/src/test/run-pass/issue-3563-2.rs
+++ b/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/src/test/run-pass/issue-3563-3.rs b/src/test/run-pass/issue-3563-3.rs
index a24800e4dbb2..2465cd3dd592 100644
--- a/src/test/run-pass/issue-3563-3.rs
+++ b/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/src/test/run-pass/issue-3683.rs b/src/test/run-pass/issue-3683.rs
index 0072439935b2..aa7fa0cb5f04 100644
--- a/src/test/run-pass/issue-3683.rs
+++ b/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/src/test/run-pass/issue-3979-generics.rs b/src/test/run-pass/issue-3979-generics.rs
index 5884a35a1a10..2a1ded96827d 100644
--- a/src/test/run-pass/issue-3979-generics.rs
+++ b/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/src/test/run-pass/issue-3979.rs b/src/test/run-pass/issue-3979.rs
index beffea1dbf36..fe10dd5af53d 100644
--- a/src/test/run-pass/issue-3979.rs
+++ b/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/src/test/run-pass/trait-default-method-bound-subst.rs b/src/test/run-pass/trait-default-method-bound-subst.rs
index 9dbbcee0f770..ff0c23b2eed7 100644
--- a/src/test/run-pass/trait-default-method-bound-subst.rs
+++ b/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/src/test/run-pass/trait-default-method-bound-subst2.rs b/src/test/run-pass/trait-default-method-bound-subst2.rs
index dee9782d5ae7..1ea3879e7faf 100644
--- a/src/test/run-pass/trait-default-method-bound-subst2.rs
+++ b/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/src/test/run-pass/trait-default-method-bound-subst3.rs b/src/test/run-pass/trait-default-method-bound-subst3.rs
index cb86736b79da..aff20ffe962a 100644
--- a/src/test/run-pass/trait-default-method-bound-subst3.rs
+++ b/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/src/test/run-pass/trait-default-method-bound-subst4.rs b/src/test/run-pass/trait-default-method-bound-subst4.rs
index d386fd44b6b1..4804dc273479 100644
--- a/src/test/run-pass/trait-default-method-bound-subst4.rs
+++ b/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/src/test/run-pass/trait-default-method-bound.rs b/src/test/run-pass/trait-default-method-bound.rs
index ce2df508f70e..8a2f1b1743b0 100644
--- a/src/test/run-pass/trait-default-method-bound.rs
+++ b/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/src/test/run-pass/trait-default-method-xc.rs b/src/test/run-pass/trait-default-method-xc.rs
index f31b46c33398..38b386838a1b 100644
--- a/src/test/run-pass/trait-default-method-xc.rs
+++ b/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/src/test/run-pass/trait-with-bounds-default.rs b/src/test/run-pass/trait-with-bounds-default.rs
index b3ddbbb9dc11..689df437fb4b 100644
--- a/src/test/run-pass/trait-with-bounds-default.rs
+++ b/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/src/test/run-pass/traits-default-method-macro.rs b/src/test/run-pass/traits-default-method-macro.rs
index b25f345b9dec..a78177ea892d 100644
--- a/src/test/run-pass/traits-default-method-macro.rs
+++ b/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/src/test/run-pass/traits-default-method-mut.rs b/src/test/run-pass/traits-default-method-mut.rs
index 3286c4ef5935..fee766464582 100644
--- a/src/test/run-pass/traits-default-method-mut.rs
+++ b/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/src/test/run-pass/traits-default-method-self.rs b/src/test/run-pass/traits-default-method-self.rs
index 65009bb716d6..1027008624a2 100644
--- a/src/test/run-pass/traits-default-method-self.rs
+++ b/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/src/test/run-pass/traits-default-method-trivial.rs b/src/test/run-pass/traits-default-method-trivial.rs
index 998d8f8946f1..c6a7ab5ba496 100644
--- a/src/test/run-pass/traits-default-method-trivial.rs
+++ b/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;