Skip to content

Commit

Permalink
Rollup merge of rust-lang#64536 - Aaron1011:cargo-crate-type, r=ehuss
Browse files Browse the repository at this point in the history
Update Cargo

This pulls in rust-lang/cargo#7159, which
ensures that documenting proc macros works correctly.
  • Loading branch information
tmandry committed Sep 18, 2019
2 parents fbd1144 + 7419050 commit 4d94422
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
18 changes: 18 additions & 0 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ dependencies = [
"atty",
"bytesize",
"cargo-test-macro",
"cargo-test-support",
"clap",
"core-foundation",
"crates-io",
Expand Down Expand Up @@ -327,6 +328,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
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 145 files

0 comments on commit 4d94422

Please sign in to comment.