Skip to content

Commit d440e13

Browse files
committed
Update Cargo
This pulls in rust-lang/cargo#7159, which ensures that documenting proc macros works correctly.
1 parent 7ac21e7 commit d440e13

File tree

3 files changed

+31
-4
lines changed

3 files changed

+31
-4
lines changed

Cargo.lock

+29-3
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ dependencies = [
272272
"atty",
273273
"bytesize",
274274
"cargo-test-macro",
275+
"cargo-test-support",
275276
"clap",
276277
"core-foundation",
277278
"crates-io",
@@ -288,8 +289,9 @@ dependencies = [
288289
"git2",
289290
"git2-curl",
290291
"glob",
291-
"hex",
292+
"hex 0.4.0",
292293
"home",
294+
"humantime",
293295
"ignore",
294296
"im-rc",
295297
"jobserver",
@@ -329,6 +331,23 @@ dependencies = [
329331
name = "cargo-test-macro"
330332
version = "0.1.0"
331333

334+
[[package]]
335+
name = "cargo-test-support"
336+
version = "0.1.0"
337+
dependencies = [
338+
"cargo",
339+
"cargo-test-macro",
340+
"filetime",
341+
"flate2",
342+
"git2",
343+
"glob",
344+
"lazy_static 1.3.0",
345+
"remove_dir_all",
346+
"serde_json",
347+
"tar",
348+
"url 2.1.0",
349+
]
350+
332351
[[package]]
333352
name = "cargo_metadata"
334353
version = "0.8.0"
@@ -700,7 +719,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
700719
checksum = "09de9ee0fc255ace04c7fa0763c9395a945c37c8292bb554f8d48361d1dcf1b4"
701720
dependencies = [
702721
"commoncrypto",
703-
"hex",
722+
"hex 0.3.2",
704723
"openssl",
705724
"winapi 0.3.6",
706725
]
@@ -1262,6 +1281,12 @@ version = "0.3.2"
12621281
source = "registry+https://github.com/rust-lang/crates.io-index"
12631282
checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
12641283

1284+
[[package]]
1285+
name = "hex"
1286+
version = "0.4.0"
1287+
source = "registry+https://github.com/rust-lang/crates.io-index"
1288+
checksum = "023b39be39e3a2da62a94feb433e91e8bcd37676fbc8bea371daf52b7a769a3e"
1289+
12651290
[[package]]
12661291
name = "home"
12671292
version = "0.5.0"
@@ -2064,7 +2089,7 @@ dependencies = [
20642089
"directories",
20652090
"env_logger",
20662091
"getrandom",
2067-
"hex",
2092+
"hex 0.3.2",
20682093
"log",
20692094
"num-traits",
20702095
"rand 0.7.0",
@@ -3259,6 +3284,7 @@ dependencies = [
32593284
"serde",
32603285
"serde_json",
32613286
"smallvec",
3287+
"url 2.1.0",
32623288
"winapi 0.3.6",
32633289
]
32643290

src/tools/cargo

Submodule cargo updated 156 files

src/tools/rustc-workspace-hack/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ crossbeam-utils = { version = "0.6.5", features = ["nightly"] }
6262
serde = { version = "1.0.82", features = ['derive'] }
6363
serde_json = { version = "1.0.31", features = ["raw_value"] }
6464
smallvec = { version = "0.6", features = ['union', 'may_dangle'] }
65+
url = { version = "2.0", features = ['serde'] }
6566

6667

6768
[target.'cfg(not(windows))'.dependencies]

0 commit comments

Comments
 (0)