about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2018-10-10 15:58:40 -0700
committerManish Goregaokar <manishsmail@gmail.com>2018-10-10 15:58:40 -0700
commit8ebc6d6dbbfe1ccc9a72d003d13c3d267c91c742 (patch)
tree9a9bf81b322ac5fe909138a79032ad7fb680cad9 /src/libsyntax/parse
parenta267b3a9ff041c92c3ce71a285512d97ae8f208b (diff)
parentbbe832d570e826b2012c09869aa77d6201932730 (diff)
downloadrust-8ebc6d6dbbfe1ccc9a72d003d13c3d267c91c742.tar.gz
rust-8ebc6d6dbbfe1ccc9a72d003d13c3d267c91c742.zip
Rollup merge of #54862 - Havvy:cfg_attr_multi, r=petrochenkov
Fixes #47311.
r? @nrc
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/parser.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index d653ed819fd..0da7a61a7f2 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -678,7 +678,7 @@ impl<'a> Parser<'a> {
     /// Expect next token to be edible or inedible token.  If edible,
     /// then consume it; if inedible, then return without consuming
     /// anything.  Signal a fatal error if next token is unexpected.
-    fn expect_one_of(&mut self,
+    pub fn expect_one_of(&mut self,
                          edible: &[token::Token],
                          inedible: &[token::Token]) -> PResult<'a,  ()>{
         fn tokens_to_string(tokens: &[TokenType]) -> String {