Skip to content

Commit

Permalink
Update Cargo
Browse files Browse the repository at this point in the history
This pulls in rust-lang/cargo#7159, which
ensures that documenting proc macros works correctly.
  • Loading branch information
Aaron1011 committed Sep 19, 2019
1 parent 7ac21e7 commit d440e13
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 4 deletions.
32 changes: 29 additions & 3 deletions Cargo.lock
Expand Up @@ -272,6 +272,7 @@ dependencies = [
"atty",
"bytesize",
"cargo-test-macro",
"cargo-test-support",
"clap",
"core-foundation",
"crates-io",
Expand All @@ -288,8 +289,9 @@ dependencies = [
"git2",
"git2-curl",
"glob",
"hex",
"hex 0.4.0",
"home",
"humantime",
"ignore",
"im-rc",
"jobserver",
Expand Down Expand Up @@ -329,6 +331,23 @@ dependencies = [
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"
Expand Down Expand Up @@ -700,7 +719,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",
]
Expand Down Expand Up @@ -1262,6 +1281,12 @@ version = "0.3.2"
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"
Expand Down Expand Up @@ -2064,7 +2089,7 @@ dependencies = [
"directories",
"env_logger",
"getrandom",
"hex",
"hex 0.3.2",
"log",
"num-traits",
"rand 0.7.0",
Expand Down Expand Up @@ -3259,6 +3284,7 @@ dependencies = [
"serde",
"serde_json",
"smallvec",
"url 2.1.0",
"winapi 0.3.6",
]

Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 156 files
1 change: 1 addition & 0 deletions src/tools/rustc-workspace-hack/Cargo.toml
Expand Up @@ -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]
Expand Down

0 comments on commit d440e13

Please sign in to comment.