Skip to content

Commit

Permalink
Auto merge of #12017 - lu-zero:unbreak-rust-1.69.0, r=ehuss
Browse files Browse the repository at this point in the history
[stable-1.69] Add the Win32_System_Console feature since it is used

In `src/cargo/core/shell.rs` `windows_sys::Win32::System::Console` is used but the feature is not present in Cargo.toml.

I found it while updating `cargo-c`. (now for the 1.69.0 branch)
  • Loading branch information
bors committed Apr 25, 2023
2 parents 6e9a833 + 8cdc12c commit d71aa2e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cargo"
version = "0.70.0"
version = "0.70.1"
edition = "2021"
license = "MIT OR Apache-2.0"
homepage = "https://crates.io"
Expand Down Expand Up @@ -90,6 +90,7 @@ features = [
"Win32_Foundation",
"Win32_Storage_FileSystem",
"Win32_System_IO",
"Win32_System_Console",
"Win32_System_Threading",
"Win32_System_JobObjects",
"Win32_Security",
Expand Down
2 changes: 1 addition & 1 deletion src/doc/src/reference/semver.md
Original file line number Diff line number Diff line change
Expand Up @@ -944,7 +944,7 @@ pub fn foo<T, U>() {}
use updated_crate::foo;
fn main() {
foo::<u8>(); // Error: this function takes 2 generic arguments but 1 generic argument was supplied
foo::<u8>(); // Error: function takes 2 generic arguments but 1 generic argument was supplied
}
```

Expand Down

0 comments on commit d71aa2e

Please sign in to comment.