nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-28 02:57:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #28626 - arielb1:closure-needs-infer, r=nikomatsakis

Browse Source 
Fixes #28550
This commit is contained in:
bors 2015-10-02 21:02:49 +00:00
commit 669fc7f7d1
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/librustc/middle/infer/mod.rs
View File

@ -1394,9 +1394,16 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
self.resolve_type_vars_or_error(&ty)
}
pub fn tables_are_tcx_tables(&self) -> bool {
let tables: &RefCell<ty::Tables> = &self.tables;
let tcx_tables: &RefCell<ty::Tables> = &self.tcx.tables;
tables as *const _ == tcx_tables as *const _
}
pub fn type_moves_by_default(&self, ty: Ty<'tcx>, span: Span) -> bool {
let ty = self.resolve_type_vars_if_possible(&ty);
if ty.needs_infer() {
if ty.needs_infer() ||
(ty.has_closure_types() && !self.tables_are_tcx_tables()) {
// this can get called from typeck (by euv), and moves_by_default
// rightly refuses to work with inference variables, but
// moves_by_default has a cache, which we want to use in other

25
src/test/run-pass/issue-28550.rs Normal file
View File

@ -0,0 +1,25 @@
// 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.
struct A<F: FnOnce()->T,T>(F::Output);
struct B<F: FnOnce()->T,T>(A<F,T>);
// Removing Option causes it to compile.
fn foo<T,F: FnOnce()->T>(f: F) -> Option<B<F,T>> {
Some(B(A(f())))
}
fn main() {
let v = (|| foo(||4))();
match v {
Some(B(A(4))) => {},
_ => unreachable!()
}
}