Changes for rust-nightly after #27856

src/len_zero.rs

@@ -2,6 +2,7 @@ use rustc::lint::*;
 use syntax::ast::*;
 use syntax::ptr::P;
 use syntax::codemap::{Span, Spanned};
+use rustc::middle::def_id::DefId;
 use rustc::middle::ty::{self, MethodTraitItemId, ImplOrTraitItemId};
 
 use utils::{span_lint, walk_ptrs_ty, snippet};

src/misc.rs

@@ -22,7 +22,7 @@ impl LintPass for TopLevelRefPass {
     }
 
     fn check_fn(&mut self, cx: &Context, k: FnKind, decl: &FnDecl, _: &Block, _: Span, _: NodeId) {
-        if let FnKind::FkFnBlock = k {
+        if let FnKind::FkClosure = k {
             // Does not apply to closures
             return
         }

src/utils.rs

@@ -2,6 +2,7 @@ use rustc::lint::*;
 use syntax::ast::*;
 use syntax::codemap::{ExpnInfo, Span};
 use rustc::ast_map::Node::NodeExpr;
+use rustc::middle::def_id::DefId;
 use rustc::middle::ty;
 use std::borrow::Cow;