diff options
| author | bors <bors@rust-lang.org> | 2018-03-29 08:17:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-03-29 08:17:52 +0000 |
| commit | 409744bcb91f4efa35b8fcc9e7033523a86b90c2 (patch) | |
| tree | 23b7e9d2a4fba82be9d5073d48e42e9a24ec7edd | |
| parent | dca14701a5fa9cfcf91e438f1bef0eddb3c22f93 (diff) | |
| parent | 850156aa2700735183059ad48a0c56e271d1e602 (diff) | |
| download | rust-409744bcb91f4efa35b8fcc9e7033523a86b90c2.tar.gz rust-409744bcb91f4efa35b8fcc9e7033523a86b90c2.zip | |
Auto merge of #49471 - matklad:cargo-rustdoc, r=alexcrichton
Update Cargo This includes https://github.com/rust-lang/cargo/pull/5255 which fixed regression in `cargo rustdoc` command. If beta branches before this is merged, we'll need to backport as well
| -rw-r--r-- | src/Cargo.lock | 15 | ||||
| m--------- | src/tools/cargo | 0 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/Cargo.lock b/src/Cargo.lock index 8ace51ddac2..1f7cf84cedb 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -201,7 +201,7 @@ dependencies = [ "serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "shell-escape 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "tar 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", - "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "tempfile 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2303,6 +2303,18 @@ dependencies = [ ] [[package]] +name = "tempfile" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", + "remove_dir_all 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "term" version = "0.0.0" @@ -2763,6 +2775,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum syntex_syntax 0.52.0 (registry+https://github.com/rust-lang/crates.io-index)" = "76a302e717e348aa372ff577791c3832395650073b8d8432f8b3cb170b34afde" "checksum tar 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)" = "1605d3388ceb50252952ffebab4b5dc43017ead7e4481b175961c283bb951195" "checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" +"checksum tempfile 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "439d9a7c00f98b1b5ee730039bf5b1f9203d508690e3c76b509e7ad59f8f7c99" "checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1" "checksum term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e6b677dd1e8214ea1ef4297f85dbcbed8e8cdddb561040cc998ca2551c37561" "checksum termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83" diff --git a/src/tools/cargo b/src/tools/cargo -Subproject 311a5eda6f90d660bb23e97c8ee77090519b9ed +Subproject d63299b6eafae99bfe1fd5ddc75bc7cf67ed58f |