Skip to content

Commit 6b1149d

Browse files
author
Ariel Ben-Yehuda
committed
use the infcx tables to check if a closure is Copy
Fixes rust-lang#28550
1 parent 8fe79bd commit 6b1149d

File tree

2 files changed

+33
-1
lines changed

2 files changed

+33
-1
lines changed

src/librustc/middle/infer/mod.rs

+8-1
Original file line numberDiff line numberDiff line change
@@ -1389,9 +1389,16 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
13891389
self.resolve_type_vars_or_error(&ty)
13901390
}
13911391

1392+
pub fn tables_are_tcx_tables(&self) -> bool {
1393+
let tables: &RefCell<ty::Tables> = &self.tables;
1394+
let tcx_tables: &RefCell<ty::Tables> = &self.tcx.tables;
1395+
tables as *const _ == tcx_tables as *const _
1396+
}
1397+
13921398
pub fn type_moves_by_default(&self, ty: Ty<'tcx>, span: Span) -> bool {
13931399
let ty = self.resolve_type_vars_if_possible(&ty);
1394-
if ty.needs_infer() {
1400+
if ty.needs_infer() ||
1401+
(ty.has_closure_types() && !self.tables_are_tcx_tables()) {
13951402
// this can get called from typeck (by euv), and moves_by_default
13961403
// rightly refuses to work with inference variables, but
13971404
// moves_by_default has a cache, which we want to use in other

src/test/run-pass/issue-28550.rs

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Copyright 2015 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+
struct A<F: FnOnce()->T,T>(F::Output);
12+
struct B<F: FnOnce()->T,T>(A<F,T>);
13+
14+
// Removing Option causes it to compile.
15+
fn foo<T,F: FnOnce()->T>(f: F) -> Option<B<F,T>> {
16+
Some(B(A(f())))
17+
}
18+
19+
fn main() {
20+
let v = (|| foo(||4))();
21+
match v {
22+
Some(B(A(4))) => {},
23+
_ => unreachable!()
24+
}
25+
}

0 commit comments

Comments
 (0)