---

yaml
---
r: 34047
b: refs/heads/snap-stage3
c: 94a7684
h: refs/heads/master
i:
  34045: dedde9d
  34043: c979395
  34039: f9c17b8
  34031: 0751a17
  34015: e435b36
  33983: d333716
  33919: ecb866d
  33791: ee7a913
v: v3

Author: catamorphism

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 1abad3b4e6e30af2ae45dce5e17e91da31d73300
+refs/heads/snap-stage3: 94a76843f4e3d1c2054565593f39a2b75d69cf1a
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/lint.rs

@@ -60,7 +60,6 @@ enum lint {
     unrecognized_lint,
     non_implicitly_copyable_typarams,
     vecs_implicitly_copyable,
-    deprecated_item,
     deprecated_mode,
     deprecated_pattern,
     non_camel_case_types,
@@ -158,11 +157,6 @@ fn get_lint_dict() -> lint_dict {
            desc: ~"implicit copies of non implicitly copyable data",
            default: warn}),
 
-        (~"deprecated_item",
-         @{lint: deprecated_item,
-           desc: ~"warn about items marked deprecated",
-           default: warn}),
-
         (~"deprecated_mode",
          @{lint: deprecated_mode,
            desc: ~"warn about deprecated uses of modes",
@@ -418,7 +412,6 @@ fn check_item(i: @ast::item, cx: ty::ctxt) {
     check_item_non_camel_case_types(cx, i);
     check_item_heap(cx, i);
     check_item_structural_records(cx, i);
-    check_item_deprecated(cx, i);
     check_item_deprecated_modes(cx, i);
     check_item_type_limits(cx, i);
 }
@@ -774,26 +767,6 @@ fn check_item_non_camel_case_types(cx: ty::ctxt, it: @ast::item) {
     }
 }
 
-fn check_item_deprecated(tcx: ty::ctxt, it: @ast::item) {
-    let at = attr::find_attrs_by_name(it.attrs, ~"deprecated");
-
-    if at.is_not_empty() {
-        for at.each |attr| {
-            let fmt = match attr.node.value.node {
-                ast::meta_name_value(_, ref l) =>
-                    match l.node {
-                        ast::lit_str(ref reason) =>
-                            fmt!("deprecated: %s", **reason),
-                        _ =>  ~"item is deprecated"
-                    },
-                _ => ~"item is deprecated"
-            };
-            tcx.sess.span_lint(deprecated_item, it.id, it.id, it.span,
-                fmt);
-        }
-    }
-}
-
 fn check_fn(tcx: ty::ctxt, fk: visit::fn_kind, decl: ast::fn_decl,
             _body: ast::blk, span: span, id: ast::node_id) {
     debug!("lint check_fn fk=%? id=%?", fk, id);

branches/snap-stage3/src/libsyntax/attr.rs

@@ -182,7 +182,7 @@ fn find_attrs_by_name(attrs: ~[ast::attribute], name: ~str) ->
     return vec::filter_map(attrs, filter);
 }
 
-/// Search a list of meta items and return only those with a specific name
+/// Searcha list of meta items and return only those with a specific name
 fn find_meta_items_by_name(metas: ~[@ast::meta_item], name: ~str) ->
    ~[@ast::meta_item] {
     let filter = fn@(m: &@ast::meta_item) -> Option<@ast::meta_item> {