Fix type inference for proc expressions

diff --git a/src/librustc/middle/typeck/check/mod.rs b/src/librustc/middle/typeck/check/mod.rs
index 8caf873a8896ab7a7cd0a0c8fd009400a7216884..dff66ee0915e335e2c8d0182667bfe9ca0b9b671 100644 (file)
--- a/src/librustc/middle/typeck/check/mod.rs
+++ b/src/librustc/middle/typeck/check/mod.rs
@@ -2247,8 +2247,19 @@ fn check_expr_fn(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 (file)
index 0000000..34804ed
--- /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);
+}