From c041e8ec9422a8d05dfc88a12c69f02f89c89319 Mon Sep 17 00:00:00 2001 From: Yehuda Katz + Carl Lerche Date: Mon, 9 Jun 2014 12:28:54 -0700 Subject: [PATCH] Update to master --- libs/hammer.rs | 2 +- libs/rust-toml | 2 +- src/bin/cargo-compile.rs | 2 +- src/bin/cargo-git-checkout.rs | 2 +- src/bin/cargo-read-manifest.rs | 2 +- src/bin/cargo.rs | 5 ++--- src/cargo/core/dependency.rs | 4 ++-- src/cargo/core/manifest.rs | 16 ++++++++-------- src/cargo/core/namever.rs | 2 +- src/cargo/core/package.rs | 4 ++-- src/cargo/core/resolver.rs | 2 +- src/cargo/core/summary.rs | 2 +- src/cargo/core/version_req.rs | 8 ++++---- src/cargo/lib.rs | 1 - src/cargo/sources/git/utils.rs | 8 ++++---- src/cargo/util/config.rs | 8 ++++---- src/cargo/util/graph.rs | 4 ++-- src/cargo/util/process_builder.rs | 4 ++-- src/cargo/util/result.rs | 6 +++--- 19 files changed, 41 insertions(+), 43 deletions(-) diff --git a/libs/hammer.rs b/libs/hammer.rs index ceae88af0..ae740b4ba 160000 --- 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 cf8026d84..f4299be4b 160000 --- 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 bbfb78ad7..baff57f7b 100644 --- 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 } diff --git a/src/bin/cargo-git-checkout.rs b/src/bin/cargo-git-checkout.rs index ed64f83b7..801160f88 100644 --- 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 0d6846705..63a72293f 100644 --- 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 d803bbda9..54af358cb 100644 --- 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) -> CLIResult<(String, Vec)> { #[deriving(Encodable)] struct ConfigOut { - values: collections::HashMap + values: std::collections::HashMap } #[deriving(Decodable)] @@ -90,7 +89,7 @@ fn config_for_key(args: ConfigForKeyFlags) -> CLIResult> { 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 ce7b9c273..836c962dd 100644 --- 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 00ac9ce71..a2be98d7d 100644 --- 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, @@ -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> Encodable 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, 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 diff --git a/src/cargo/core/namever.rs b/src/cargo/core/namever.rs index 7dfc85252..b09475c1c 100644 --- 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 ad1f7b852..1a54c1e8c 100644 --- 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 } diff --git a/src/cargo/core/resolver.rs b/src/cargo/core/resolver.rs index bf31e24ce..3308cc581 100644 --- 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 49d87fdd1..ec820efcc 100644 --- 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 diff --git a/src/cargo/core/version_req.rs b/src/cargo/core/version_req.rs index b0642c064..0c995658e 100644 --- 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 } -#[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 1ee1b8900..6f11427ec 100644 --- 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 50a3c7c25..7218ee41f 100644 --- 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> Encodable 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 308d44f89..746e31de2 100644 --- 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) @@ -40,7 +40,7 @@ impl> Encodable for ConfigValueValue { } } -#[deriving(Eq,TotalEq,Clone,Decodable)] +#[deriving(Eq,PartialEq,Clone,Decodable)] pub struct ConfigValue { value: ConfigValueValue, path: Vec diff --git a/src/cargo/util/graph.rs b/src/cargo/util/graph.rs index 974240ebe..8a9c18e0f 100644 --- 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 { nodes: HashMap @@ -10,7 +10,7 @@ enum Mark { Done } -impl Graph { +impl Graph { pub fn new() -> Graph { Graph { nodes: HashMap::new() } } diff --git a/src/cargo/util/process_builder.rs b/src/cargo/util/process_builder.rs index 4d332fbdd..416c023ac 100644 --- 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, diff --git a/src/cargo/util/result.rs b/src/cargo/util/result.rs index 26b235b88..66489790e 100644 --- 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,