diff options
| author | kennytm <kennytm@gmail.com> | 2018-05-01 01:18:41 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-01 01:18:41 +0800 |
| commit | 909ba8aa78fb3ad4cf4dcee83bb3edc966dde90c (patch) | |
| tree | 77b8616ec2890107e0c49a87e1f337cd71ca199b | |
| parent | cbbdf998edc905bcf44ba212f068114b3a62f858 (diff) | |
| parent | bd4ebf28bdf6eb898971b194f5cf773c88281251 (diff) | |
Rollup merge of #50330 - japaric:used, r=nagisa
check that #[used] is used only on statics this attribute has no effect on other items. This makes the implementation match what's described in the RFC. cc #40289 r? @nagisa
| -rw-r--r-- | src/librustc/hir/check_attr.rs | 12 | ||||
| -rw-r--r-- | src/test/compile-fail/used.rs | 28 |
2 files changed, 40 insertions, 0 deletions
diff --git a/src/librustc/hir/check_attr.rs b/src/librustc/hir/check_attr.rs index 19f8d15662d..cad6ff8ae9f 100644 --- a/src/librustc/hir/check_attr.rs +++ b/src/librustc/hir/check_attr.rs @@ -31,6 +31,7 @@ enum Target { Expression, Statement, Closure, + Static, Other, } @@ -43,6 +44,7 @@ impl Target { hir::ItemEnum(..) => Target::Enum, hir::ItemConst(..) => Target::Const, hir::ItemForeignMod(..) => Target::ForeignMod, + hir::ItemStatic(..) => Target::Static, _ => Target::Other, } } @@ -102,6 +104,7 @@ impl<'a, 'tcx> CheckAttrVisitor<'a, 'tcx> { } self.check_repr(item, target); + self.check_used(item, target); } /// Check if an `#[inline]` is applied to a function or a closure. @@ -305,6 +308,15 @@ impl<'a, 'tcx> CheckAttrVisitor<'a, 'tcx> { } } } + + fn check_used(&self, item: &hir::Item, target: Target) { + for attr in &item.attrs { + if attr.name().map(|name| name == "used").unwrap_or(false) && target != Target::Static { + self.tcx.sess + .span_err(attr.span, "attribute must be applied to a `static` variable"); + } + } + } } impl<'a, 'tcx> Visitor<'tcx> for CheckAttrVisitor<'a, 'tcx> { diff --git a/src/test/compile-fail/used.rs b/src/test/compile-fail/used.rs new file mode 100644 index 00000000000..f170d9c25f5 --- /dev/null +++ b/src/test/compile-fail/used.rs @@ -0,0 +1,28 @@ +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or +// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license +// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![feature(used)] + +#[used] +static FOO: u32 = 0; // OK + +#[used] //~ ERROR attribute must be applied to a `static` variable +fn foo() {} + +#[used] //~ ERROR attribute must be applied to a `static` variable +struct Foo {} + +#[used] //~ ERROR attribute must be applied to a `static` variable +trait Bar {} + +#[used] //~ ERROR attribute must be applied to a `static` variable +impl Bar for Foo {} + +fn main() {} |
