Skip to content

Commit 783874c

Browse files
authored
Rollup merge of rust-lang#86207 - ehuss:update-cargo, r=ehuss
Update cargo 10 commits in aa8b09297bb3156b849e73db48af4cd050492fe6..81537ee3f7bd97ff7821b6c86c148764d40d26cd 2021-06-09 00:28:53 +0000 to 2021-06-11 00:00:14 +0000 - Change how the fix_deny_warnings_but_not_others test works (rust-lang/cargo#9571) - Add mising documentation regarding `cargo doc` (rust-lang/cargo#9565) - Implement warning for ignored trailing arguments (rust-lang/cargo#9561) - Make clippy happy (rust-lang/cargo#9569) - Fix rustc/rustdoc config values to be config-relative. (rust-lang/cargo#9566) - Update rustfix. (rust-lang/cargo#9567) - Warn if an "all" target is specified, but we don't match anything (rust-lang/cargo#9549) - add default_run to SerializedPackage (rust-lang/cargo#9550) - respect user choice of lib/bin over heuristics (rust-lang/cargo#9522) - Add a mean to mutably access the members of a workspace (rust-lang/cargo#9547)
2 parents 509a4a4 + 46a08d3 commit 783874c

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

Cargo.lock

+15-3
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ dependencies = [
293293
"pretty_env_logger",
294294
"rand 0.8.3",
295295
"rustc-workspace-hack",
296-
"rustfix",
296+
"rustfix 0.6.0",
297297
"semver 1.0.3",
298298
"serde",
299299
"serde_ignored",
@@ -672,7 +672,7 @@ dependencies = [
672672
"libc",
673673
"miow 0.3.6",
674674
"regex",
675-
"rustfix",
675+
"rustfix 0.5.1",
676676
"serde",
677677
"serde_json",
678678
"tracing",
@@ -696,7 +696,7 @@ dependencies = [
696696
"log",
697697
"miow 0.3.6",
698698
"regex",
699-
"rustfix",
699+
"rustfix 0.5.1",
700700
"serde",
701701
"serde_derive",
702702
"serde_json",
@@ -4554,6 +4554,18 @@ dependencies = [
45544554
"serde_json",
45554555
]
45564556

4557+
[[package]]
4558+
name = "rustfix"
4559+
version = "0.6.0"
4560+
source = "registry+https://github.com/rust-lang/crates.io-index"
4561+
checksum = "6f0be05fc0675ef4f47119dc39cfc46636bb77d4fc4ef1bd851b9c3f7697f32a"
4562+
dependencies = [
4563+
"anyhow",
4564+
"log",
4565+
"serde",
4566+
"serde_json",
4567+
]
4568+
45574569
[[package]]
45584570
name = "rustfmt-config_proc_macro"
45594571
version = "0.2.0"

0 commit comments

Comments
 (0)