Skip to content

Commit

Permalink
Rollup merge of rust-lang#100070 - mqudsi:99768_revisited, r=RalfJung
Browse files Browse the repository at this point in the history
Clarify Cargo.toml comments

Existing comments were left in an incoherent state after rust-lang#99768.

r? `@RalfJung`
  • Loading branch information
matthiaskrgr authored Aug 2, 2022
2 parents a15500c + 63e04ee commit 7a6f461
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions src/tools/rustc-workspace-hack/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down

0 comments on commit 7a6f461

Please sign in to comment.