Auto merge of #4149 - ordian:master, r=alexcrichton

Drop rustc-serialize dependency

Fixes #3944.

Cargo.toml

@@ -20,7 +20,7 @@ path = "src/cargo/lib.rs"
 crates-io = { path = "src/crates-io", version = "0.10" }
 crossbeam = "0.2"
 curl = "0.4.6"
-docopt = "0.7"
+docopt = "0.8"
 env_logger = "0.4"
 error-chain = "0.10.0"
 filetime = "0.1"
@@ -29,12 +29,12 @@ fs2 = "0.4"
 git2 = "0.6"
 git2-curl = "0.7"
 glob = "0.2"
+hex = "0.2"
 jobserver = "0.1.4"
 libc = "0.2"
 libgit2-sys = "0.6"
 log = "0.3"
 num_cpus = "1.0"
-rustc-serialize = "0.3"
 scoped-tls = "0.1"
 semver = { version = "0.7.0", features = ["serde"] }
 serde = "1.0"

src/bin/bench.rs

@@ -3,7 +3,7 @@ use cargo::ops::{self, MessageFormat, Packages};
 use cargo::util::{CliResult, CliError, Config, CargoErrorKind};
 use cargo::util::important_paths::{find_root_manifest_for_wd};
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options {
     flag_no_run: bool,
     flag_package: Vec<String>,

src/bin/build.rs

@@ -5,7 +5,7 @@ use cargo::ops::{self, CompileOptions, MessageFormat, Packages};
 use cargo::util::important_paths::{find_root_manifest_for_wd};
 use cargo::util::{CliResult, Config};
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options {
     flag_package: Vec<String>,
     flag_jobs: Option<u32>,

src/bin/cargo.rs

@@ -2,7 +2,6 @@ extern crate cargo;
 extern crate url;
 extern crate env_logger;
 extern crate git2_curl;
-extern crate rustc_serialize;
 extern crate toml;
 #[macro_use]
 extern crate log;
@@ -20,7 +19,7 @@ use cargo::core::shell::{Verbosity, ColorConfig};
 use cargo::util::{self, CliResult, lev_distance, Config, CargoResult, CargoError, CargoErrorKind};
 use cargo::util::CliError;
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Flags {
     flag_list: bool,
     flag_version: bool,

src/bin/check.rs

@@ -49,7 +49,7 @@ the manifest. The default profile for this command is `dev`, but passing
 the --release flag will use the `release` profile instead.
 ";
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options {
     flag_package: Vec<String>,
     flag_jobs: Option<u32>,

src/bin/clean.rs

@@ -5,7 +5,7 @@ use cargo::ops;
 use cargo::util::{CliResult, Config};
 use cargo::util::important_paths::{find_root_manifest_for_wd};
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options {
     flag_package: Vec<String>,
     flag_target: Option<String>,

src/bin/doc.rs

@@ -3,7 +3,7 @@ use cargo::ops::{self, MessageFormat, Packages};
 use cargo::util::{CliResult, Config};
 use cargo::util::important_paths::{find_root_manifest_for_wd};
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options {
     flag_target: Option<String>,
     flag_features: Vec<String>,

src/bin/fetch.rs

@@ -3,7 +3,7 @@ use cargo::ops;
 use cargo::util::{CliResult, Config};
 use cargo::util::important_paths::find_root_manifest_for_wd;
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options {
     flag_manifest_path: Option<String>,
     flag_verbose: u32,

src/bin/generate_lockfile.rs

@@ -5,7 +5,7 @@ use cargo::ops;
 use cargo::util::{CliResult, Config};
 use cargo::util::important_paths::find_root_manifest_for_wd;
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options {
     flag_manifest_path: Option<String>,
     flag_verbose: u32,

src/bin/git_checkout.rs

@@ -2,7 +2,7 @@ use cargo::core::source::{Source, SourceId, GitReference};
 use cargo::sources::git::{GitSource};
 use cargo::util::{Config, CliResult, ToUrl};
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options {
     flag_url: String,
     flag_reference: String,

src/bin/help.rs

@@ -1,6 +1,6 @@
 use cargo::util::{CliResult, CliError, Config};
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options;
 
 pub const USAGE: &'static str = "

src/bin/init.rs

@@ -3,7 +3,7 @@ use std::env;
 use cargo::ops;
 use cargo::util::{CliResult, Config};
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options {
     flag_verbose: u32,
     flag_quiet: Option<bool>,

src/bin/install.rs

@@ -2,7 +2,7 @@ use cargo::ops;
 use cargo::core::{SourceId, GitReference};
 use cargo::util::{CliResult, Config, ToUrl};
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options {
     flag_jobs: Option<u32>,
     flag_features: Vec<String>,

src/bin/locate_project.rs

@@ -2,7 +2,7 @@ use cargo;
 use cargo::util::{CliResult, CliError, Config};
 use cargo::util::important_paths::{find_root_manifest_for_wd};
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct LocateProjectFlags {
     flag_manifest_path: Option<String>,
 }

src/bin/login.rs

@@ -6,7 +6,7 @@ use cargo::core::{SourceId, Source};
 use cargo::sources::RegistrySource;
 use cargo::util::{CliResult, CargoResultExt, Config};
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options {
     flag_host: Option<String>,
     arg_token: Option<String>,

src/bin/metadata.rs

@@ -4,7 +4,7 @@ use cargo::ops::{output_metadata, OutputMetadataOptions};
 use cargo::util::important_paths::find_root_manifest_for_wd;
 use cargo::util::{CliResult, Config};
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options {
     flag_color: Option<String>,
     flag_features: Vec<String>,

src/bin/new.rs

@@ -3,7 +3,7 @@ use std::env;
 use cargo::ops;
 use cargo::util::{CliResult, Config};
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options {
     flag_verbose: u32,
     flag_quiet: Option<bool>,

src/bin/owner.rs

@@ -1,7 +1,7 @@
 use cargo::ops;
 use cargo::util::{CliResult, Config};
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options {
     arg_crate: Option<String>,
     flag_token: Option<String>,

src/bin/package.rs

@@ -3,7 +3,7 @@ use cargo::ops;
 use cargo::util::{CliResult, Config};
 use cargo::util::important_paths::find_root_manifest_for_wd;
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options {
     flag_verbose: u32,
     flag_quiet: Option<bool>,

src/bin/pkgid.rs

@@ -3,7 +3,7 @@ use cargo::ops;
 use cargo::util::{CliResult, Config};
 use cargo::util::important_paths::{find_root_manifest_for_wd};
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options {
     flag_verbose: u32,
     flag_quiet: Option<bool>,

src/bin/publish.rs

@@ -3,7 +3,7 @@ use cargo::ops;
 use cargo::util::{CliResult, Config};
 use cargo::util::important_paths::find_root_manifest_for_wd;
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options {
     flag_host: Option<String>,
     flag_token: Option<String>,

src/bin/read_manifest.rs

@@ -5,7 +5,7 @@ use cargo::core::Package;
 use cargo::util::{CliResult, Config};
 use cargo::util::important_paths::{find_root_manifest_for_wd};
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options {
     flag_manifest_path: Option<String>,
     flag_color: Option<String>,

src/bin/run.rs

@@ -5,7 +5,7 @@ use cargo::ops::{self, MessageFormat, Packages};
 use cargo::util::{CliResult, CliError, Config, CargoErrorKind};
 use cargo::util::important_paths::{find_root_manifest_for_wd};
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options {
     flag_bin: Option<String>,
     flag_example: Option<String>,

src/bin/rustc.rs

@@ -5,7 +5,7 @@ use cargo::ops::{self, CompileOptions, CompileMode, MessageFormat, Packages};
 use cargo::util::important_paths::{find_root_manifest_for_wd};
 use cargo::util::{CliResult, CliError, Config};
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options {
     arg_opts: Option<Vec<String>>,
     flag_package: Option<String>,

src/bin/rustdoc.rs

@@ -3,7 +3,7 @@ use cargo::ops::{self, MessageFormat, Packages};
 use cargo::util::{CliResult, Config};
 use cargo::util::important_paths::{find_root_manifest_for_wd};
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options {
     arg_opts: Vec<String>,
     flag_target: Option<String>,

src/bin/search.rs

@@ -3,7 +3,7 @@ use cargo::util::{CliResult, Config};
 
 use std::cmp;
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options {
     flag_host: Option<String>,
     flag_verbose: u32,

src/bin/test.rs

@@ -3,7 +3,7 @@ use cargo::ops::{self, MessageFormat, Packages};
 use cargo::util::{CliResult, CliError, Config, CargoErrorKind};
 use cargo::util::important_paths::find_root_manifest_for_wd;
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options {
     arg_args: Vec<String>,
     flag_features: Vec<String>,

src/bin/uninstall.rs

@@ -1,7 +1,7 @@
 use cargo::ops;
 use cargo::util::{CliResult, Config};
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options {
     flag_bin: Vec<String>,
     flag_root: Option<String>,

src/bin/update.rs

@@ -5,7 +5,7 @@ use cargo::ops;
 use cargo::util::{CliResult, Config};
 use cargo::util::important_paths::find_root_manifest_for_wd;
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options {
     flag_package: Vec<String>,
     flag_aggressive: bool,

src/bin/verify_project.rs

@@ -9,7 +9,7 @@ use cargo::util::{CliResult, Config};
 use serde_json;
 use toml;
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Flags {
     flag_manifest_path: Option<String>,
     flag_verbose: u32,

src/bin/version.rs

@@ -3,8 +3,8 @@ use std::env;
 use cargo;
 use cargo::util::{CliResult, Config};
 
-#[derive(RustcDecodable)]
-pub struct Options;
+#[derive(Deserialize)]
+pub struct Options {}
 
 pub const USAGE: &'static str = "
 Show version information

src/bin/yank.rs

@@ -1,7 +1,7 @@
 use cargo::ops;
 use cargo::util::{CliResult, Config};
 
-#[derive(RustcDecodable)]
+#[derive(Deserialize)]
 pub struct Options {
     arg_crate: Option<String>,
     flag_token: Option<String>,