about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgareth <gareth@gareth-N56VM.(none)>2013-04-23 21:22:19 +0100
committergareth <gareth@gareth-N56VM.(none)>2013-04-23 21:23:16 +0100
commit62befac51fadbdd64050d84c796e3952789870a1 (patch)
tree6bf85431158246b9091158b1897b3da270e6a019
parentceeffa1ec662f4c1e214f3762ac116a21886078e (diff)
downloadrust-62befac51fadbdd64050d84c796e3952789870a1.tar.gz
rust-62befac51fadbdd64050d84c796e3952789870a1.zip
Cleanup some mistakes made during rebasing/merging.
-rw-r--r--src/libcore/os.rs2
-rw-r--r--src/libcore/run.rs3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/libcore/os.rs b/src/libcore/os.rs
index 4c660507f15..fa3ca4577c6 100644
--- a/src/libcore/os.rs
+++ b/src/libcore/os.rs
@@ -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::*;
diff --git a/src/libcore/run.rs b/src/libcore/run.rs
index 2ca0449cb59..2455954ebe1 100644
--- a/src/libcore/run.rs
+++ b/src/libcore/run.rs
@@ -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,