---

yaml
---
r: 143253
b: refs/heads/try2
c: 4517e39
h: refs/heads/master
i:
  143251: 361896f
v: v3

Author: thestinger

[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: ce1db94647fc82e0625a74fbf9670a7517aba996
+refs/heads/try2: 4517e3912581a0709d5862101e19896e57afc22c
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/lint.rs

@@ -79,7 +79,6 @@ pub enum lint {
     non_camel_case_types,
     non_uppercase_statics,
     type_limits,
-    default_methods,
     unused_unsafe,
 
     managed_heap_memory,
@@ -222,13 +221,6 @@ static lint_table: &'static [(&'static str, LintSpec)] = &[
         default: warn
      }),
 
-    ("default_methods",
-     LintSpec {
-        lint: default_methods,
-        desc: "allow default methods",
-        default: allow
-     }),
-
     ("unused_unsafe",
      LintSpec {
         lint: unused_unsafe,
@@ -690,23 +682,6 @@ fn lint_type_limits() -> visit::vt<@mut Context> {
     })
 }
 
-fn check_item_default_methods(cx: &Context, item: &ast::item) {
-    match item.node {
-        ast::item_trait(_, _, ref methods) => {
-            for methods.iter().advance |method| {
-                match *method {
-                    ast::required(*) => {}
-                    ast::provided(*) => {
-                        cx.span_lint(default_methods, item.span,
-                                     "default methods are experimental");
-                    }
-                }
-            }
-        }
-        _ => {}
-    }
-}
-
 fn check_item_ctypes(cx: &Context, it: &ast::item) {
     fn check_ty(cx: &Context, ty: &ast::Ty) {
         match ty.node {
@@ -1143,7 +1118,6 @@ pub fn check_crate(tcx: ty::ctxt, crate: @ast::Crate) {
                     check_item_ctypes(cx, it);
                     check_item_non_camel_case_types(cx, it);
                     check_item_non_uppercase_statics(cx, it);
-                    check_item_default_methods(cx, it);
                     check_item_heap(cx, it);
 
                     cx.process(Item(it));

branches/try2/src/libstd/cmp.rs

@@ -21,7 +21,6 @@ and `Eq` to overload the `==` and `!=` operators.
 */
 
 #[allow(missing_doc)];
-#[allow(default_methods)]; // NOTE: Remove when allowed in stage0
 
 /**
 * Trait for values that can be compared for equality and inequality.

branches/try2/src/libstd/iterator.rs

@@ -17,8 +17,6 @@ implementing the `Iterator` trait.
 
 */
 
-#[allow(default_methods)]; // still off by default in stage0
-
 use cmp;
 use iter::Times;
 use num::{Zero, One};

branches/try2/src/test/compile-fail/lint-default-methods.rs

@@ -10,8 +10,6 @@
 
 // compile-flags:-Z debug-info
 
-#[allow(default_methods)];
-
 pub trait TraitWithDefaultMethod {
     pub fn method(self) {
         ()
@@ -24,4 +22,4 @@ impl TraitWithDefaultMethod for MyStruct { }
 
 fn main() {
     MyStruct.method();
-}
+}