Skip to content

Commit

Permalink
validate allow_internal_unstable target
Browse files Browse the repository at this point in the history
Adds a check to make sure `#[allow_internal_unstable]`
can be applied only to macro definitions.
  • Loading branch information
liketechnik committed Oct 21, 2020
1 parent 05f4a9a commit 7258740
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 1 deletion.
29 changes: 29 additions & 0 deletions compiler/rustc_passes/src/check_attr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ impl CheckAttrVisitor<'tcx> {
self.check_export_name(&attr, span, target)
} else if self.tcx.sess.check_name(attr, sym::rustc_args_required_const) {
self.check_rustc_args_required_const(&attr, span, target, item)
} else if self.tcx.sess.check_name(attr, sym::allow_internal_unstable) {
self.check_allow_internal_unstable(&attr, span, target, &attrs)
} else {
// lint-only checks
if self.tcx.sess.check_name(attr, sym::cold) {
Expand Down Expand Up @@ -762,6 +764,33 @@ impl CheckAttrVisitor<'tcx> {
}
}
}

/// Outputs an error for `#[allow_internal_unstable]` which can only be applied to macros.
/// (Allows proc_macro functions)
fn check_allow_internal_unstable(
&self,
attr: &Attribute,
span: &Span,
target: Target,
attrs: &[Attribute],
) -> bool {
debug!("Checking target: {:?}", target);
if target == Target::Fn {
for attr in attrs {
if self.tcx.sess.is_proc_macro_attr(attr) {
debug!("Is proc macro attr");
return true;
}
}
debug!("Is not proc macro attr");
}
self.tcx
.sess
.struct_span_err(attr.span, "attribute should be applied to a macro")
.span_label(*span, "not a macro")
.emit();
false
}
}

impl Visitor<'tcx> for CheckAttrVisitor<'tcx> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// this needs a different test since this is done after expansion

#[allow_internal_unstable()] //~ ERROR allow_internal_unstable side-steps
//~| ERROR attribute should
struct S;

fn main() {}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ LL | #[allow_internal_unstable()]
|
= help: add `#![feature(allow_internal_unstable)]` to the crate attributes to enable

error: aborting due to previous error
error: attribute should be applied to a macro
--> $DIR/feature-gate-allow-internal-unstable-struct.rs:4:1
|
LL | #[allow_internal_unstable()]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
LL |
LL | struct S;
| --------- not a macro

error: aborting due to 2 previous errors

For more information about this error, try `rustc --explain E0658`.

0 comments on commit 7258740

Please sign in to comment.