Merge pull request rust-lang#3401 from topecongiro/rustcap

Cargo update
jorickert · Feb 14, 2019 · b58ba97 · b58ba97
2 parents b700cde + 9df1ed6
commit b58ba97
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 57 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -49,9 +49,9 @@ env_logger = "0.6"
 getopts = "0.2"
 derive-new = "0.5"
 cargo_metadata = "0.7"
-rustc-ap-rustc_target = "366.0.0"
-rustc-ap-syntax = "366.0.0"
-rustc-ap-syntax_pos = "366.0.0"
+rustc-ap-rustc_target = "373.0.0"
+rustc-ap-syntax = "373.0.0"
+rustc-ap-syntax_pos = "373.0.0"
 failure = "0.1.3"
 bytecount = "0.5"
 unicode-width = "0.1.5"

diff --git a/src/spanned.rs b/src/spanned.rs
@@ -178,6 +178,7 @@ impl Spanned for ast::GenericArg {
         match *self {
             ast::GenericArg::Lifetime(ref lt) => lt.ident.span,
             ast::GenericArg::Type(ref ty) => ty.span(),
+            ast::GenericArg::Const(..) => unreachable!(), // FIXME(#3336)
         }
     }
 }

diff --git a/src/types.rs b/src/types.rs
@@ -152,6 +152,7 @@ impl<'a> SegmentParam<'a> {
         match arg {
             ast::GenericArg::Lifetime(ref lt) => SegmentParam::LifeTime(lt),
             ast::GenericArg::Type(ref ty) => SegmentParam::Type(ty),
+            ast::GenericArg::Const(..) => unreachable!(), // FIXME(#3336)
         }
     }
 }
@@ -463,6 +464,7 @@ impl Rewrite for ast::GenericArg {
         match *self {
             ast::GenericArg::Lifetime(ref lt) => lt.rewrite(context, shape),
             ast::GenericArg::Type(ref ty) => ty.rewrite(context, shape),
+            ast::GenericArg::Const(..) => unreachable!(), // FIXME(#3336)
         }
     }
 }