Build Broken on Nightly and Master 2018-09-02

I'm getting the errors below when trying to build on nightly and master. The breakage seems to have been introduced by rust-lang/rust#53815

error[E0308]: mismatched types
   --> clippy_lints/src/utils/hir_utils.rs:116:100
    |
116 |                     self.eq_expr(&l.body, &r.body) && both(&l.guard, &r.guard, |l, r| self.eq_expr(l, r))
    |                                                                                                    ^ expected struct `rustc::hir::Expr`, found enum `rustc::hir::Guard`
    |
    = note: expected type `&rustc::hir::Expr`
               found type `&rustc::hir::Guard`

error[E0308]: mismatched types
   --> clippy_lints/src/utils/hir_utils.rs:116:103
    |
116 |                     self.eq_expr(&l.body, &r.body) && both(&l.guard, &r.guard, |l, r| self.eq_expr(l, r))
    |                                                                                                       ^ expected struct `rustc::hir::Expr`, found enum `rustc::hir::Guard`
    |
    = note: expected type `&rustc::hir::Expr`
               found type `&rustc::hir::Guard`

error[E0308]: mismatched types
   --> clippy_lints/src/utils/hir_utils.rs:500:40
    |
500 |                         self.hash_expr(e);
    |                                        ^ expected struct `rustc::hir::Expr`, found enum `rustc::hir::Guard`
    |
    = note: expected type `&rustc::hir::Expr`
               found type `&rustc::hir::Guard`

error[E0308]: mismatched types
   --> clippy_lints/src/utils/inspector.rs:116:28
    |
116 |             print_expr(cx, guard, 1);
    |                            ^^^^^ expected struct `rustc::hir::Expr`, found enum `rustc::hir::Guard`
    |
    = note: expected type `&rustc::hir::Expr`
               found type `&rustc::hir::Guard`

error[E0308]: mismatched types
   --> clippy_lints/src/utils/author.rs:350:41
    |
350 |                         self.visit_expr(guard);
    |                                         ^^^^^ expected struct `rustc::hir::Expr`, found enum `rustc::hir::Guard`
    |
    = note: expected type `&rustc::hir::Expr`
               found type `&rustc::hir::Guard`

error[E0308]: mismatched types
   --> clippy_lints/src/eval_order_dependence.rs:112:41
    |
112 |                         self.visit_expr(guard);
    |                                         ^^^^^ expected struct `rustc::hir::Expr`, found enum `rustc::hir::Guard`
    |
    = note: expected type `&rustc::hir::Expr`
               found type `&rustc::hir::Guard`

error[E0308]: mismatched types
   --> clippy_lints/src/shadow.rs:342:40
    |
342 |                         check_expr(cx, guard, bindings);
    |                                        ^^^^^ expected struct `rustc::hir::Expr`, found enum `rustc::hir::Guard`
    |
    = note: expected type `&rustc::hir::Expr`
               found type `&rustc::hir::Guard`

error: aborting due to 7 previous errors

For more information about this error, try `rustc --explain E0308`.
error: Could not compile `clippy_lints`.