diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-09-19 04:53:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-19 04:53:08 +0200 |
| commit | 11a0b968c287c81680387ffcf112328d52d7e815 (patch) | |
| tree | c3f3bc8186655221e981c2df933e1736478cd4d9 | |
| parent | d2b555eef3a0952a55f787bd69a73a29f3fe04e4 (diff) | |
| parent | d440e136e753210882d930c6f4884a43984f6ba0 (diff) | |
| download | rust-11a0b968c287c81680387ffcf112328d52d7e815.tar.gz rust-11a0b968c287c81680387ffcf112328d52d7e815.zip | |
Rollup merge of #64536 - Aaron1011:cargo-crate-type, r=ehuss
Update Cargo This pulls in https://github.com/rust-lang/cargo/pull/7159, which ensures that documenting proc macros works correctly.
| -rw-r--r-- | Cargo.lock | 32 | ||||
| m--------- | src/tools/cargo | 0 | ||||
| -rw-r--r-- | src/tools/rustc-workspace-hack/Cargo.toml | 1 |
3 files changed, 30 insertions, 3 deletions
diff --git a/Cargo.lock b/Cargo.lock index 326f3b10b41..f52e9738da8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -270,6 +270,7 @@ dependencies = [ "atty", "bytesize", "cargo-test-macro", + "cargo-test-support", "clap", "core-foundation", "crates-io", @@ -286,8 +287,9 @@ dependencies = [ "git2", "git2-curl", "glob", - "hex", + "hex 0.4.0", "home", + "humantime", "ignore", "im-rc", "jobserver", @@ -328,6 +330,23 @@ name = "cargo-test-macro" version = "0.1.0" [[package]] +name = "cargo-test-support" +version = "0.1.0" +dependencies = [ + "cargo", + "cargo-test-macro", + "filetime", + "flate2", + "git2", + "glob", + "lazy_static 1.3.0", + "remove_dir_all", + "serde_json", + "tar", + "url 2.1.0", +] + +[[package]] name = "cargo_metadata" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -698,7 +717,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09de9ee0fc255ace04c7fa0763c9395a945c37c8292bb554f8d48361d1dcf1b4" dependencies = [ "commoncrypto", - "hex", + "hex 0.3.2", "openssl", "winapi 0.3.6", ] @@ -1261,6 +1280,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" [[package]] +name = "hex" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "023b39be39e3a2da62a94feb433e91e8bcd37676fbc8bea371daf52b7a769a3e" + +[[package]] name = "home" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2062,7 +2087,7 @@ dependencies = [ "directories", "env_logger", "getrandom", - "hex", + "hex 0.3.2", "log", "num-traits", "rand 0.7.0", @@ -3257,6 +3282,7 @@ dependencies = [ "serde", "serde_json", "smallvec", + "url 2.1.0", "winapi 0.3.6", ] diff --git a/src/tools/cargo b/src/tools/cargo -Subproject 9655d70af8a6dddac238e3afa2fec75088c9226 +Subproject 3596cb86b2e87dd9b9c1bb90d4a9d73ec2c1512 diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml index 930279c0ca2..980c9753761 100644 --- a/src/tools/rustc-workspace-hack/Cargo.toml +++ b/src/tools/rustc-workspace-hack/Cargo.toml @@ -62,6 +62,7 @@ crossbeam-utils = { version = "0.6.5", features = ["nightly"] } serde = { version = "1.0.82", features = ['derive'] } serde_json = { version = "1.0.31", features = ["raw_value"] } smallvec = { version = "0.6", features = ['union', 'may_dangle'] } +url = { version = "2.0", features = ['serde'] } [target.'cfg(not(windows))'.dependencies] |