Skip to content

Commit

Permalink
Auto merge of #43078 - kennytm:fix-42755-vis-can-be-empty, r=petroche…
Browse files Browse the repository at this point in the history
…nkov

Disallow `$($v:vis)*`. Fix #42755.

#42755
  • Loading branch information
bors committed Jul 6, 2017
2 parents afb853a + 06e1fc0 commit ccf401f
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/libsyntax/ext/tt/macro_rules.rs
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ fn check_lhs_no_empty_seq(sess: &ParseSess, tts: &[quoted::TokenTree]) -> bool {
TokenTree::Sequence(span, ref seq) => {
if seq.separator.is_none() && seq.tts.iter().all(|seq_tt| {
match *seq_tt {
TokenTree::MetaVarDecl(_, _, id) => id.name == "vis",
TokenTree::Sequence(_, ref sub_seq) =>
sub_seq.op == quoted::KleeneOp::ZeroOrMore,
_ => false,
Expand Down
17 changes: 17 additions & 0 deletions src/test/compile-fail/issue-42755.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Copyright 2017 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(macro_vis_matcher)]

macro_rules! foo {
($($p:vis)*) => {} //~ ERROR repetition matches empty token tree
}

foo!(a);

0 comments on commit ccf401f

Please sign in to comment.