Up to master

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

diff --git a/src/bin/cargo.rs b/src/bin/cargo.rs
index cca534dbb04499e4f5110f9599a3e0619a66ca7b..8c9cb52e12eb320b78661c5968c25fbb91fea5c4 100644 (file)
--- a/src/bin/cargo.rs
+++ b/src/bin/cargo.rs
@@ -37,10 +37,10 @@ fn execute() {
     else if cmd == "locate-project".to_owned() { execute_main_without_stdin(locate_project) }
 }
 
-fn process(mut args: ~[~str]) -> CLIResult<(~str, ~[~str])> {
-    args = args.tail().to_owned();
-    let head = try!(args.head().to_result(|_| CLIError::new("No subcommand found", None, 1))).to_owned();
-    let tail = args.tail().to_owned();
+fn process(mut args: Vec<~str>) -> CLIResult<(~str, Vec<~str>)> {
+    args = Vec::from_slice(args.tail());
+    let head = try!(args.iter().nth(0).to_result(|_| CLIError::new("No subcommand found", None, 1))).to_owned();
+    let tail = Vec::from_slice(args.tail());
 
     Ok((head, tail))
 }

diff --git a/src/cargo/core/package.rs b/src/cargo/core/package.rs
index 456d4902ab1f0e65f98e974fc3f6818d34f2aec2..5131066011b7a1b55c12f5426fa92144573b7613 100644 (file)
--- a/src/cargo/core/package.rs
+++ b/src/cargo/core/package.rs
@@ -100,12 +100,12 @@ impl Show for Package {
 
 #[deriving(Eq,Clone,Show)]
 pub struct PackageSet {
-    packages: ~[Package]
+    packages: Vec<Package>
 }
 
 impl PackageSet {
     pub fn new(packages: &[Package]) -> PackageSet {
-        PackageSet { packages: packages.to_owned() }
+        PackageSet { packages: Vec::from_slice(packages) }
     }
 
     /**
@@ -115,7 +115,7 @@ impl PackageSet {
         self.packages.iter().find(|pkg| name == pkg.get_name()).unwrap()
     }
 
-    pub fn get_all<'a>(&'a self, names: &[&str]) -> ~[&'a Package] {
+    pub fn get_all<'a>(&'a self, names: &[&str]) -> Vec<&'a Package> {
         names.iter().map(|name| self.get(*name) ).collect()
     }
 
@@ -129,7 +129,7 @@ impl PackageSet {
         let mut graph = graph::Graph::new();
 
         for pkg in self.packages.iter() {
-            let deps: ~[&str] = pkg.get_dependencies().iter()
+            let deps: Vec<&str> = pkg.get_dependencies().iter()
                 .map(|dep| dep.get_name())
                 .collect();