---

yaml
---
r: 40731
b: refs/heads/dist-snap
c: 3f7b112
h: refs/heads/master
i:
  40729: 47628b5
  40727: a9982e4
v: v3

Author: catamorphism

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: 4b4c8331bbdb3181fa87cfd90c665918e3834558
+refs/heads/dist-snap: 3f7b112b161dd77d5095417856df327aa50179f4
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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/dist-snap/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> {

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

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

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

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