Skip to content

Commit

Permalink
Auto merge of #12564 - weihanglo:rust-1.73.0-backport, r=ehuss
Browse files Browse the repository at this point in the history
[beta-1.73.0] add missing `windows-sys` features back

Fixes <#12562>

Beta backports:

- <#12563>

In order to make CI pass, the following PRs are also cherry-picked:

- c508cb6 from #12538
  • Loading branch information
bors committed Aug 26, 2023
2 parents 80eca0e + c46e2c5 commit 9c4383f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,12 @@ fwdansi.workspace = true
workspace = true
features = [
"Win32_Foundation",
"Win32_Security",
"Win32_Storage_FileSystem",
"Win32_System_IO",
"Win32_System_Console",
"Win32_System_Threading",
"Win32_System_JobObjects",
"Win32_System_Threading",
]

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/ops/cargo_compile/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
//! rough outline is:
//!
//! 1. Resolve the dependency graph (see [`ops::resolve`]).
//! 2. Download any packages needed (see [`PackageSet`](crate::core::PackageSet)).
//! 2. Download any packages needed (see [`PackageSet`].
//! 3. Generate a list of top-level "units" of work for the targets the user
//! requested on the command-line. Each [`Unit`] corresponds to a compiler
//! invocation. This is done in this module ([`UnitGenerator::generate_root_units`]).
Expand Down

0 comments on commit 9c4383f

Please sign in to comment.