Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

librustc: Add a lint mode for deprecated self #4197

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 43 additions & 1 deletion src/librustc/middle/lint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ enum lint {
non_camel_case_types,
structural_records,
type_limits,
deprecated_self,

managed_heap_memory,
owned_heap_memory,
Expand Down Expand Up @@ -200,7 +201,12 @@ fn get_lint_dict() -> lint_dict {
(~"type_limits",
@{lint: type_limits,
desc: ~"comparisons made useless by limits of the types involved",
default: warn})
default: warn}),

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

/* FIXME(#3266)--make liveness warnings lintable
(~"unused_variable",
Expand Down Expand Up @@ -414,6 +420,7 @@ 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_deprecated_self(cx, i);
}

// Take a visitor, and modify it so that it will not proceed past subitems.
Expand Down Expand Up @@ -563,6 +570,41 @@ fn check_item_type_limits(cx: ty::ctxt, it: @ast::item) {
visit::visit_item(it, (), visit);
}

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
Original file line number Diff line number Diff line change
@@ -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() {
}