Skip to content

Commit

Permalink
Fix type inference for proc expressions
Browse files Browse the repository at this point in the history
  • Loading branch information
sanxiyn committed Dec 2, 2013
1 parent 6c672ee commit e41c331
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 2 deletions.
15 changes: 13 additions & 2 deletions src/librustc/middle/typeck/check/mod.rs
Expand Up @@ -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)
}
}
};
Expand Down
18 changes: 18 additions & 0 deletions 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);
}

9 comments on commit e41c331

@bors
Copy link
Contributor

@bors bors commented on e41c331 Dec 2, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from cmr
at sanxiyn@e41c331

@bors
Copy link
Contributor

@bors bors commented on e41c331 Dec 2, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging sanxiyn/rust/proc = e41c331 into auto

@bors
Copy link
Contributor

@bors bors commented on e41c331 Dec 2, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sanxiyn/rust/proc = e41c331 merged ok, testing candidate = d4f37715

@bors
Copy link
Contributor

@bors bors commented on e41c331 Dec 2, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on e41c331 Dec 2, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from cmr
at sanxiyn@e41c331

@bors
Copy link
Contributor

@bors bors commented on e41c331 Dec 2, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging sanxiyn/rust/proc = e41c331 into auto

@bors
Copy link
Contributor

@bors bors commented on e41c331 Dec 2, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sanxiyn/rust/proc = e41c331 merged ok, testing candidate = fc4540d

@bors
Copy link
Contributor

@bors bors commented on e41c331 Dec 2, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on e41c331 Dec 2, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = fc4540d

Please sign in to comment.