about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-08-24 05:34:43 +0000
committerbors <bors@rust-lang.org>2022-08-24 05:34:43 +0000
commit4a24f08ba43166cfee86d868b3fe8612aec6faca (patch)
tree412a402a4c5df4c5d491e09d576c1bd3ac4f53a0
parent25ea5a36c6e3a4fa1f739538d9e89eb1cd747564 (diff)
parent6e4603e09f7032df1ee1e8100fa5c4b0e5af3d94 (diff)
downloadrust-4a24f08ba43166cfee86d868b3fe8612aec6faca.tar.gz
rust-4a24f08ba43166cfee86d868b3fe8612aec6faca.zip
Auto merge of #100942 - ehuss:update-cargo, r=ehuss
Update cargo

7 commits in 9809f8ff33c2b998919fd0432c626f0f7323697a..6da726708a4406f31f996d813790818dce837161
2022-08-16 22:10:06 +0000 to 2022-08-23 21:39:56 +0000
- Update non-ASCII crate name warning message (rust-lang/cargo#11017)
- Add more tests for aggressive or precise update (rust-lang/cargo#11011)
- Ignore broken but excluded file during traversing (rust-lang/cargo#11008)
- Improve error message for wrong target names (rust-lang/cargo#10999)
- Bump snapbox to 0.3 (rust-lang/cargo#11005)
- remove missed reference to workspace inheritance in unstable.md (rust-lang/cargo#11001)
- Warning when precise or aggressive without -p flag (rust-lang/cargo#10988)
-rw-r--r--Cargo.lock8
m---------src/tools/cargo0
2 files changed, 4 insertions, 4 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 9d91dcde9b4..91e85df2509 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4993,9 +4993,9 @@ checksum = "da73c8f77aebc0e40c300b93f0a5f1bece7a248a36eee287d4e095f35c7b7d6e"
 
 [[package]]
 name = "snapbox"
-version = "0.2.9"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1f212b806d6f56d19838e36a0aaa7e79a0bc9ca177e873fb87651ad92f983e2"
+checksum = "44d199ccf8f606592df2d145db26f2aa45344e23c64b074cc5a4047f1d99b0f7"
 dependencies = [
  "concolor",
  "content_inspector",
@@ -5011,9 +5011,9 @@ dependencies = [
 
 [[package]]
 name = "snapbox-macros"
-version = "0.2.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c01dea7e04cbb27ef4c86e9922184608185f7cd95c1763bc30d727cda4a5e930"
+checksum = "8a253e6f894cfa440cba00600a249fa90869d8e0ec45ab274a456e043a0ce8f2"
 
 [[package]]
 name = "socket2"
diff --git a/src/tools/cargo b/src/tools/cargo
-Subproject 9809f8ff33c2b998919fd0432c626f0f7323697
+Subproject 6da726708a4406f31f996d813790818dce83716