---

yaml
---
r: 208863
b: refs/heads/snap-stage3
c: 96e1cf3
h: refs/heads/master
i:
  208861: a5c63d6
  208859: 7597a26
  208855: 9f9e4c5
  208847: 60f4d36
  208831: ff0c884
v: v3

Author: Manishearth

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 38a97becdf3e6a6157f6f7ec2d98ade8d8edc193
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: d46eef9cf3bf2f1a4ca5448c7f02e3c749e73bd9
+refs/heads/snap-stage3: 96e1cf3b0693e5724797abd566bd4913be4f6d79
 refs/heads/try: 7b4ef47b7805a402d756fb8157101f64880a522f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/librustc/plugin/registry.rs

@@ -139,17 +139,14 @@ impl<'a> Registry<'a> {
 
     /// Register an attribute with an attribute type
     ///
-    /// Registered attributes will bypass the `custom_attribute` feature gate
-    ///
+    /// Registered attributes will bypass the `custom_attribute` feature gate.
     /// `Whitelisted` attributes will additionally not trigger the `unused_attribute`
-    /// lint
-    ///
-    /// `CrateLevel` attributes will not be allowed on anything other than a crate
+    /// lint. `CrateLevel` attributes will not be allowed on anything other than a crate.
     pub fn register_attribute(&mut self, name: String, ty: AttributeType) {
         if let AttributeType::Gated(..) = ty {
-            self.sess.err("plugin tried to register a gated attribute. \
-                           Only `Normal`, `Whitelisted`, and `CrateLevel` \
-                           attributes are allowed");
+            self.sess.span_err(self.krate_span, "plugin tried to register a gated \
+                                                 attribute. Only `Normal`, `Whitelisted`, \
+                                                 and `CrateLevel` attributes are allowed");
         }
         self.attributes.push((name, ty));
     }

branches/snap-stage3/src/librustc_lint/builtin.rs

@@ -653,11 +653,17 @@ impl LintPass for UnusedAttributes {
 
         if !attr::is_used(attr) {
             cx.span_lint(UNUSED_ATTRIBUTES, attr.span, "unused attribute");
-            if KNOWN_ATTRIBUTES.contains(&(&attr.name(), AttributeType::CrateLevel)) ||
-               plugin_attributes.iter()
-                                .find(|&&(ref x, t)| &*attr.name() == &*x &&
-                                                     AttributeType::CrateLevel == t)
-                                .is_some() {
+            // Is it a builtin attribute that must be used at the crate level?
+            let known_crate = KNOWN_ATTRIBUTES.contains(&(&attr.name(),
+                                                          AttributeType::CrateLevel));
+            // Has a plugin registered this attribute as one which must be used at
+            // the crate level?
+            let plugin_crate = plugin_attributes.iter()
+                                                .find(|&&(ref x, t)| {
+                                                        &*attr.name() == &*x &&
+                                                        AttributeType::CrateLevel == t
+                                                    }).is_some();
+            if  known_crate || plugin_crate {
                 let msg = match attr.node.style {
                     ast::AttrOuter => "crate-level attribute should be an inner \
                                        attribute: add an exclamation mark: #![foo]",