Up to date with master

diff --git a/libs/hamcrest-rust b/libs/hamcrest-rust
index e68c3610068f446304f88e08a57a9e7e3693fa59..16b761d4372b4e91af06848781c8e998c3f25116 160000 (submodule)
--- a/libs/hamcrest-rust
+++ b/libs/hamcrest-rust
@@ -1 +1 @@
-Subproject commit e68c3610068f446304f88e08a57a9e7e3693fa59
+Subproject commit 16b761d4372b4e91af06848781c8e998c3f25116

diff --git a/libs/hammer.rs b/libs/hammer.rs
index 5fbc58a5f2251c427f405234a52a4bb54241b19a..b0b1d965e658ccdf751e57c4d9db8b9b86ceee4e 160000 (submodule)
--- a/libs/hammer.rs
+++ b/libs/hammer.rs
@@ -1 +1 @@
-Subproject commit 5fbc58a5f2251c427f405234a52a4bb54241b19a
+Subproject commit b0b1d965e658ccdf751e57c4d9db8b9b86ceee4e

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

diff --git a/src/bin/cargo-git-checkout.rs b/src/bin/cargo-git-checkout.rs
index a35df0b32dadb7176fd419341e301dfe5af81661..7bbf7aabfb5269829e4b4a27caf54fb6df8fcb80 100644 (file)
--- a/src/bin/cargo-git-checkout.rs
+++ b/src/bin/cargo-git-checkout.rs
@@ -7,7 +7,6 @@ extern crate url;
 
 use hammer::FlagConfig;
 use cargo::{execute_main_without_stdin,CLIResult,CLIError,ToResult};
-use cargo::util::ToCLI;
 use cargo::sources::git::{GitRemoteRepo,GitRepo};
 use url::Url;
 

diff --git a/src/bin/cargo.rs b/src/bin/cargo.rs
index 8b0c626ce7a1fc2e85790f70d4eb84920811ff21..d803bbda970072e9ff892278daefa98e22d20a6d 100644 (file)
--- a/src/bin/cargo.rs
+++ b/src/bin/cargo.rs
@@ -59,7 +59,7 @@ fn execute() {
 
 fn process(args: Vec<String>) -> CLIResult<(String, Vec<String>)> {
     let args: Vec<String> = Vec::from_slice(args.tail());
-    let head = try!(args.iter().nth(0).to_result(|_| CLIError::new("No subcommand found", None::<&str>, 1))).to_owned();
+    let head = try!(args.iter().nth(0).to_result(|_| CLIError::new("No subcommand found", None::<&str>, 1))).to_str();
     let tail = Vec::from_slice(args.tail());
 
     Ok((head, tail))

diff --git a/src/cargo/core/version_req.rs b/src/cargo/core/version_req.rs
index 8dfb49ff2efabc8390d7c5cdd7183048a3d697d6..b0642c0648d699a76ee7eda4cb3b9d452c7f572b 100644 (file)
--- a/src/cargo/core/version_req.rs
+++ b/src/cargo/core/version_req.rs
@@ -500,14 +500,14 @@ mod test {
     pub fn test_parsing_exact() {
         let r = req("1.0.0");
 
-        assert!(r.to_str() == "= 1.0.0".to_owned());
+        assert!(r.to_str() == "= 1.0.0".to_str());
 
         assert_match(&r, ["1.0.0"]);
         assert_not_match(&r, ["1.0.1", "0.9.9", "0.10.0", "0.1.0"]);
 
         let r = req("0.9.0");
 
-        assert!(r.to_str() == "= 0.9.0".to_owned());
+        assert!(r.to_str() == "= 0.9.0".to_str());
 
         assert_match(&r, ["0.9.0"]);
         assert_not_match(&r, ["0.9.1", "1.9.0", "0.0.9"]);
@@ -517,7 +517,7 @@ mod test {
     pub fn test_parsing_greater_than() {
         let r = req(">= 1.0.0");
 
-        assert!(r.to_str() == ">= 1.0.0".to_owned());
+        assert!(r.to_str() == ">= 1.0.0".to_str());
 
         assert_match(&r, ["1.0.0"]);
     }

diff --git a/src/cargo/ops/cargo_compile.rs b/src/cargo/ops/cargo_compile.rs
index fe6c499fb48bdc1a8e496ecff21f994b50ae8853..a0311c9ea7a1bbe2100bd54f61f5eeebc663c31b 100644 (file)
--- a/src/cargo/ops/cargo_compile.rs
+++ b/src/cargo/ops/cargo_compile.rs
@@ -17,7 +17,7 @@
 use std::os;
 use util::config;
 use util::config::{ConfigValue};
-use core::{Package,PackageSet,Source};
+use core::{PackageSet,Source};
 use core::resolver::resolve;
 use sources::path::PathSource;
 use ops;

diff --git a/src/cargo/ops/cargo_rustc.rs b/src/cargo/ops/cargo_rustc.rs
index 907a6ca96f61f05e1746e4c0b94677f4d2fa7b5f..d04ecfd72eb59b9e8d209b28077bf42f2e16fa82 100644 (file)
--- a/src/cargo/ops/cargo_rustc.rs
+++ b/src/cargo/ops/cargo_rustc.rs
@@ -1,4 +1,3 @@
-use std::os;
 use std::os::args;
 use std::io;
 use std::path::Path;

diff --git a/src/cargo/util/process_builder.rs b/src/cargo/util/process_builder.rs
index 5ad4a5fd5495bd4dd53309993043613b4f3d7ce9..4d332fbdd8a5bbc7348e9894bcd41db009cd6c0c 100644 (file)
--- a/src/cargo/util/process_builder.rs
+++ b/src/cargo/util/process_builder.rs
@@ -54,10 +54,10 @@ impl ProcessBuilder {
     pub fn env(mut self, key: &str, val: Option<&str>) -> ProcessBuilder {
         match val {
             Some(v) => {
-                self.env.insert(key.to_strbuf(), v.to_strbuf());
+                self.env.insert(key.to_str(), v.to_str());
             },
             None => {
-                self.env.remove(&key.to_strbuf());
+                self.env.remove(&key.to_str());
             }
         }
 

diff --git a/tests/support.rs b/tests/support.rs
index 456a3a11284588f6fa7a8a3863d38ff1deceb8b6..59595a28195baa0510b59fc68f1f1053f61400bc 100644 (file)
--- a/tests/support.rs
+++ b/tests/support.rs
@@ -29,7 +29,7 @@ struct FileBuilder {
 
 impl FileBuilder {
     pub fn new(path: Path, body: &str) -> FileBuilder {
-        FileBuilder { path: path, body: body.to_owned() }
+        FileBuilder { path: path, body: body.to_str() }
     }
 
     fn mk(&self) -> Result<(), String> {
@@ -58,7 +58,7 @@ struct ProjectBuilder {
 impl ProjectBuilder {
     pub fn new(name: &str, root: Path) -> ProjectBuilder {
         ProjectBuilder {
-            name: name.to_owned(),
+            name: name.to_str(),
             root: root,
             files: vec!()
         }
@@ -167,12 +167,12 @@ struct Execs {
 impl Execs {
 
   pub fn with_stdout(mut ~self, expected: &str) -> Box<Execs> {
-    self.expect_stdout = Some(expected.to_owned());
+    self.expect_stdout = Some(expected.to_str());
     self
   }
 
   pub fn with_stderr(mut ~self, expected: &str) -> Box<Execs> {
-      self.expect_stderr = Some(expected.to_owned());
+      self.expect_stderr = Some(expected.to_str());
       self
   }
 
@@ -223,7 +223,7 @@ impl Execs {
 
 impl ham::SelfDescribing for Execs {
   fn describe(&self) -> String {
-    "execs".to_owned()
+    "execs".to_str()
   }
 }
 

diff --git a/tests/test_cargo_compile.rs b/tests/test_cargo_compile.rs
index 7b984425c454e6d8165ca91b68c9a65c911d7076..be1dc7e0baaac08bc3c5004674f04891df34f002 100644 (file)
--- a/tests/test_cargo_compile.rs
+++ b/tests/test_cargo_compile.rs
@@ -114,7 +114,7 @@ test!(cargo_compile_with_warnings_in_a_dep_package {
         "#)
         .file("bar/src/bar.rs", r#"
             pub fn gimme() -> String {
-                "test passed".to_owned()
+                "test passed".to_str()
             }
 
             fn dead() {}