diff options
| author | Seo Sanghyeon <sanxiyn@gmail.com> | 2013-11-30 03:53:05 +0900 |
|---|---|---|
| committer | Seo Sanghyeon <sanxiyn@gmail.com> | 2013-12-02 21:39:53 +0900 |
| commit | e41c331b2e7bf75e3967ba02f30088ac43bb1dec (patch) | |
| tree | d9cae8a10d071cee05ee0461dfa91d1a5e5af29f /src | |
| parent | 6c672ee094a1a8e72c100100f43c73a9741f08a7 (diff) | |
| download | rust-e41c331b2e7bf75e3967ba02f30088ac43bb1dec.tar.gz rust-e41c331b2e7bf75e3967ba02f30088ac43bb1dec.zip | |
Fix type inference for proc expressions
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc/middle/typeck/check/mod.rs | 15 | ||||
| -rw-r--r-- | src/test/run-pass/issue-10718.rs | 18 |
2 files changed, 31 insertions, 2 deletions
diff --git a/src/librustc/middle/typeck/check/mod.rs b/src/librustc/middle/typeck/check/mod.rs index 8caf873a889..dff66ee0915 100644 --- a/src/librustc/middle/typeck/check/mod.rs +++ b/src/librustc/middle/typeck/check/mod.rs @@ -2247,8 +2247,19 @@ pub fn check_expr_with_unifier(fcx: @mut FnCtxt, } _ => { // Not an error! Means we're inferring the closure type - (None, ast::impure_fn, ast::BorrowedSigil, - ast::Many, ty::EmptyBuiltinBounds()) + let mut sigil = ast::BorrowedSigil; + let mut onceness = ast::Many; + let mut bounds = ty::EmptyBuiltinBounds(); + match expr.node { + ast::ExprProc(..) => { + sigil = ast::OwnedSigil; + onceness = ast::Once; + bounds.add(ty::BoundSend); + } + _ => () + } + (None, ast::impure_fn, sigil, + onceness, bounds) } } }; diff --git a/src/test/run-pass/issue-10718.rs b/src/test/run-pass/issue-10718.rs new file mode 100644 index 00000000000..34804eda287 --- /dev/null +++ b/src/test/run-pass/issue-10718.rs @@ -0,0 +1,18 @@ +// Copyright 2013 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 f(p: proc()) { + p(); +} + +pub fn main() { + let p = proc() (); + f(p); +} |
