Skip to content

Commit 99fa9c3

Browse files
committed
Revert "librustc: Implement a lint mode for default methods"
This reverts commit 53b181d.
1 parent 593f414 commit 99fa9c3

File tree

2 files changed

+1
-37
lines changed

2 files changed

+1
-37
lines changed

src/librustc/middle/lint.rs

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ enum lint {
6565
non_camel_case_types,
6666
structural_records,
6767
type_limits,
68-
default_methods,
6968

7069
managed_heap_memory,
7170
owned_heap_memory,
@@ -201,12 +200,7 @@ fn get_lint_dict() -> lint_dict {
201200
(~"type_limits",
202201
@{lint: type_limits,
203202
desc: ~"comparisons made useless by limits of the types involved",
204-
default: warn}),
205-
206-
(~"default_methods",
207-
@{lint: default_methods,
208-
desc: ~"allow default methods",
209-
default: forbid}),
203+
default: warn})
210204

211205
/* FIXME(#3266)--make liveness warnings lintable
212206
(~"unused_variable",
@@ -420,7 +414,6 @@ fn check_item(i: @ast::item, cx: ty::ctxt) {
420414
check_item_structural_records(cx, i);
421415
check_item_deprecated_modes(cx, i);
422416
check_item_type_limits(cx, i);
423-
check_item_default_methods(cx, i);
424417
}
425418

426419
// 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) {
570563
visit::visit_item(it, (), visit);
571564
}
572565

573-
fn check_item_default_methods(cx: ty::ctxt, item: @ast::item) {
574-
match item.node {
575-
ast::item_trait(_, _, methods) => {
576-
for methods.each |method| {
577-
match *method {
578-
ast::required(*) => {}
579-
ast::provided(*) => {
580-
cx.sess.span_lint(
581-
default_methods,
582-
item.id,
583-
item.id,
584-
item.span,
585-
~"default methods are experimental");
586-
}
587-
}
588-
}
589-
}
590-
_ => {}
591-
}
592-
}
593-
594566
fn check_item_structural_records(cx: ty::ctxt, it: @ast::item) {
595567
let visit = item_stopping_visitor(visit::mk_simple_visitor(@{
596568
visit_expr: fn@(e: @ast::expr) {

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

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)