Update to master

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

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

diff --git a/src/bin/cargo-compile.rs b/src/bin/cargo-compile.rs
index bbfb78ad75666cdaafa8e6ae5d94c9cec504e3ab..baff57f7b2e954c883d66d7fc83a0c45273c6ee4 100644 (file)
--- a/src/bin/cargo-compile.rs
+++ b/src/bin/cargo-compile.rs
@@ -16,7 +16,7 @@ use cargo::ops;
 use cargo::util::important_paths::find_project;
 use cargo::util::ToCLI;
 
-#[deriving(Eq,Clone,Decodable,Encodable)]
+#[deriving(PartialEq,Clone,Decodable,Encodable)]
 pub struct Options {
     manifest_path: Option<String>
 }

diff --git a/src/bin/cargo-git-checkout.rs b/src/bin/cargo-git-checkout.rs
index ed64f83b7188ec5d45812989a9194484ea995430..801160f88e1718ff1de4e3e78ceaf1a95f9f3555 100644 (file)
--- a/src/bin/cargo-git-checkout.rs
+++ b/src/bin/cargo-git-checkout.rs
@@ -11,7 +11,7 @@ use cargo::core::source::Source;
 use cargo::sources::git::{GitSource,GitRemote};
 use url::Url;
 
-#[deriving(Eq,Clone,Decodable)]
+#[deriving(PartialEq,Clone,Decodable)]
 struct Options {
     database_path: String,
     checkout_path: String,

diff --git a/src/bin/cargo-read-manifest.rs b/src/bin/cargo-read-manifest.rs
index 0d684670531e492d88b84f0b2d055630c0113070..63a72293f8f1bff26515a348f2cb89815c54cd8e 100644 (file)
--- a/src/bin/cargo-read-manifest.rs
+++ b/src/bin/cargo-read-manifest.rs
@@ -10,7 +10,7 @@ use cargo::{execute_main_without_stdin,CLIResult,CLIError};
 use cargo::core::Package;
 use cargo::ops;
 
-#[deriving(Eq,Clone,Decodable)]
+#[deriving(PartialEq,Clone,Decodable)]
 struct Options {
     manifest_path: String
 }

diff --git a/src/bin/cargo.rs b/src/bin/cargo.rs
index d803bbda970072e9ff892278daefa98e22d20a6d..54af358cbd3301bb5f786e089ba711a5fd51000f 100644 (file)
--- a/src/bin/cargo.rs
+++ b/src/bin/cargo.rs
@@ -4,7 +4,6 @@ extern crate cargo;
 extern crate toml;
 extern crate hammer;
 extern crate serialize;
-extern crate collections;
 #[phase(syntax, link)]
 extern crate log;
 
@@ -67,7 +66,7 @@ fn process(args: Vec<String>) -> CLIResult<(String, Vec<String>)> {
 
 #[deriving(Encodable)]
 struct ConfigOut {
-    values: collections::HashMap<String, config::ConfigValue>
+    values: std::collections::HashMap<String, config::ConfigValue>
 }
 
 #[deriving(Decodable)]
@@ -90,7 +89,7 @@ fn config_for_key(args: ConfigForKeyFlags) -> CLIResult<Option<ConfigOut>> {
         println!("{}", value);
         Ok(None)
     } else {
-        let mut map = collections::HashMap::new();
+        let mut map = std::collections::HashMap::new();
         map.insert(args.key.clone(), value);
         Ok(Some(ConfigOut { values: map }))
     }

diff --git a/src/cargo/core/dependency.rs b/src/cargo/core/dependency.rs
index ce7b9c27328e420f4023db3b955fadcd539446ba..836c962dd3d5e210e984933737f8de8bcf05ebd7 100644 (file)
--- a/src/cargo/core/dependency.rs
+++ b/src/cargo/core/dependency.rs
@@ -2,7 +2,7 @@ use semver::Version;
 use core::{VersionReq};
 use util::CargoResult;
 
-#[deriving(Eq,Clone,Show)]
+#[deriving(PartialEq,Clone,Show)]
 pub struct Dependency {
     name: String,
     req: VersionReq
@@ -39,7 +39,7 @@ impl Dependency {
     }
 }
 
-#[deriving(Eq,Clone,Encodable)]
+#[deriving(PartialEq,Clone,Encodable)]
 pub struct SerializedDependency {
     name: String,
     req: String

diff --git a/src/cargo/core/manifest.rs b/src/cargo/core/manifest.rs
index 00ac9ce71543f315be9460bb1ad24d077a76a56e..a2be98d7df5203ac54eaa897e3a46ca9e8683e84 100644 (file)
--- a/src/cargo/core/manifest.rs
+++ b/src/cargo/core/manifest.rs
@@ -1,6 +1,6 @@
 use std::fmt;
 use std::fmt::{Show,Formatter};
-use collections::HashMap;
+use std::collections::HashMap;
 use semver::Version;
 use serialize::{Encoder,Encodable};
 use core::{
@@ -12,7 +12,7 @@ use core::{
 use core::dependency::SerializedDependency;
 use util::CargoResult;
 
-#[deriving(Eq,Clone)]
+#[deriving(PartialEq,Clone)]
 pub struct Manifest {
     summary: Summary,
     authors: Vec<String>,
@@ -26,7 +26,7 @@ impl Show for Manifest {
     }
 }
 
-#[deriving(Eq,Clone,Encodable)]
+#[deriving(PartialEq,Clone,Encodable)]
 pub struct SerializedManifest {
     name: String,
     version: String,
@@ -49,13 +49,13 @@ impl<E, S: Encoder<E>> Encodable<S, E> for Manifest {
     }
 }
 
-#[deriving(Show,Clone,Eq,Encodable)]
+#[deriving(Show,Clone,PartialEq,Encodable)]
 pub enum TargetKind {
     LibTarget,
     BinTarget
 }
 
-#[deriving(Clone,Eq)]
+#[deriving(Clone,PartialEq)]
 pub struct Target {
     kind: TargetKind,
     name: String,
@@ -181,7 +181,7 @@ impl Target {
 type TomlLibTarget = TomlTarget;
 type TomlBinTarget = TomlTarget;
 
-#[deriving(Decodable,Encodable,Eq,Clone,Show)]
+#[deriving(Decodable,Encodable,PartialEq,Clone,Show)]
 pub struct Project {
     pub name: String,
     pub version: String,
@@ -192,7 +192,7 @@ pub struct Project {
  * TODO: Make all struct fields private
  */
 
-#[deriving(Decodable,Encodable,Eq,Clone)]
+#[deriving(Decodable,Encodable,PartialEq,Clone)]
 pub struct TomlManifest {
     project: Box<Project>,
     lib: Option<~[TomlLibTarget]>,
@@ -242,7 +242,7 @@ impl Project {
     }
 }
 
-#[deriving(Decodable,Encodable,Eq,Clone,Show)]
+#[deriving(Decodable,Encodable,PartialEq,Clone,Show)]
 struct TomlTarget {
     name: String,
     path: Option<String>

diff --git a/src/cargo/core/namever.rs b/src/cargo/core/namever.rs
index 7dfc8525200152d006b0790cfdd10b0ab98826b8..b09475c1c60c64bff3e913ee63ff92cfc93817fc 100644 (file)
--- a/src/cargo/core/namever.rs
+++ b/src/cargo/core/namever.rs
@@ -8,7 +8,7 @@ use serialize::{
     Decoder
 };
 
-#[deriving(Clone,Eq,Ord)]
+#[deriving(Clone,PartialEq,PartialOrd)]
 pub struct NameVer {
     name: String,
     version: semver::Version

diff --git a/src/cargo/core/package.rs b/src/cargo/core/package.rs
index ad1f7b85264b17fd4bdadb55c92d2f58b4bc2fe3..1a54c1e8c750e633cdb7714480f53860cc50fbe7 100644 (file)
--- a/src/cargo/core/package.rs
+++ b/src/cargo/core/package.rs
@@ -15,7 +15,7 @@ use core::dependency::SerializedDependency;
 use util::graph;
 use serialize::{Encoder,Encodable};
 
-#[deriving(Clone,Eq)]
+#[deriving(Clone,PartialEq)]
 pub struct Package {
     // The package's manifest
     manifest: Manifest,
@@ -109,7 +109,7 @@ impl Show for Package {
     }
 }
 
-#[deriving(Eq,Clone,Show)]
+#[deriving(PartialEq,Clone,Show)]
 pub struct PackageSet {
     packages: Vec<Package>
 }

diff --git a/src/cargo/core/resolver.rs b/src/cargo/core/resolver.rs
index bf31e24ceb43fe613026a00c3a9b3f78368e9f2c..3308cc581c2cab397a6cfff77ec2a2f2471f3ab4 100644 (file)
--- a/src/cargo/core/resolver.rs
+++ b/src/cargo/core/resolver.rs
@@ -1,4 +1,4 @@
-use collections::HashMap;
+use std::collections::HashMap;
 use core::{
     Dependency,
     NameVer,

diff --git a/src/cargo/core/summary.rs b/src/cargo/core/summary.rs
index 49d87fdd112b0590f221180ab3bd37de947a28dc..ec820efcc3de2fafeb4fc1f55d4d11f5c2129e47 100644 (file)
--- a/src/cargo/core/summary.rs
+++ b/src/cargo/core/summary.rs
@@ -4,7 +4,7 @@ use core::{
     NameVer
 };
 
-#[deriving(Show,Clone,Eq)]
+#[deriving(Show,Clone,PartialEq)]
 pub struct Summary {
     name_ver: NameVer,
     dependencies: Vec<Dependency>

diff --git a/src/cargo/core/version_req.rs b/src/cargo/core/version_req.rs
index b0642c0648d699a76ee7eda4cb3b9d452c7f572b..0c995658e1cbd7ace81e00e7c86360e21051daf2 100644 (file)
--- a/src/cargo/core/version_req.rs
+++ b/src/cargo/core/version_req.rs
@@ -6,12 +6,12 @@ use std::str::CharOffsets;
 use semver::Version;
 use util::{other_error,CargoResult};
 
-#[deriving(Eq,Clone)]
+#[deriving(PartialEq,Clone)]
 pub struct VersionReq {
     predicates: Vec<Predicate>
 }
 
-#[deriving(Eq,Clone)]
+#[deriving(PartialEq,Clone)]
 enum Op {
     Ex,   // Exact
     Gt,   // Greater than
@@ -20,7 +20,7 @@ enum Op {
     LtEq  // Less than or equal to
 }
 
-#[deriving(Eq,Clone)]
+#[deriving(PartialEq,Clone)]
 struct Predicate {
     op: Op,
     major: uint,
@@ -225,7 +225,7 @@ struct Lexer<'a> {
     state: LexState
 }
 
-#[deriving(Show,Eq)]
+#[deriving(Show,PartialEq)]
 enum LexState {
     LexInit,
     LexStart,

diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs
index 1ee1b8900fa27c445f93c5b3aab1e192faa50acf..6f11427ecc09e5b90d4f139b8040122768042e96 100644 (file)
--- a/src/cargo/lib.rs
+++ b/src/cargo/lib.rs
@@ -4,7 +4,6 @@
 #![allow(deprecated_owned_vector)]
 #![feature(macro_rules,phase)]
 
-extern crate collections;
 extern crate term;
 extern crate url;
 extern crate serialize;

diff --git a/src/cargo/sources/git/utils.rs b/src/cargo/sources/git/utils.rs
index 50a3c7c25d0d8f20b878987561b40ba26e118304..7218ee41fb1e8ac2781ea2706b735790fdc76ab0 100644 (file)
--- a/src/cargo/sources/git/utils.rs
+++ b/src/cargo/sources/git/utils.rs
@@ -7,7 +7,7 @@ use std::io::{UserDir,AllPermissions};
 use std::io::fs::{mkdir_recursive,rmdir_recursive,chmod};
 use serialize::{Encodable,Encoder};
 
-#[deriving(Eq,Clone,Encodable)]
+#[deriving(PartialEq,Clone,Encodable)]
 pub enum GitReference {
     Master,
     Other(String)
@@ -67,13 +67,13 @@ macro_rules! errln(
  * GitRemote represents a remote repository. It gets cloned into a local GitDatabase.
  */
 
-#[deriving(Eq,Clone)]
+#[deriving(PartialEq,Clone)]
 pub struct GitRemote {
     url: Url,
     verbose: bool
 }
 
-#[deriving(Eq,Clone,Encodable)]
+#[deriving(PartialEq,Clone,Encodable)]
 struct EncodableGitRemote {
     url: String
 }
@@ -91,7 +91,7 @@ impl<E, S: Encoder<E>> Encodable<S, E> for GitRemote {
  * can be cloned from this GitDatabase.
  */
 
-#[deriving(Eq,Clone)]
+#[deriving(PartialEq,Clone)]
 pub struct GitDatabase {
     remote: GitRemote,
     path: Path,

diff --git a/src/cargo/util/config.rs b/src/cargo/util/config.rs
index 308d44f89934ae7618f56d9411270062d1ae1e03..746e31de224e5a31baaa81401d9b13ccba5c2654 100644 (file)
--- a/src/cargo/util/config.rs
+++ b/src/cargo/util/config.rs
@@ -1,16 +1,16 @@
 use std::{io,fmt};
-use collections::HashMap;
+use std::collections::HashMap;
 use serialize::{Encodable,Encoder};
 use toml;
 use util::{other_error,CargoResult,Require};
 
-#[deriving(Eq,TotalEq,Clone,Encodable,Decodable)]
+#[deriving(Eq,PartialEq,Clone,Encodable,Decodable)]
 pub enum Location {
     Project,
     Global
 }
 
-#[deriving(Eq,TotalEq,Clone,Decodable)]
+#[deriving(Eq,PartialEq,Clone,Decodable)]
 pub enum ConfigValueValue {
     String(String),
     List(Vec<String>)
@@ -40,7 +40,7 @@ impl<E, S: Encoder<E>> Encodable<S, E> for ConfigValueValue {
     }
 }
 
-#[deriving(Eq,TotalEq,Clone,Decodable)]
+#[deriving(Eq,PartialEq,Clone,Decodable)]
 pub struct ConfigValue {
     value: ConfigValueValue,
     path: Vec<Path>

diff --git a/src/cargo/util/graph.rs b/src/cargo/util/graph.rs
index 974240ebeced8a4b8dcf602f646308a6b40a3fd2..8a9c18e0f8b5a59244ee6ea0a48694790914b593 100644 (file)
--- a/src/cargo/util/graph.rs
+++ b/src/cargo/util/graph.rs
@@ -1,5 +1,5 @@
 use std::hash::Hash;
-use collections::HashMap;
+use std::collections::HashMap;
 
 pub struct Graph<N> {
     nodes: HashMap<N, ~[N]>
@@ -10,7 +10,7 @@ enum Mark {
     Done
 }
 
-impl<N: TotalEq + Hash + Clone> Graph<N> {
+impl<N: Eq + Hash + Clone> Graph<N> {
     pub fn new() -> Graph<N> {
         Graph { nodes: HashMap::new() }
     }

diff --git a/src/cargo/util/process_builder.rs b/src/cargo/util/process_builder.rs
index 4d332fbdd8a5bbc7348e9894bcd41db009cd6c0c..416c023acb74d5563e58700b011da82275860eeb 100644 (file)
--- a/src/cargo/util/process_builder.rs
+++ b/src/cargo/util/process_builder.rs
@@ -4,9 +4,9 @@ use std::os;
 use std::path::Path;
 use std::io::process::{Command,ProcessOutput,InheritFd};
 use util::{CargoResult,io_error,process_error};
-use collections::HashMap;
+use std::collections::HashMap;
 
-#[deriving(Clone,Eq)]
+#[deriving(Clone,PartialEq)]
 pub struct ProcessBuilder {
     program: String,
     args: Vec<String>,

diff --git a/src/cargo/util/result.rs b/src/cargo/util/result.rs
index 26b235b88945787228df4e4dd777469aa4a1b4be..66489790e2d1bd57ff83e816099e40b9fd09d35e 100644 (file)
--- a/src/cargo/util/result.rs
+++ b/src/cargo/util/result.rs
@@ -69,7 +69,7 @@ pub fn toml_error(desc: &'static str, error: toml::Error) -> CargoError {
     }
 }
 
-#[deriving(Eq,Clone)]
+#[deriving(PartialEq,Clone)]
 pub struct CargoError {
     pub kind: CargoErrorKind,
     desc: CargoErrorDescription,
@@ -86,7 +86,7 @@ impl Show for CargoError {
     }
 }
 
-#[deriving(Eq,Show,Clone)]
+#[deriving(PartialEq,Show,Clone)]
 enum CargoErrorDescription {
     StaticDescription(&'static str),
     BoxedDescription(String)
@@ -127,7 +127,7 @@ impl CargoError {
     }
 }
 
-#[deriving(Eq)]
+#[deriving(PartialEq)]
 pub enum CargoErrorKind {
     HumanReadableError,
     InternalError,