]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #19113 : nikomatsakis/rust/unboxed-boxed-closure-unification, r=acrichto
authorbors <bors@rust-lang.org>
Thu, 20 Nov 2014 12:01:44 +0000 (12:01 +0000)
committerbors <bors@rust-lang.org>
Thu, 20 Nov 2014 12:01:44 +0000 (12:01 +0000)
Use the expected type to infer the argument/return types of unboxed closures. Also, in `||` expressions, use the expected type to decide if the result should be a boxed or unboxed closure (and if an unboxed closure, what kind).

This supercedes PR #19089, which was already reviewed by @pcwalton.

14 files changed:
1  2 
src/librustc/middle/borrowck/mod.rs
src/librustc/middle/resolve.rs
src/librustc/middle/ty.rs
src/librustc/middle/typeck/astconv.rs
src/librustc/middle/typeck/check/mod.rs
src/librustc_back/svh.rs
src/librustc_trans/trans/base.rs
src/librustc_trans/trans/expr.rs
src/libsyntax/ast.rs
src/libsyntax/feature_gate.rs
src/libsyntax/fold.rs
src/libsyntax/parse/parser.rs
src/libsyntax/print/pprust.rs
src/libsyntax/visit.rs

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge