OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #27272 - eefriedman:closure-const-crash, r=nikomatsakis

Browse Source 
Fixes issue #27268.

r? @nikomatsakis
This commit is contained in:
bors 2015-07-26 17:51:30 +00:00
commit cf7e825ecd
2 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/librustc_typeck/check/upvar.rs
View File

@ -93,22 +93,8 @@ impl<'a, 'tcx, 'v> Visitor<'v> for SeedBorrowKind<'a, 'tcx> {
visit::walk_expr(self, expr);
}
fn visit_fn(&mut self,
fn_kind: visit::FnKind<'v>,
decl: &'v ast::FnDecl,
block: &'v ast::Block,
span: Span,
_id: ast::NodeId)
{
match fn_kind {
visit::FkItemFn(..) | visit::FkMethod(..) => {
// ignore nested fn items
}
visit::FkFnBlock => {
visit::walk_fn(self, fn_kind, decl, block, span);
}
}
}
// Skip all items; they aren't in the same context.
fn visit_item(&mut self, _: &'v ast::Item) { }
}
impl<'a,'tcx> SeedBorrowKind<'a,'tcx> {
@ -515,16 +501,12 @@ impl<'a, 'tcx, 'v> Visitor<'v> for AdjustBorrowKind<'a, 'tcx> {
span: Span,
id: ast::NodeId)
{
match fn_kind {
visit::FkItemFn(..) | visit::FkMethod(..) => {
// ignore nested fn items
}
visit::FkFnBlock => {
visit::walk_fn(self, fn_kind, decl, body, span);
self.analyze_closure(id, span, decl, body);
}
}
visit::walk_fn(self, fn_kind, decl, body, span);
self.analyze_closure(id, span, decl, body);
}
// Skip all items; they aren't in the same context.
fn visit_item(&mut self, _: &'v ast::Item) { }
}
impl<'a,'tcx> euv::Delegate<'tcx> for AdjustBorrowKind<'a,'tcx> {

13
src/test/run-pass/issue-27268.rs Normal file
View File

@ -0,0 +1,13 @@
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
fn main() {
const _C: &'static Fn() = &||{};
}