Track Rust master

diff --git a/libs/rust-toml b/libs/rust-toml
index c6bd1115bd8403170f69b248270c05e63fd0e249..aea7ecde1e0ada2e24d3e7804f3905b46f6edae4 160000 (submodule)
--- a/libs/rust-toml
+++ b/libs/rust-toml
@@ -1 +1 @@
-Subproject commit c6bd1115bd8403170f69b248270c05e63fd0e249
+Subproject commit aea7ecde1e0ada2e24d3e7804f3905b46f6edae4

diff --git a/src/bin/cargo-compile.rs b/src/bin/cargo-compile.rs
index 259572e5ca9609fb86b35fa1d659d5a2527a2aae..91f5356394b7981c44f95ac8b2391cf0f0667bb2 100644 (file)
--- a/src/bin/cargo-compile.rs
+++ b/src/bin/cargo-compile.rs
@@ -9,8 +9,8 @@ use std::vec::Vec;
 use serialize::{Decodable};
 use hammer::{FlagDecoder,FlagConfig,FlagConfiguration,HammerError};
 use std::io;
-use io::BufReader;
-use io::process::{Process,ProcessExit,ProcessOutput,InheritFd,ProcessConfig};
+use std::io::BufReader;
+use std::io::process::{Process,ProcessExit,ProcessOutput,InheritFd,ProcessConfig};
 use cargo::{ToCargoError,CargoResult};
 
 #[deriving(Decodable)]