Skip to content

Commit 02350ac

Browse files
committed
rollup merge of rust-lang#17984 : bkoropoff/issue-17651
2 parents 4509e42 + 3caecff commit 02350ac

File tree

2 files changed

+24
-4
lines changed

2 files changed

+24
-4
lines changed

src/librustc/middle/check_rvalues.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,16 @@ struct RvalueContext<'a, 'tcx: 'a> {
3232

3333
impl<'a, 'tcx, 'v> visit::Visitor<'v> for RvalueContext<'a, 'tcx> {
3434
fn visit_fn(&mut self,
35-
_: visit::FnKind<'v>,
35+
fk: visit::FnKind<'v>,
3636
fd: &'v ast::FnDecl,
3737
b: &'v ast::Block,
38-
_: Span,
38+
s: Span,
3939
_: ast::NodeId) {
40-
let mut euv = euv::ExprUseVisitor::new(self, self.tcx);
41-
euv.walk_fn(fd, b);
40+
{
41+
let mut euv = euv::ExprUseVisitor::new(self, self.tcx);
42+
euv.walk_fn(fd, b);
43+
}
44+
visit::walk_fn(self, fk, fd, b, s)
4245
}
4346
}
4447

src/test/compile-fail/issue-17651.rs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// Test that moves of unsized values within closures are caught
12+
// and rejected.
13+
14+
fn main() {
15+
(|| box *[0u].as_slice())();
16+
//~^ ERROR cannot move a value of type [uint]
17+
}

0 commit comments

Comments
 (0)