From 7bc657badde12ab4b29232a23c50f367966cb8bc Mon Sep 17 00:00:00 2001
From: Jon Gjengset <jon@thesquareplanet.com>
Date: Wed, 22 Mar 2017 23:56:19 -0400
Subject: [PATCH] Fix following removal of parse_ty_path

The merge of rust-lang/rust#40043 removes parse_ty_path in the latest
nightly, which we depended on. This patch rewrites that code path using
parse_path, and in the process eliminates an unreachable!() if let arm.
---
 src/plugins/src/lib.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/plugins/src/lib.rs b/src/plugins/src/lib.rs
index 056f7d95..61613efb 100644
--- a/src/plugins/src/lib.rs
+++ b/src/plugins/src/lib.rs
@@ -109,7 +109,7 @@ fn ty_snake_to_camel(cx: &mut ExtCtxt, sp: Span, tts: &[TokenTree]) -> Box<MacRe
     // The `expand_expr` method is called so that any macro calls in the
     // parsed expression are expanded.
 
-    let mut ty = match parser.parse_ty_path() {
+    let mut path = match parser.parse_path(PathStyle::Type) {
         Ok(s) => s,
         Err(mut diagnostic) => {
             diagnostic.emit();
@@ -123,14 +123,13 @@ fn ty_snake_to_camel(cx: &mut ExtCtxt, sp: Span, tts: &[TokenTree]) -> Box<MacRe
     }
 
     // Only capitalize the final segment
-    if let TyKind::Path(_, ref mut path) = ty {
-        convert(&mut path.segments.last_mut().unwrap().identifier);
-    } else {
-        unreachable!()
-    }
+    convert(&mut path.segments
+                     .last_mut()
+                     .unwrap()
+                     .identifier);
     MacEager::ty(P(Ty {
         id: ast::DUMMY_NODE_ID,
-        node: ty,
+        node: TyKind::Path(None, path),
         span: sp,
     }))
 }