Cleanup some mistakes made during rebasing/merging.

diff --git a/src/libcore/os.rs b/src/libcore/os.rs
index 4c660507f15a01082d0364479d058353483e0c75..fa3ca4577c6d129a6421d26827bc79596df5324d 100644 (file)
--- a/src/libcore/os.rs
+++ b/src/libcore/os.rs
@@ -30,7 +30,7 @@
 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::*;

diff --git a/src/libcore/run.rs b/src/libcore/run.rs
index 2ca0449cb59f67a0141bdc6131f0d76d4ec3a117..2455954ebe128361dc7bd4298543dd78efe1ee61 100644 (file)
--- a/src/libcore/run.rs
+++ b/src/libcore/run.rs
@@ -18,7 +18,6 @@
 use os;
 use prelude::*;
 use ptr;
-use run;
 use str;
 use task;
 use vec;
@@ -377,7 +376,7 @@ fn finish(&mut self) -> int { finish_repr(&mut self.r) }
         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,