Skip to content

Commit

Permalink
Fix feature gate for #[link_args(..)] attribute so that it will fire
Browse files Browse the repository at this point in the history
regardless of context of attribute.

Extend the gating test to include the attribute in "weird" places.
  • Loading branch information
pnkfelix committed Jul 10, 2017
1 parent 33e353e commit c512dea
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 11 deletions.
13 changes: 6 additions & 7 deletions src/libsyntax/feature_gate.rs
Expand Up @@ -552,7 +552,12 @@ pub const BUILTIN_ATTRIBUTES: &'static [(&'static str, AttributeType, AttributeG
("ignore", Normal, Ungated),
("no_implicit_prelude", Normal, Ungated),
("reexport_test_harness_main", Normal, Ungated),
("link_args", Normal, Ungated),
("link_args", Normal, Gated(Stability::Unstable,
"link_args",
"the `link_args` attribute is experimental and not \
portable across platforms, it is recommended to \
use `#[link(name = \"foo\")] instead",
cfg_fn!(link_args))),
("macro_escape", Normal, Ungated),

// RFC #1445.
Expand Down Expand Up @@ -1185,12 +1190,6 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
}

ast::ItemKind::ForeignMod(ref foreign_module) => {
if attr::contains_name(&i.attrs[..], "link_args") {
gate_feature_post!(&self, link_args, i.span,
"the `link_args` attribute is not portable \
across platforms, it is recommended to \
use `#[link(name = \"foo\")]` instead")
}
self.check_abi(foreign_module.abi, i.span);
}

Expand Down
18 changes: 14 additions & 4 deletions src/test/compile-fail/gated-link-args.rs
Expand Up @@ -9,12 +9,22 @@
// except according to those terms.

// Test that `#[link_args]` attribute is gated by `link_args`
// feature gate.
// feature gate, both when it occurs where expected (atop
// `extern { }` blocks) and where unexpected.

// gate-test-link_args

#[link_args = "aFdEfSeVEEE"]
// sidestep warning (which is correct, but misleading for
// purposes of this test)
#![allow(unused_attributes)]

#![link_args = "-l unexpected_use_as_inner_attr_on_mod"]
//~^ ERROR the `link_args` attribute is experimental

#[link_args = "-l expected_use_case"]
//~^ ERROR the `link_args` attribute is experimental
extern {}
//~^ ERROR the `link_args` attribute is not portable across platforms

fn main() { }
#[link_args = "-l unexected_use_on_non_extern_item"]
//~^ ERROR: the `link_args` attribute is experimental
fn main() {}

0 comments on commit c512dea

Please sign in to comment.