FnFnBlock -> FkClosure

diff --git a/src/librustc/ast_map/blocks.rs b/src/librustc/ast_map/blocks.rs
index 6c9ed29768f330c580ab4e52f5aff1212212d397..59eba6880a6d05a6cf49f859a62be85fddf966fe 100644 (file)
--- a/src/librustc/ast_map/blocks.rs
+++ b/src/librustc/ast_map/blocks.rs
@@ -191,7 +191,7 @@ pub fn kind(self) -> visit::FnKind<'a> {
             visit::FkItemFn(p.ident, p.generics, p.unsafety, p.constness, p.abi, p.vis)
         };
         let closure = |_: ClosureParts| {
-            visit::FkFnBlock
+            visit::FkClosure
         };
         let method = |_, ident, sig: &'a ast::MethodSig, vis, _, _| {
             visit::FkMethod(ident, sig, vis)

diff --git a/src/librustc/middle/check_match.rs b/src/librustc/middle/check_match.rs
index b9d8e4b842d01a607c68d22372c4558fa9194f2d..ad7cf1a239a35c0379cc55bf7d725c1601fb78cf 100644 (file)
--- a/src/librustc/middle/check_match.rs
+++ b/src/librustc/middle/check_match.rs
@@ -1006,7 +1006,7 @@ fn check_fn(cx: &mut MatchCheckCtxt,
             sp: Span,
             fn_id: NodeId) {
     match kind {
-        visit::FkFnBlock => {}
+        visit::FkClosure => {}
         _ => cx.param_env = ParameterEnvironment::for_item(cx.tcx, fn_id),
     }
 

diff --git a/src/librustc/middle/intrinsicck.rs b/src/librustc/middle/intrinsicck.rs
index 93899a5cf80364b7ec4d2d5dd298fd586fc1aebb..34da5c7062da7a7b7841e2f8cfdd0fd033764c60 100644 (file)
--- a/src/librustc/middle/intrinsicck.rs
+++ b/src/librustc/middle/intrinsicck.rs
@@ -241,7 +241,7 @@ fn visit_fn(&mut self, fk: visit::FnKind<'v>, fd: &'v ast::FnDecl,
                 visit::walk_fn(self, fk, fd, b, s);
                 self.param_envs.pop();
             }
-            visit::FkFnBlock(..) => {
+            visit::FkClosure(..) => {
                 visit::walk_fn(self, fk, fd, b, s);
             }
         }

diff --git a/src/librustc/middle/resolve_lifetime.rs b/src/librustc/middle/resolve_lifetime.rs
index 95b8161ac342979d4e84aa3aaf02563d79585d71..fee24f61d4cc388811e6f01a376d0847de0b68cc 100644 (file)
--- a/src/librustc/middle/resolve_lifetime.rs
+++ b/src/librustc/middle/resolve_lifetime.rs
@@ -186,7 +186,7 @@ fn visit_fn(&mut self, fk: visit::FnKind<'v>, fd: &'v ast::FnDecl,
                     this.walk_fn(fk, fd, b, s)
                 })
             }
-            visit::FkFnBlock(..) => {
+            visit::FkClosure(..) => {
                 self.walk_fn(fk, fd, b, s)
             }
         }
@@ -484,7 +484,7 @@ fn walk_fn<'b>(&mut self,
                 self.visit_generics(&sig.generics);
                 self.visit_explicit_self(&sig.explicit_self);
             }
-            visit::FkFnBlock(..) => {
+            visit::FkClosure(..) => {
                 visit::walk_fn_decl(self, fd);
             }
         }

diff --git a/src/librustc_borrowck/borrowck/mod.rs b/src/librustc_borrowck/borrowck/mod.rs
index e050276fc76d465f93cd13b4a68983a51cb7f89d..0c1abd011fa2b7f00d2dcc4f95daa555f3454b8f 100644 (file)
--- a/src/librustc_borrowck/borrowck/mod.rs
+++ b/src/librustc_borrowck/borrowck/mod.rs
@@ -67,7 +67,7 @@ fn visit_fn(&mut self, fk: FnKind<'v>, fd: &'v FnDecl,
                 self.free_region_map = old_free_region_map;
             }
 
-            visit::FkFnBlock => {
+            visit::FkClosure => {
                 borrowck_fn(self, fk, fd, b, s, id);
             }
         }

diff --git a/src/librustc_lint/builtin.rs b/src/librustc_lint/builtin.rs
index f581931647765d9a7f416bacbf19aa7b318be095..79539fc7a6e73629383a3861423595dd67356f86 100644 (file)
--- a/src/librustc_lint/builtin.rs
+++ b/src/librustc_lint/builtin.rs
@@ -2133,7 +2133,7 @@ fn check_fn(&mut self, cx: &Context, fn_kind: visit::FnKind, _: &ast::FnDecl,
                 cx.tcx.impl_or_trait_item(local_def(id)).as_opt_method()
             }
             // closures can't recur, so they don't matter.
-            visit::FkFnBlock => return
+            visit::FkClosure => return
         };
 
         // Walk through this function (say `f`) looking to see if

diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index 8127c2dee2cbf712b9548b407ca33ad6be49fa56..b3a266e40144652b44b078a6567405d815c1c2e9 100644 (file)
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -524,7 +524,7 @@ fn visit_fn(&mut self,
                 self.visit_explicit_self(&sig.explicit_self);
                 MethodRibKind
             }
-            visit::FkFnBlock(..) => ClosureRibKind(node_id)
+            visit::FkClosure(..) => ClosureRibKind(node_id)
         };
         self.resolve_function(rib_kind, declaration, block);
     }

diff --git a/src/librustc_typeck/check/wf.rs b/src/librustc_typeck/check/wf.rs
index 47eb1f472c31d208bf32f316cb8a9cfd9939a512..48cedd8c82e98d9cf0c4eb9e26ab0e1690b5765d 100644 (file)
--- a/src/librustc_typeck/check/wf.rs
+++ b/src/librustc_typeck/check/wf.rs
@@ -428,7 +428,7 @@ fn visit_fn(&mut self,
                 fk: visit::FnKind<'v>, fd: &'v ast::FnDecl,
                 b: &'v ast::Block, span: Span, id: ast::NodeId) {
         match fk {
-            visit::FkFnBlock | visit::FkItemFn(..) => {}
+            visit::FkClosure | visit::FkItemFn(..) => {}
             visit::FkMethod(..) => {
                 match self.tcx().impl_or_trait_item(local_def(id)) {
                     ty::ImplOrTraitItem::MethodTraitItem(ty_method) => {

diff --git a/src/libsyntax/ast_util.rs b/src/libsyntax/ast_util.rs
index 7aff92ecb709080b6f97d0933a5b6ee290e55b38..d2f54ac6d82e2cfdd07228d269c0fb1face2ea27 100644 (file)
--- a/src/libsyntax/ast_util.rs
+++ b/src/libsyntax/ast_util.rs
@@ -444,7 +444,7 @@ fn visit_fn(&mut self,
             visit::FkMethod(_, sig, _) => {
                 self.visit_generics_helper(&sig.generics)
             }
-            visit::FkFnBlock => {}
+            visit::FkClosure => {}
         }
 
         for argument in &function_declaration.inputs {

diff --git a/src/libsyntax/visit.rs b/src/libsyntax/visit.rs
index c92934de756df8a99e4307a707805c951d1b9338..824aee74ce5a6734ea638d5d97c5c3ce78c2f61f 100644 (file)
--- a/src/libsyntax/visit.rs
+++ b/src/libsyntax/visit.rs
@@ -40,8 +40,8 @@ pub enum FnKind<'a> {
     /// fn foo(&self)
     FkMethod(Ident, &'a MethodSig, Option<Visibility>),
 
-    /// Closures (|x, y| {})
-    FkFnBlock,
+    /// |x, y| {}
+    FkClosure,
 }
 
 /// Each method of the Visitor trait is a hook to be potentially
@@ -615,7 +615,7 @@ pub fn walk_fn<'v, V: Visitor<'v>>(visitor: &mut V,
             visitor.visit_generics(&sig.generics);
             visitor.visit_explicit_self(&sig.explicit_self);
         }
-        FkFnBlock(..) => {}
+        FkClosure(..) => {}
     }
 
     visitor.visit_block(function_body)
@@ -816,7 +816,7 @@ pub fn walk_expr<'v, V: Visitor<'v>>(visitor: &mut V, expression: &'v Expr) {
             }
         }
         ExprClosure(_, ref function_declaration, ref body) => {
-            visitor.visit_fn(FkFnBlock,
+            visitor.visit_fn(FkClosure,
                              &**function_declaration,
                              &**body,
                              expression.span,