Skip to content

Commit 62befac

Browse files
garethgareth
gareth
authored and
gareth
committed
Cleanup some mistakes made during rebasing/merging.
1 parent ceeffa1 commit 62befac

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

src/libcore/os.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use cast;
3030
use io;
3131
use libc;
3232
use libc::{c_char, c_void, c_int, size_t};
33-
use libc::{mode_t, pid_t, FILE};
33+
use libc::{mode_t, FILE};
3434
use option;
3535
use option::{Some, None};
3636
use prelude::*;

src/libcore/run.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ use option::{Some, None};
1818
use os;
1919
use prelude::*;
2020
use ptr;
21-
use run;
2221
use str;
2322
use task;
2423
use vec;
@@ -377,7 +376,7 @@ pub fn start_program(prog: &str, args: &[~str]) -> @Program {
377376
fn force_destroy(&mut self) { destroy_repr(&mut self.r, true); }
378377
}
379378

380-
let mut repr = ProgRepr {
379+
let repr = ProgRepr {
381380
pid: res.pid,
382381
handle: res.handle,
383382
in_fd: pipe_input.out,

0 commit comments

Comments
 (0)