Merge pull request #1016 from h-michael/ap-syntax

kngwyu · web-flow · commit 4dd3bcd44e48 · 2019-02-11T14:00:22.000+09:00
Update rustc-ap-syntax from 306.0.0 to 366.0.0
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,7 +23,7 @@ debug = false # because of #1005
 [dependencies]
 bitflags = "1.0"
 log = "0.4"
-rustc-ap-syntax = "306.0.0"
+rustc-ap-syntax = "366.0.0"
 env_logger = "0.6"
 clap = "2.32"
 lazy_static = "1.2"
diff --git a/src/racer/ast_types.rs b/src/racer/ast_types.rs
@@ -144,6 +144,7 @@ impl Ty {
             }
         }
     }
+
     pub(crate) fn from_lit(lit: &ast::Lit) -> Option<Ty> {
         let make_match = |kind: PrimKind| kind.to_module_match().map(Ty::Match);
         match lit.node {
@@ -159,6 +160,7 @@ impl Ty {
             },
             LitKind::FloatUnsuffixed(_) => make_match(PrimKind::F32),
             LitKind::Bool(_) => make_match(PrimKind::Bool),
+            LitKind::Err(_) => None,
         }
     }
     fn resolve_common(self, session: &Session) -> Option<Match> {

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,7 @@ impl Ty {`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`	`}`
	`147`	`+`
`147`	`148`	`pub(crate) fn from_lit(lit: &ast::Lit) -> Option<Ty> {`
`148`	`149`	`let make_match = \|kind: PrimKind\| kind.to_module_match().map(Ty::Match);`
`149`	`150`	`match lit.node {`
`@@ -159,6 +160,7 @@ impl Ty {`
`159`	`160`	`},`
`160`	`161`	`LitKind::FloatUnsuffixed(_) => make_match(PrimKind::F32),`
`161`	`162`	`LitKind::Bool(_) => make_match(PrimKind::Bool),`
	`163`	`+ LitKind::Err(_) => None,`
`162`	`164`	`}`
`163`	`165`	`}`
`164`	`166`	`fn resolve_common(self, session: &Session) -> Option<Match> {`