---

yaml
---
r: 31391
b: refs/heads/dist-snap
c: 4b8d053
h: refs/heads/master
i:
  31389: 781b806
  31387: d830bda
  31383: 2768f03
  31375: b968c2e
  31359: ba5f828
v: v3

Author: nikomatsakis

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: dc744e816d2d215bee6b3a32230871d5efacc650
+refs/heads/dist-snap: 4b8d0539f99865944da13cbfae44b853d70fee10
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/rustc/middle/lint.rs

@@ -421,6 +421,14 @@ fn check_item_path_statement(cx: ty::ctxt, it: @ast::item) {
 fn check_fn(tcx: ty::ctxt, fk: visit::fn_kind, decl: ast::fn_decl,
             _body: ast::blk, span: span, id: ast::node_id) {
     #debug["lint check_fn fk=%? id=%?", fk, id];
+
+    // don't complain about blocks, since they tend to get their modes
+    // specified from the outside
+    alt fk {
+      visit::fk_fn_block(*) => { ret; }
+      _ => {}
+    }
+
     let fn_ty = ty::node_id_to_type(tcx, id);
     alt check ty::get(fn_ty).struct {
       ty::ty_fn(fn_ty) {