Skip to content

Commit

Permalink
librustc: Add a lint mode for deprecated self. r=brson
Browse files Browse the repository at this point in the history
  • Loading branch information
pcwalton committed Dec 15, 2012
1 parent 41c0d70 commit ebd9ad4
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 0 deletions.
42 changes: 42 additions & 0 deletions src/librustc/middle/lint.rs
Expand Up @@ -66,6 +66,7 @@ enum lint {
structural_records,
type_limits,
default_methods,
deprecated_self,

managed_heap_memory,
owned_heap_memory,
Expand Down Expand Up @@ -208,6 +209,11 @@ fn get_lint_dict() -> lint_dict {
desc: ~"allow default methods",
default: forbid}),

(~"deprecated_self",
@{lint: deprecated_self,
desc: ~"warn about deprecated uses of `self`",
default: allow}),

/* FIXME(#3266)--make liveness warnings lintable
(~"unused_variable",
@{lint: unused_variable,
Expand Down Expand Up @@ -421,6 +427,7 @@ fn check_item(i: @ast::item, cx: ty::ctxt) {
check_item_deprecated_modes(cx, i);
check_item_type_limits(cx, i);
check_item_default_methods(cx, i);
check_item_deprecated_self(cx, i);
}

// Take a visitor, and modify it so that it will not proceed past subitems.
Expand Down Expand Up @@ -591,6 +598,41 @@ fn check_item_default_methods(cx: ty::ctxt, item: @ast::item) {
}
}

fn check_item_deprecated_self(cx: ty::ctxt, item: @ast::item) {
fn maybe_warn(cx: ty::ctxt,
item: @ast::item,
self_ty: ast::self_ty) {
cx.sess.span_lint(
deprecated_self,
item.id,
item.id,
self_ty.span,
~"this method form is deprecated; use an explicit `self` \
parameter or mark the method as static");
}

match item.node {
ast::item_trait(_, _, methods) => {
for methods.each |method| {
match *method {
ast::required(ty_method) => {
maybe_warn(cx, item, ty_method.self_ty);
}
ast::provided(method) => {
maybe_warn(cx, item, method.self_ty);
}
}
}
}
ast::item_impl(_, _, _, methods) => {
for methods.each |method| {
maybe_warn(cx, item, method.self_ty);
}
}
_ => {}
}
}

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) {
Expand Down
20 changes: 20 additions & 0 deletions src/test/compile-fail/lint-deprecated-self.rs
@@ -0,0 +1,20 @@
#[forbid(deprecated_self)]
mod a {
trait T {
fn f(); //~ ERROR this method form is deprecated
}

struct S {
x: int
}

impl S : T {
fn f() { //~ ERROR this method form is deprecated
}
}
}

fn main() {
}


0 comments on commit ebd9ad4

Please sign in to comment.