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 /src | |
| 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.
Diffstat (limited to 'src')
| m--------- | src/tools/cargo | 0 | ||||
| -rw-r--r-- | src/tools/rustc-workspace-hack/Cargo.toml | 1 |
2 files changed, 1 insertions, 0 deletions
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] |