From c61603aa41358fa28216e4b6cf7e30a6f959df46 Mon Sep 17 00:00:00 2001 From: Mahmoud Al-Qudsi Date: Tue, 2 Aug 2022 12:16:16 -0500 Subject: [PATCH] Clarify Cargo.toml comments Existing comments were left in an incoherent state after #99768. --- src/doc/book | 2 +- src/doc/edition-guide | 2 +- src/doc/embedded-book | 2 +- src/doc/nomicon | 2 +- src/doc/reference | 2 +- src/doc/rust-by-example | 2 +- src/llvm-project | 2 +- src/tools/cargo | 2 +- src/tools/miri | 2 +- src/tools/rls | 2 +- src/tools/rust-installer | 2 +- src/tools/rustc-workspace-hack/Cargo.toml | 7 +++---- 12 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/doc/book b/src/doc/book index 36383b4da21db..9bb8b161963fc 160000 --- a/src/doc/book +++ b/src/doc/book @@ -1 +1 @@ -Subproject commit 36383b4da21dbd0a0781473bc8ad7ef0ed1b6751 +Subproject commit 9bb8b161963fcebc9d9ccd732ba26f42108016d5 diff --git a/src/doc/edition-guide b/src/doc/edition-guide index c55611dd6c58b..e58bc4ca104e8 160000 --- a/src/doc/edition-guide +++ b/src/doc/edition-guide @@ -1 +1 @@ -Subproject commit c55611dd6c58bdeb52423b5c52fd0f3c93615ba8 +Subproject commit e58bc4ca104e890ac56af846877c874c432a64b5 diff --git a/src/doc/embedded-book b/src/doc/embedded-book index befe684087431..5ca585c4a7552 160000 --- a/src/doc/embedded-book +++ b/src/doc/embedded-book @@ -1 +1 @@ -Subproject commit befe6840874311635c417cf731377f07234ee373 +Subproject commit 5ca585c4a7552efb546e7681c3de0712f4ae4fdc diff --git a/src/doc/nomicon b/src/doc/nomicon index 8d1e4dccf7111..5004ad30d69f9 160000 --- a/src/doc/nomicon +++ b/src/doc/nomicon @@ -1 +1 @@ -Subproject commit 8d1e4dccf71114ff56f328f671f2026d8e6b62a2 +Subproject commit 5004ad30d69f93553ceef74439fea2159d1f769e diff --git a/src/doc/reference b/src/doc/reference index f3d3953bf3b15..5b9d2fcefadfc 160000 --- a/src/doc/reference +++ b/src/doc/reference @@ -1 +1 @@ -Subproject commit f3d3953bf3b158d596c96d55ce5366f9f3f972e9 +Subproject commit 5b9d2fcefadfc32fceafacfc0dd9441d9b57dd94 diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example index ee342dc91e1ba..0b111eaae36cc 160000 --- a/src/doc/rust-by-example +++ b/src/doc/rust-by-example @@ -1 +1 @@ -Subproject commit ee342dc91e1ba1bb1e1f1318f84bbe3bfac04798 +Subproject commit 0b111eaae36cc4b4997684be853882a59e2c7ca7 diff --git a/src/llvm-project b/src/llvm-project index 8b6b5014fdad3..14a3b123074e0 160000 --- a/src/llvm-project +++ b/src/llvm-project @@ -1 +1 @@ -Subproject commit 8b6b5014fdad3a750f7242a6bfdcad83619498d4 +Subproject commit 14a3b123074e066d64a99886941473058e52197d diff --git a/src/tools/cargo b/src/tools/cargo index 85b500ccad8cd..3a9abe3f06555 160000 --- a/src/tools/cargo +++ b/src/tools/cargo @@ -1 +1 @@ -Subproject commit 85b500ccad8cd0b63995fd94a03ddd4b83f7905b +Subproject commit 3a9abe3f065554a7fbc59f440df2baba4a6e47ee diff --git a/src/tools/miri b/src/tools/miri index b938529fb8ed8..fccb239824880 160000 --- a/src/tools/miri +++ b/src/tools/miri @@ -1 +1 @@ -Subproject commit b938529fb8ed8f7b5b374282ffc3ffa74c313111 +Subproject commit fccb2398248802a268fcda544ff3945247ef2119 diff --git a/src/tools/rls b/src/tools/rls index fcf1f94c9ab2a..a18df16181947 160000 --- a/src/tools/rls +++ b/src/tools/rls @@ -1 +1 @@ -Subproject commit fcf1f94c9ab2acc18cfd4368a4aeb38e77da9649 +Subproject commit a18df16181947edd5eb593ea0f2321e0035448ee diff --git a/src/tools/rust-installer b/src/tools/rust-installer index 300b5ec61ef38..9f66c14c3f91a 160000 --- a/src/tools/rust-installer +++ b/src/tools/rust-installer @@ -1 +1 @@ -Subproject commit 300b5ec61ef38855a07e6bb4955a37aa1c414c00 +Subproject commit 9f66c14c3f91a48a118c7817f434167b311c3515 diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml index 00281bf8f014a..24b036e2ccb0a 100644 --- a/src/tools/rustc-workspace-hack/Cargo.toml +++ b/src/tools/rustc-workspace-hack/Cargo.toml @@ -79,11 +79,10 @@ crossbeam-utils = { version = "0.8.0", features = ["nightly"] } libc = { version = "0.2.79", features = ["align"] } # Ensure default features of libz-sys, which are disabled in some scenarios. libz-sys = { version = "1.1.2" } - -# looks like the only user of deprecated `use_std` feature is `combine`, so this -# can be removed if/when https://github.com/Marwes/combine/pull/348 be merged and released. +# The only user of memchr's deprecated `use_std` feature is `combine`, so this can +# be removed if/when https://github.com/Marwes/combine/pull/348 is merged and released. memchr = { version = "2.5", features = ["std", "use_std"] } -# same for regex +# Ensure default features of regex, which are disabled in some scenarios. regex = { version = "1.5.6" } proc-macro2 = { version = "1", features = ["default"] } quote = { version = "1", features = ["default"] }