Merge remote-tracking branch 'upstream/master' into fix-all-targets

Cargo.toml

@@ -22,7 +22,6 @@ crates-io = { path = "src/crates-io", version = "0.16" }
 crossbeam = "0.3"
 crypto-hash = "0.3"
 curl = "0.4.6"
-docopt = "0.8.1"
 env_logger = "0.5"
 failure = "0.1.1"
 filetime = "0.1"
@@ -34,6 +33,7 @@ glob = "0.2"
 hex = "0.3"
 home = "0.3"
 ignore = "0.4"
+lazy_static = "1.0.0"
 jobserver = "0.1.9"
 lazycell = "0.6"
 libc = "0.2"
@@ -53,6 +53,7 @@ tempdir = "0.3"
 termcolor = "0.3"
 toml = "0.4"
 url = "1.1"
+clap = "2.27.0"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 core-foundation = { version = "0.5.1", features = ["mac_os_10_7_support"] }
@@ -80,7 +81,6 @@ features = [
 
 [dev-dependencies]
 bufstream = "0.1"
-filetime = "0.1"
 
 [[bin]]
 name = "cargo"

README.md

@@ -29,7 +29,7 @@ Cargo requires the following tools and packages to build:
 First, you'll want to check out this repository
 
 ```
-git clone --recursive https://github.com/rust-lang/cargo
+git clone https://github.com/rust-lang/cargo
 cd cargo
 ```