auto merge of #1085 : geomaster/cargo/master, r=alexcrichton

rust-lang/rust#19253 and rust-lang/rust@25f8051 have introduced changes
to the namespacing within the std::collections::hash_map, breaking some
of Cargo code which imported these.

rust-lang/rust@cf350ea, implementing changes proposed by RFC #344, have
also broken some code which relies on hash_set::SetItems (now renamed to
hash_set::Iter).

This PR fixes the incompatibilities: imports of
std::collections::hash_map::{Occupied, Vacant} have been replaced by
imports of std::collections::hash_map::Entry::{Occupied, Vacant} and one
instance where the SetItems has been used was replaced by the proper
usage of Iter.

Author: bors

Cargo.lock

@@ -10,20 +10,18 @@ name = "cargo"
 path = "src/cargo/lib.rs"
 
 [dependencies]
-toml = "0.1.4"
-url = "0.2.0"
-semver = "0.1.0"
-curl = "0.1.0"
-tar = "0.1.0"
+toml = "0.1.7"
+semver = "0.1.6"
+curl = "0.1.3"
+tar = "0.1.3"
 flate2 = "0.1.0"
 git2 = "0.1.0"
 glob = "0.1.0"
 time = "0.1.0"
 log = "0.1.0"
-
-[dependencies.docopt]
-git = "https://github.com/alexcrichton/docopt.rs"
-branch = "update"
+docopt = "0.6.19"
+url = "0.2.7"
+rustc-serialize = "0.1.1"
 
 [dev-dependencies.hamcrest]
 git = "https://github.com/carllerche/hamcrest-rust.git"

Cargo.toml

@@ -5,7 +5,7 @@ use cargo::core::MultiShell;
 use cargo::util::{CliResult, CliError, CargoError};
 use cargo::util::important_paths::{find_root_manifest_for_cwd};
 
-#[deriving(Decodable)]
+#[deriving(RustcDecodable)]
 struct Options {
     flag_no_run: bool,
     flag_package: Option<String>,

src/bin/bench.rs

@@ -6,7 +6,7 @@ use cargo::ops;
 use cargo::util::important_paths::{find_root_manifest_for_cwd};
 use cargo::util::{CliResult, CliError};
 
-#[deriving(Decodable)]
+#[deriving(RustcDecodable)]
 struct Options {
     flag_package: Option<String>,
     flag_jobs: Option<uint>,

src/bin/build.rs

@@ -1,7 +1,7 @@
 #![feature(phase, macro_rules)]
 #![deny(warnings)]
 
-extern crate serialize;
+extern crate "rustc-serialize" as rustc_serialize;
 #[phase(plugin, link)] extern crate log;
 #[phase(plugin, link)] extern crate cargo;
 
@@ -13,9 +13,9 @@ use std::io::process::{Command,InheritFd,ExitStatus,ExitSignal};
 
 use cargo::{execute_main_without_stdin, handle_error, shell};
 use cargo::core::MultiShell;
-use cargo::util::{CliError, CliResult};
+use cargo::util::{CliError, CliResult, lev_distance};
 
-#[deriving(Decodable)]
+#[deriving(RustcDecodable)]
 struct Flags {
     flag_list: bool,
     flag_verbose: bool,
@@ -139,7 +139,7 @@ fn find_closest(cmd: &str) -> Option<String> {
                             // doing it this way (instead of just .min_by(|c| c.lev_distance(cmd)))
                             // allows us to only make suggestions that have an edit distance of
                             // 3 or less
-                            .map(|c| (c.lev_distance(cmd), c))
+                            .map(|c| (lev_distance(c.as_slice(), cmd), c))
                             .filter(|&(d, _): &(uint, &String)| d < 4u)
                             .min_by(|&(d, _)| d) {
         Some((_, c)) => {

src/bin/cargo.rs

@@ -5,7 +5,7 @@ use cargo::core::MultiShell;
 use cargo::util::{CliResult, CliError};
 use cargo::util::important_paths::{find_root_manifest_for_cwd};
 
-#[deriving(Decodable)]
+#[deriving(RustcDecodable)]
 struct Options {
     flag_package: Option<String>,
     flag_target: Option<String>,

src/bin/clean.rs

@@ -4,13 +4,13 @@ use std::collections::HashMap;
 use cargo::core::MultiShell;
 use cargo::util::{CliResult, CliError, config};
 
-#[deriving(Decodable)]
+#[deriving(RustcDecodable)]
 struct ConfigForKeyFlags {
     flag_human: bool,
     flag_key: String,
 }
 
-#[deriving(Encodable)]
+#[deriving(RustcEncodable)]
 struct ConfigOut {
     values: HashMap<String, config::ConfigValue>
 }

src/bin/config_for_key.rs

@@ -4,12 +4,12 @@ use std::collections::HashMap;
 use cargo::core::MultiShell;
 use cargo::util::{CliResult, CliError, config};
 
-#[deriving(Decodable)]
+#[deriving(RustcDecodable)]
 struct ConfigListFlags {
     flag_human: bool,
 }
 
-#[deriving(Encodable)]
+#[deriving(RustcEncodable)]
 struct ConfigOut {
     values: HashMap<String, config::ConfigValue>
 }

src/bin/config_list.rs

@@ -3,7 +3,7 @@ use cargo::core::{MultiShell};
 use cargo::util::{CliResult, CliError};
 use cargo::util::important_paths::{find_root_manifest_for_cwd};
 
-#[deriving(Decodable)]
+#[deriving(RustcDecodable)]
 struct Options {
     flag_features: Vec<String>,
     flag_jobs: Option<uint>,

src/bin/doc.rs

@@ -3,7 +3,7 @@ use cargo::core::{MultiShell};
 use cargo::util::{CliResult, CliError};
 use cargo::util::important_paths::find_root_manifest_for_cwd;
 
-#[deriving(Decodable)]
+#[deriving(RustcDecodable)]
 struct Options {
     flag_manifest_path: Option<String>,
     flag_verbose: bool,

src/bin/fetch.rs

@@ -5,7 +5,7 @@ use cargo::core::MultiShell;
 use cargo::util::{CliResult, CliError};
 use cargo::util::important_paths::find_root_manifest_for_cwd;
 
-#[deriving(Decodable)]
+#[deriving(RustcDecodable)]
 struct Options {
     flag_manifest_path: Option<String>,
     flag_verbose: bool,

src/bin/generate_lockfile.rs

@@ -3,7 +3,7 @@ use cargo::core::source::{Source, SourceId};
 use cargo::sources::git::{GitSource};
 use cargo::util::{Config, CliResult, CliError, human, ToUrl};
 
-#[deriving(Decodable)]
+#[deriving(RustcDecodable)]
 struct Options {
     flag_url: String,
     flag_reference: String,

src/bin/git_checkout.rs

@@ -1,7 +1,7 @@
 use cargo::core::MultiShell;
 use cargo::util::{CliResult, CliError};
 
-#[deriving(Decodable)]
+#[deriving(RustcDecodable)]
 struct Options;
 
 pub const USAGE: &'static str = "

src/bin/help.rs

@@ -2,7 +2,7 @@ use cargo::core::MultiShell;
 use cargo::util::{CliResult, CliError, human, Require};
 use cargo::util::important_paths::{find_root_manifest_for_cwd};
 
-#[deriving(Decodable)]
+#[deriving(RustcDecodable)]
 struct LocateProjectFlags {
     flag_manifest_path: Option<String>,
 }
@@ -16,7 +16,7 @@ Options:
     -h, --help              Print this message
 ";
 
-#[deriving(Encodable)]
+#[deriving(RustcEncodable)]
 struct ProjectLocation {
     root: String
 }

src/bin/locate_project.rs

@@ -5,7 +5,7 @@ use cargo::core::{MultiShell, SourceId, Source};
 use cargo::sources::RegistrySource;
 use cargo::util::{CliResult, CliError, Config};
 
-#[deriving(Decodable)]
+#[deriving(RustcDecodable)]
 struct Options {
     flag_host: Option<String>,
     arg_token: Option<String>,

src/bin/login.rs

@@ -4,7 +4,7 @@ use cargo::ops;
 use cargo::core::MultiShell;
 use cargo::util::{CliResult, CliError};
 
-#[deriving(Decodable)]
+#[deriving(RustcDecodable)]
 struct Options {
     flag_verbose: bool,
     flag_bin: bool,

src/bin/new.rs

@@ -2,7 +2,7 @@ use cargo::ops;
 use cargo::core::MultiShell;
 use cargo::util::{CliResult, CliError};
 
-#[deriving(Decodable)]
+#[deriving(RustcDecodable)]
 struct Options {
     arg_crate: Option<String>,
     flag_token: Option<String>,

src/bin/owner.rs

@@ -3,7 +3,7 @@ use cargo::core::{MultiShell};
 use cargo::util::{CliResult, CliError};
 use cargo::util::important_paths::find_root_manifest_for_cwd;
 
-#[deriving(Decodable)]
+#[deriving(RustcDecodable)]
 struct Options {
     flag_verbose: bool,
     flag_manifest_path: Option<String>,