about summary refs log tree commit diff
path: root/src/tools/rustc-workspace-hack
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-08-03 04:50:42 +0000
committerbors <bors@rust-lang.org>2022-08-03 04:50:42 +0000
commite141246cbbce2a6001f3181d3d0f661bbfd9c7ea (patch)
tree1b5d478cb8ea19987952a47af2df2cc043294443 /src/tools/rustc-workspace-hack
parentb759b2efad2d9c713eeab19bf90736a12ff0d74c (diff)
parente20f7f83c04e03ee0e758394092794ff2f3e332e (diff)
downloadrust-e141246cbbce2a6001f3181d3d0f661bbfd9c7ea.tar.gz
rust-e141246cbbce2a6001f3181d3d0f661bbfd9c7ea.zip
Auto merge of #100082 - matthiaskrgr:rollup-ywu4iux, r=matthiaskrgr
Rollup of 6 pull requests

Successful merges:

 - #99933 (parallelize HTML checking tool)
 - #99958 (Improve position named arguments lint underline and formatting names)
 - #100008 (Update all pre-cloned submodules on startup)
 - #100049 (:arrow_up: rust-analyzer)
 - #100070 (Clarify Cargo.toml comments)
 - #100074 (rustc-docs: Be less specific about the representation of `+bundle`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/tools/rustc-workspace-hack')
-rw-r--r--src/tools/rustc-workspace-hack/Cargo.toml7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml
index 00281bf8f01..b1d8b86496a 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"] }