Cleanup some mistakes made during rebasing/merging.
This commit is contained in:
parent
ceeffa1ec6
commit
62befac51f
@ -30,7 +30,7 @@ use cast;
|
||||
use io;
|
||||
use libc;
|
||||
use libc::{c_char, c_void, c_int, size_t};
|
||||
use libc::{mode_t, pid_t, FILE};
|
||||
use libc::{mode_t, FILE};
|
||||
use option;
|
||||
use option::{Some, None};
|
||||
use prelude::*;
|
||||
|
@ -18,7 +18,6 @@ use option::{Some, None};
|
||||
use os;
|
||||
use prelude::*;
|
||||
use ptr;
|
||||
use run;
|
||||
use str;
|
||||
use task;
|
||||
use vec;
|
||||
@ -377,7 +376,7 @@ pub fn start_program(prog: &str, args: &[~str]) -> @Program {
|
||||
fn force_destroy(&mut self) { destroy_repr(&mut self.r, true); }
|
||||
}
|
||||
|
||||
let mut repr = ProgRepr {
|
||||
let repr = ProgRepr {
|
||||
pid: res.pid,
|
||||
handle: res.handle,
|
||||
in_fd: pipe_input.out,
|
||||
|
Loading…
Reference in New Issue
Block a user