---

yaml
---
r: 39407
b: refs/heads/incoming
c: 99fa9c3
h: refs/heads/master
i:
  39405: e77c00e
  39403: 9c2860d
  39399: 26537ca
  39391: dc35d16
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 593f4142548100f9d37909ca10df35615a91abec
+refs/heads/incoming: 99fa9c3cabda81a4121a12d497589da10b909ac7
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -65,7 +65,6 @@ enum lint {
     non_camel_case_types,
     structural_records,
     type_limits,
-    default_methods,
 
     managed_heap_memory,
     owned_heap_memory,
@@ -201,12 +200,7 @@ fn get_lint_dict() -> lint_dict {
         (~"type_limits",
          @{lint: type_limits,
            desc: ~"comparisons made useless by limits of the types involved",
-           default: warn}),
-
-        (~"default_methods",
-         @{lint: default_methods,
-           desc: ~"allow default methods",
-           default: forbid}),
+           default: warn})
 
         /* FIXME(#3266)--make liveness warnings lintable
         (~"unused_variable",
@@ -420,7 +414,6 @@ fn check_item(i: @ast::item, cx: ty::ctxt) {
     check_item_structural_records(cx, i);
     check_item_deprecated_modes(cx, i);
     check_item_type_limits(cx, i);
-    check_item_default_methods(cx, i);
 }
 
 // Take a visitor, and modify it so that it will not proceed past subitems.
@@ -570,27 +563,6 @@ fn check_item_type_limits(cx: ty::ctxt, it: @ast::item) {
     visit::visit_item(it, (), visit);
 }
 
-fn check_item_default_methods(cx: ty::ctxt, item: @ast::item) {
-    match item.node {
-        ast::item_trait(_, _, methods) => {
-            for methods.each |method| {
-                match *method {
-                    ast::required(*) => {}
-                    ast::provided(*) => {
-                        cx.sess.span_lint(
-                            default_methods,
-                            item.id,
-                            item.id,
-                            item.span,
-                            ~"default methods are experimental");
-                    }
-                }
-            }
-        }
-        _ => {}
-    }
-}
-
 fn check_item_structural_records(cx: ty::ctxt, it: @ast::item) {
     let visit = item_stopping_visitor(visit::mk_simple_visitor(@{
         visit_expr: fn@(e: @ast::expr) {