Skip to content

Commit

Permalink
Auto merge of #55983 - oli-obk:static_, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Fix stability hole with `static _`

The `underscore_const_names` only gated const items with `_` as the name.

`static _: () = ();` works on beta without feature gates right now, this PR fixes that.
  • Loading branch information
bors committed Nov 20, 2018
2 parents 31fa301 + 9b87911 commit 046e054
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/libsyntax/feature_gate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1583,6 +1583,7 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
}
}

ast::ItemKind::Static(..) |
ast::ItemKind::Const(_,_) => {
if i.ident.name == "_" {
gate_feature_post!(&self, underscore_const_names, i.span,
Expand Down
14 changes: 14 additions & 0 deletions src/test/ui/underscore_const_names_feature_gate.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Copyright 2012-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.

const _: () = (); //~ ERROR is unstable
static _: () = (); //~ ERROR is unstable

fn main() {}
19 changes: 19 additions & 0 deletions src/test/ui/underscore_const_names_feature_gate.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
error[E0658]: naming constants with `_` is unstable (see issue #54912)
--> $DIR/underscore_const_names_feature_gate.rs:11:1
|
LL | const _: () = (); //~ ERROR is unstable
| ^^^^^^^^^^^^^^^^^
|
= help: add #![feature(underscore_const_names)] to the crate attributes to enable

error[E0658]: naming constants with `_` is unstable (see issue #54912)
--> $DIR/underscore_const_names_feature_gate.rs:12:1
|
LL | static _: () = (); //~ ERROR is unstable
| ^^^^^^^^^^^^^^^^^^
|
= help: add #![feature(underscore_const_names)] to the crate attributes to enable

error: aborting due to 2 previous errors

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

0 comments on commit 046e054

Please sign in to comment.