From 92db00863f8940a2a53db159c8c730d881fd902c Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Tue, 25 Aug 2015 23:21:38 +0200
Subject: [PATCH] Changes for rust-nightly after #27856

---
 src/len_zero.rs | 1 +
 src/misc.rs     | 2 +-
 src/utils.rs    | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/len_zero.rs b/src/len_zero.rs
index ca3ce51bf7cc..068568cb3921 100644
--- a/src/len_zero.rs
+++ b/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};
diff --git a/src/misc.rs b/src/misc.rs
index 2290af38bb57..b4385e298f7f 100644
--- a/src/misc.rs
+++ b/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
         }
diff --git a/src/utils.rs b/src/utils.rs
index e4f3cc078de7..ca704ebfd58a 100644
--- a/src/utils.rs
+++ b/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;