Auto merge of rust-lang#87177 - ehuss:update-cargo, r=ehuss

Update cargo 6 commits in 66a6737a0c9f3a974af2dd032a65d3e409c77aac..27277d966b3cfa454d6dea7f724cb961c036251c 2021-07-14 20:54:28 +0000 to 2021-07-16 00:50:39 +0000 - Flag another curl error as possibly spurious (rust-lang/cargo#9695) - Add `d` as an alias for `doc` (rust-lang/cargo#9680) - `cargo fix --edition`: extend warning when on latest edition (rust-lang/cargo#9694) - Update env_logger requirement from 0.8.1 to 0.9.0 (rust-lang/cargo#9688) - Document cargo limitation w/ workspaces & configs (rust-lang/cargo#9674) - Change some warnings to errors (rust-lang/cargo#9689)
rust-lang-ci · Jul 16, 2021 · 057050a · 057050a
2 parents 27e4205 + 7ca38ee
commit 057050a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -269,7 +269,7 @@ dependencies = [
  "crossbeam-utils 0.8.3",
  "curl",
  "curl-sys",
- "env_logger 0.8.1",
+ "env_logger 0.9.0",
  "filetime",
  "flate2",
  "fwdansi",
@@ -1094,6 +1094,19 @@ dependencies = [
  "termcolor",
 ]
 
+[[package]]
+name = "env_logger"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
+dependencies = [
+ "atty",
+ "humantime 2.0.1",
+ "log",
+ "regex",
+ "termcolor",
+]
+
 [[package]]
 name = "error_index_generator"
 version = "0.0.0"

diff --git a/src/tools/cargo b/src/tools/cargo
+1 −1		Cargo.toml
+1 −1		src/bin/cargo/cli.rs
+2 −0		src/bin/cargo/commands/doc.rs
+2 −1		src/bin/cargo/main.rs
+28 −3		src/cargo/util/diagnostic_server.rs
+1 −0		src/cargo/util/network.rs
+6 −9		src/cargo/util/toml/mod.rs
+9 −0		src/doc/src/reference/config.md
+12 −7		tests/testsuite/bad_config.rs
+2 −4		tests/testsuite/fix.rs