From 98eb4ddbceb5bed5e83a9b5e91c173b190532333 Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Fri, 23 Feb 2018 00:54:30 +0300
Subject: [PATCH] Fix parsing of extern paths in types and poly-traits

---
 src/libsyntax/parse/parser.rs                                 | 2 +-
 .../rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs        | 4 +++-
 src/test/run-pass/rfc-2126-extern-absolute-paths/extern.rs    | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 7915109ce3af8..058d6ab0762f7 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> {
diff --git a/src/test/run-pass/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs b/src/test/run-pass/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs
index c3da4a518720d..a5214d796cd62 100644
--- a/src/test/run-pass/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs
+++ b/src/test/run-pass/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs
@@ -8,8 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[derive(Debug)]
+#[derive(Debug, PartialEq)]
 pub struct S;
 
 #[derive(Debug)]
 pub struct Z;
+
+pub trait Tr<'a> {}
diff --git a/src/test/run-pass/rfc-2126-extern-absolute-paths/extern.rs b/src/test/run-pass/rfc-2126-extern-absolute-paths/extern.rs
index 52b52b23c874a..15b754e1fe6b2 100644
--- a/src/test/run-pass/rfc-2126-extern-absolute-paths/extern.rs
+++ b/src/test/run-pass/rfc-2126-extern-absolute-paths/extern.rs
@@ -14,6 +14,9 @@
 
 use extern::xcrate::Z;
 
+type A = extern::xcrate::S;
+type B = for<'a> extern::xcrate::Tr<'a>;
+
 fn f() {
     use extern::xcrate;
     use extern::xcrate as ycrate;
@@ -28,4 +31,5 @@ fn main() {
     assert_eq!(format!("{:?}", s), "S");
     let z = Z;
     assert_eq!(format!("{:?}", z), "Z");
+    assert_eq!(A {}, extern::xcrate::S {});
 }