---

yaml
---
r: 93885
b: refs/heads/try
c: 37f2f71
h: refs/heads/master
i:
  93883: 6209d06
v: v3

Author: klutzy

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: 365c44cb2d7dc224af68cf870bd263d753a0690c
+refs/heads/try: 37f2f7173b93e775eafd63c4f4976b42cafa3b9a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

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

@@ -798,36 +798,65 @@ fn check_heap_item(cx: &Context, it: &ast::item) {
     }
 }
 
-// check if crate-level attribute is used on item,
-// since it is usually caused by mistake of semicolon omission.
-// also make error on obsolete attributes for less confusion.
-fn check_item_attribute_usage(cx: &Context, it: &ast::item) {
-    let crate_attrs = ["crate_type", "link", "feature", "no_uv", "no_main", "no_std"];
+fn check_attrs_usage(cx: &Context, attrs: &[ast::Attribute]) {
+    // check if element has crate-level, obsolete, or any unknown attributes.
+
+    let crate_attrs = [
+        "crate_type", "link", "feature", "no_uv", "no_main", "no_std",
+        "comment", "license", "copyright", // not used in rustc now
+    ];
+
     let obsolete_attrs = [
         ("abi", "extern \"abi\" fn"),
         ("auto_encode", "#[deriving(Encodable)]"),
         ("auto_decode", "#[deriving(Decodable)]"),
     ];
 
-    for attr in it.attrs.iter() {
+    let other_attrs = [
+        // item-level
+        "address_insignificant", // can be crate-level too
+        "allow", "deny", "forbid", "warn", // lint options
+        "deprecated", "experimental", "unstable", "stable", "locked", "frozen", //item stability
+        "crate_map", "cfg", "doc", "export_name", "link_section", "no_freeze",
+        "no_mangle", "no_send", "static_assert", "unsafe_no_drop_flag",
+        "packed", "simd", "repr", "deriving", "unsafe_destructor",
+
+        // mod-level
+        "path", "link_name", "link_args", "nolink", "macro_escape", "no_implicit_prelude",
+
+        // fn-level
+        "test", "bench", "should_fail", "ignore", "inline", "lang", "main", "start",
+        "fixed_stack_segment", "no_split_stack", "rust_stack", "cold",
+
+        // internal attribute: bypass privacy inside items
+        "!resolve_unexported",
+    ];
+
+    for attr in attrs.iter() {
         let name = attr.node.value.name();
         for crate_attr in crate_attrs.iter() {
             if name.equiv(crate_attr) {
                 let msg = match attr.node.style {
-                    ast::AttrOuter  => "crate-level attribute should be an inner attribute: \
-                                   add semicolon at end",
+                    ast::AttrOuter => "crate-level attribute should be an inner attribute: \
+                                       add semicolon at end",
                     ast::AttrInner => "crate-level attribute should be in the root module",
                 };
                 cx.span_lint(attribute_usage, attr.span, msg);
+                return;
             }
         }
 
         for &(obs_attr, obs_alter) in obsolete_attrs.iter() {
             if name.equiv(&obs_attr) {
                 cx.span_lint(attribute_usage, attr.span,
                              format!("obsolete attribute: use `{:s}` instead", obs_alter));
+                return;
             }
         }
+
+        if !other_attrs.iter().any(|other_attr| { name.equiv(other_attr) }) {
+            cx.span_lint(attribute_usage, attr.span, "unknown attribute");
+        }
     }
 }
 
@@ -1151,7 +1180,7 @@ impl<'self> Visitor<()> for Context<'self> {
             check_item_non_uppercase_statics(cx, it);
             check_heap_item(cx, it);
             check_missing_doc_item(cx, it);
-            check_item_attribute_usage(cx, it);
+            check_attrs_usage(cx, it.attrs);
 
             do cx.visit_ids |v| {
                 v.visit_item(it, ());
@@ -1161,6 +1190,20 @@ impl<'self> Visitor<()> for Context<'self> {
         }
     }
 
+    fn visit_foreign_item(&mut self, it: @ast::foreign_item, _: ()) {
+        do self.with_lint_attrs(it.attrs) |cx| {
+            check_attrs_usage(cx, it.attrs);
+            visit::walk_foreign_item(cx, it, ());
+        }
+    }
+
+    fn visit_view_item(&mut self, i: &ast::view_item, _: ()) {
+        do self.with_lint_attrs(i.attrs) |cx| {
+            check_attrs_usage(cx, i.attrs);
+            visit::walk_view_item(cx, i, ());
+        }
+    }
+
     fn visit_pat(&mut self, p: &ast::Pat, _: ()) {
         check_pat_non_uppercase_statics(self, p);
         check_unused_mut_pat(self, p);
@@ -1210,6 +1253,7 @@ impl<'self> Visitor<()> for Context<'self> {
             visit::fk_method(_, _, m) => {
                 do self.with_lint_attrs(m.attrs) |cx| {
                     check_missing_doc_method(cx, m);
+                    check_attrs_usage(cx, m.attrs);
 
                     do cx.visit_ids |v| {
                         v.visit_fn(fk, decl, body, span, id, ());
@@ -1221,9 +1265,11 @@ impl<'self> Visitor<()> for Context<'self> {
         }
     }
 
+
     fn visit_ty_method(&mut self, t: &ast::TypeMethod, _: ()) {
         do self.with_lint_attrs(t.attrs) |cx| {
             check_missing_doc_ty_method(cx, t);
+            check_attrs_usage(cx, t.attrs);
 
             visit::walk_ty_method(cx, t, ());
         }
@@ -1244,6 +1290,7 @@ impl<'self> Visitor<()> for Context<'self> {
     fn visit_struct_field(&mut self, s: @ast::struct_field, _: ()) {
         do self.with_lint_attrs(s.node.attrs) |cx| {
             check_missing_doc_struct_field(cx, s);
+            check_attrs_usage(cx, s.node.attrs);
 
             visit::walk_struct_field(cx, s, ());
         }
@@ -1252,6 +1299,7 @@ impl<'self> Visitor<()> for Context<'self> {
     fn visit_variant(&mut self, v: &ast::variant, g: &ast::Generics, _: ()) {
         do self.with_lint_attrs(v.node.attrs) |cx| {
             check_missing_doc_variant(cx, v);
+            check_attrs_usage(cx, v.node.attrs);
 
             visit::walk_variant(cx, v, g, ());
         }