about summary refs log tree commit diff
path: root/src/libsyntax/parse/parser.rs
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2018-02-24 15:52:13 -0800
committerGitHub <noreply@github.com>2018-02-24 15:52:13 -0800
commit69757c5bb910148569c7d34d49fdee62b29dd61e (patch)
tree0abbbf10b0fac61afebb93087a65933d58067e48 /src/libsyntax/parse/parser.rs
parent43d1d6e885fcdc6f87a6921d9e968023dab9798b (diff)
parent98eb4ddbceb5bed5e83a9b5e91c173b190532333 (diff)
downloadrust-69757c5bb910148569c7d34d49fdee62b29dd61e.tar.gz
rust-69757c5bb910148569c7d34d49fdee62b29dd61e.zip
Rollup merge of #48441 - petrochenkov:exty, r=estebank
Fix parsing of extern paths in types and poly-traits

Fixes https://github.com/rust-lang/rust/issues/48262
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
-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 efc191f24ac..26b18213f27 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -1321,7 +1321,7 @@ impl<'a> Parser<'a> {
     pub fn token_is_bare_fn_keyword(&mut self) -> bool {
         self.check_keyword(keywords::Fn) ||
             self.check_keyword(keywords::Unsafe) ||
-            self.check_keyword(keywords::Extern)
+            self.check_keyword(keywords::Extern) && self.is_extern_non_path()
     }
 
     fn eat_label(&mut self) -> Option<Label> {