Skip to content

Commit

Permalink
librustc: Ensure that proc upvars have static lifetime.
Browse files Browse the repository at this point in the history
Since procs do not have lifetime bounds, we must do this to maintain
safety.

This can break code that incorrectly captured references in procedure
types. Change such code to not do this, perhaps with a trait object
instead.

A better solution would be to add higher-rank lifetime support to procs.
However, this would be a lot of work for a feature we want to remove in
favor of unboxed closures. The corresponding "real fix" is rust-lang#15067.

Closes rust-lang#14036.

[breaking-change]
  • Loading branch information
pcwalton committed Jun 26, 2014
1 parent 4c33a14 commit 9a99084
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 2 deletions.
4 changes: 4 additions & 0 deletions src/libnative/io/process.rs
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,10 @@ fn spawn_process_os(cfg: ProcessConfig,

let dirp = cfg.cwd.map(|c| c.with_ref(|p| p)).unwrap_or(ptr::null());

let cfg = unsafe {
mem::transmute::<ProcessConfig,ProcessConfig<'static>>(cfg)
};

with_envp(cfg.env, proc(envp) {
with_argv(cfg.program, cfg.args, proc(argv) unsafe {
let (mut input, mut output) = try!(pipe());
Expand Down
10 changes: 8 additions & 2 deletions src/librustc/middle/kind.rs
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,14 @@ fn with_appropriate_checker(cx: &Context,
let fty = ty::node_id_to_type(cx.tcx, id);
match ty::get(fty).sty {
ty::ty_closure(box ty::ClosureTy {
store: ty::UniqTraitStore, bounds, ..
}) => b(|cx, fv| check_for_uniq(cx, fv, bounds)),
store: ty::UniqTraitStore,
bounds: mut bounds, ..
}) => {
// Procs can't close over non-static references!
bounds.add(ty::BoundStatic);

b(|cx, fv| check_for_uniq(cx, fv, bounds))
}

ty::ty_closure(box ty::ClosureTy {
store: ty::RegionTraitStore(region, _), bounds, ..
Expand Down
26 changes: 26 additions & 0 deletions src/test/compile-fail/proc-static-bound.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// Copyright 2014 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 main() {
let mut x = Some(1);
let mut p: proc(&mut Option<int>) = proc(_) {};
match x {
Some(ref y) => {
p = proc(z: &mut Option<int>) {
*z = None;
let _ = y;
//~^ ERROR cannot capture variable of type `&int`, which does not fulfill `'static`
};
}
None => {}
}
p(&mut x);
}

1 comment on commit 9a99084

@pcwalton
Copy link
Owner Author

Choose a reason for hiding this comment

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

r=alexcrichton

Please sign in to comment.