From: mcarton <cartonmartin+git@gmail.com>
Date: Sun, 31 Jul 2016 17:22:07 +0000 (+0200)
Subject: Rustup to rustc 1.12.0-nightly (1225e122f 2016-07-30)
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=30ec2c4d9235e397bdb9114cd1d677747cb3dc64;p=rust.git

Rustup to rustc 1.12.0-nightly (1225e122f 2016-07-30)
---

diff --git a/clippy_lints/src/unused_label.rs b/clippy_lints/src/unused_label.rs
index a97b593095f..0c8233478b6 100644
--- a/clippy_lints/src/unused_label.rs
+++ b/clippy_lints/src/unused_label.rs
@@ -47,13 +47,13 @@ fn get_lints(&self) -> LintArray {
 }
 
 impl LateLintPass for UnusedLabel {
-    fn check_fn(&mut self, cx: &LateContext, kind: FnKind, decl: &hir::FnDecl, body: &hir::Block, span: Span, _: ast::NodeId) {
+    fn check_fn(&mut self, cx: &LateContext, kind: FnKind, decl: &hir::FnDecl, body: &hir::Block, span: Span, fn_id: ast::NodeId) {
         if in_macro(cx, span) {
             return;
         }
 
         let mut v = UnusedLabelVisitor::new();
-        walk_fn(&mut v, kind, decl, body, span);
+        walk_fn(&mut v, kind, decl, body, span, fn_id);
 
         for (label, span) in v.labels {
             span_lint(cx, UNUSED_LABEL, span, &format!("unused label `{}`", label));