3 files changed, 12 insertions, 14 deletions

diff --git a/crates/ra_hir/src/either.rs b/crates/ra_hir/src/either.rs
index 71c53ebc0..439e6ec87 100644
--- a/crates/ra_hir/src/either.rs
+++ b/crates/ra_hir/src/either.rs
@@ -25,6 +25,12 @@ impl<A, B> Either<A, B> {
             Either::B(b) => Either::B(f2(b)),
         }
     }
+    pub fn map_a<U, F>(self, f: F) -> Either<U, B>
+    where
+        F: FnOnce(A) -> U,
+    {
+        self.map(f, |it| it)
+    }
     pub fn a(self) -> Option<A> {
         match self {
             Either::A(it) => Some(it),
diff --git a/crates/ra_hir/src/expr.rs b/crates/ra_hir/src/expr.rs
index 70af3f119..66cb9633b 100644
--- a/crates/ra_hir/src/expr.rs
+++ b/crates/ra_hir/src/expr.rs
@@ -564,11 +564,7 @@ where
                         .else_branch()
                         .map(|b| match b {
                             ast::ElseBranch::Block(it) => self.collect_block(it),
-                            ast::ElseBranch::IfExpr(elif) => {
-                                let expr: ast::Expr =
-                                    ast::Expr::cast(elif.syntax().clone()).unwrap();
-                                self.collect_expr(expr)
-                            }
+                            ast::ElseBranch::IfExpr(elif) => self.collect_expr(elif.into()),
                         })
                         .unwrap_or_else(|| self.empty_block());
                     let placeholder_pat = self.pats.alloc(Pat::Missing);
diff --git a/crates/ra_hir/src/source_binder.rs b/crates/ra_hir/src/source_binder.rs
index 55eb7da35..df67d2c39 100644
--- a/crates/ra_hir/src/source_binder.rs
+++ b/crates/ra_hir/src/source_binder.rs
@@ -309,15 +309,11 @@ impl SourceAnalyzer {
             crate::Resolution::LocalBinding(it) => {
                 // We get a `PatId` from resolver, but it actually can only
                 // point at `BindPat`, and not at the arbitrary pattern.
-                let pat_ptr = self.body_source_map.as_ref()?.pat_syntax(it)?;
-                let pat_ptr = match pat_ptr {
-                    Either::A(pat) => {
-                        let pat: AstPtr<ast::BindPat> =
-                            pat.cast_checking_kind(|kind| kind == BIND_PAT).unwrap();
-                        Either::A(pat)
-                    }
-                    Either::B(self_param) => Either::B(self_param),
-                };
+                let pat_ptr = self
+                    .body_source_map
+                    .as_ref()?
+                    .pat_syntax(it)?
+                    .map_a(|ptr| ptr.cast::<ast::BindPat>().unwrap());
                 PathResolution::LocalBinding(pat_ptr)
             }
             crate::Resolution::GenericParam(it) => PathResolution::GenericParam(it),