Skip to content

Commit 94a7684

Browse files
committed
Revert "Merge pull request #4144 from luqmana/deprecated-attribute"
This reverts commit f675b97, reversing changes made to e7dd3af.
1 parent 1abad3b commit 94a7684

File tree

3 files changed

+1
-38
lines changed

3 files changed

+1
-38
lines changed

src/librustc/middle/lint.rs

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ enum lint {
6060
unrecognized_lint,
6161
non_implicitly_copyable_typarams,
6262
vecs_implicitly_copyable,
63-
deprecated_item,
6463
deprecated_mode,
6564
deprecated_pattern,
6665
non_camel_case_types,
@@ -158,11 +157,6 @@ fn get_lint_dict() -> lint_dict {
158157
desc: ~"implicit copies of non implicitly copyable data",
159158
default: warn}),
160159

161-
(~"deprecated_item",
162-
@{lint: deprecated_item,
163-
desc: ~"warn about items marked deprecated",
164-
default: warn}),
165-
166160
(~"deprecated_mode",
167161
@{lint: deprecated_mode,
168162
desc: ~"warn about deprecated uses of modes",
@@ -418,7 +412,6 @@ fn check_item(i: @ast::item, cx: ty::ctxt) {
418412
check_item_non_camel_case_types(cx, i);
419413
check_item_heap(cx, i);
420414
check_item_structural_records(cx, i);
421-
check_item_deprecated(cx, i);
422415
check_item_deprecated_modes(cx, i);
423416
check_item_type_limits(cx, i);
424417
}
@@ -774,26 +767,6 @@ fn check_item_non_camel_case_types(cx: ty::ctxt, it: @ast::item) {
774767
}
775768
}
776769

777-
fn check_item_deprecated(tcx: ty::ctxt, it: @ast::item) {
778-
let at = attr::find_attrs_by_name(it.attrs, ~"deprecated");
779-
780-
if at.is_not_empty() {
781-
for at.each |attr| {
782-
let fmt = match attr.node.value.node {
783-
ast::meta_name_value(_, ref l) =>
784-
match l.node {
785-
ast::lit_str(ref reason) =>
786-
fmt!("deprecated: %s", **reason),
787-
_ => ~"item is deprecated"
788-
},
789-
_ => ~"item is deprecated"
790-
};
791-
tcx.sess.span_lint(deprecated_item, it.id, it.id, it.span,
792-
fmt);
793-
}
794-
}
795-
}
796-
797770
fn check_fn(tcx: ty::ctxt, fk: visit::fn_kind, decl: ast::fn_decl,
798771
_body: ast::blk, span: span, id: ast::node_id) {
799772
debug!("lint check_fn fk=%? id=%?", fk, id);

src/libsyntax/attr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ fn find_attrs_by_name(attrs: ~[ast::attribute], name: ~str) ->
182182
return vec::filter_map(attrs, filter);
183183
}
184184

185-
/// Search a list of meta items and return only those with a specific name
185+
/// Searcha list of meta items and return only those with a specific name
186186
fn find_meta_items_by_name(metas: ~[@ast::meta_item], name: ~str) ->
187187
~[@ast::meta_item] {
188188
let filter = fn@(m: &@ast::meta_item) -> Option<@ast::meta_item> {

src/test/compile-fail/lint-deprecated-items.rs

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

0 commit comments

Comments
 (0)