Skip to content

Commit d71aa2e

Browse files
committed
Auto merge of #12017 - lu-zero:unbreak-rust-1.69.0, r=ehuss
[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)
2 parents 6e9a833 + 8cdc12c commit d71aa2e

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cargo"
3-
version = "0.70.0"
3+
version = "0.70.1"
44
edition = "2021"
55
license = "MIT OR Apache-2.0"
66
homepage = "https://crates.io"
@@ -90,6 +90,7 @@ features = [
9090
"Win32_Foundation",
9191
"Win32_Storage_FileSystem",
9292
"Win32_System_IO",
93+
"Win32_System_Console",
9394
"Win32_System_Threading",
9495
"Win32_System_JobObjects",
9596
"Win32_Security",

src/doc/src/reference/semver.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,7 @@ pub fn foo<T, U>() {}
944944
use updated_crate::foo;
945945
946946
fn main() {
947-
foo::<u8>(); // Error: this function takes 2 generic arguments but 1 generic argument was supplied
947+
foo::<u8>(); // Error: function takes 2 generic arguments but 1 generic argument was supplied
948948
}
949949
```
950950

0 commit comments

Comments
 (0)