---

yaml
---
r: 36638
b: refs/heads/try2
c: a0d7b96
h: refs/heads/master
v: v3

Author: luqmana

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: a7f29b34989284f4ab604ad8a742dfffcf367c97
+refs/heads/try2: a0d7b961706f1f808e7dd244e8bbd9515c073196
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/librustc/middle/lint.rs

@@ -60,6 +60,7 @@ enum lint {
     unrecognized_lint,
     non_implicitly_copyable_typarams,
     vecs_implicitly_copyable,
+    deprecated_item,
     deprecated_mode,
     deprecated_pattern,
     non_camel_case_types,
@@ -157,6 +158,11 @@ 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",
@@ -412,6 +418,7 @@ 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);
 }
@@ -767,6 +774,26 @@ 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/try2/src/libsyntax/attr.rs

@@ -182,7 +182,7 @@ fn find_attrs_by_name(attrs: ~[ast::attribute], name: ~str) ->
     return vec::filter_map(attrs, filter);
 }
 
-/// Searcha list of meta items and return only those with a specific name
+/// Search a 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> {

branches/try2/src/test/auxiliary/crate-method-reexport-grrrrrrr2.rs

@@ -22,7 +22,9 @@ mod name_pool {
 mod rust {
     #[legacy_exports];
 
-    use name_pool::add;
+    import name_pool::add;
+    // FIXME #3155: this is a hack
+    import name_pool::__extensions__;
     export add;
     export rt;
     export cx;

branches/try2/src/test/compile-fail/bad-for-loop.rs

@@ -1,4 +1,4 @@
 fn main() {
-    fn baz(_x: fn(y: int) -> int) {}
+    fn baz(_x: fn() -> int) {}
     for baz |_e| { } //~ ERROR should return `bool`
 }

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

@@ -0,0 +1,10 @@
+#[forbid(deprecated_item)];
+
+type Bar = uint;
+
+#[deprecated = "use Bar instead"]
+type Foo = int;
+
+fn main() {
+    let _x: Foo = 21;
+}

branches/try2/src/test/run-pass/crate-method-reexport-grrrrrrr.rs

@@ -2,14 +2,15 @@
 // name_pool::methods impl in the other crate is reachable from this
 // crate.
 
+// xfail-test
 // xfail-fast
 // aux-build:crate-method-reexport-grrrrrrr2.rs
 
-extern mod crate_method_reexport_grrrrrrr2;
+use crate_method_reexport_grrrrrrr2;
 
 fn main() {
-    use crate_method_reexport_grrrrrrr2::rust::add;
-    use crate_method_reexport_grrrrrrr2::rust::cx;
+    import crate_method_reexport_grrrrrrr2::rust::add;
+    import crate_method_reexport_grrrrrrr2::rust::cx;
     let x = @();
     x.cx();
     let y = ();