diff options
| author | bors <bors@rust-lang.org> | 2023-04-25 19:46:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-25 19:46:25 +0000 |
| commit | ec8a8a0cabb0e0cadef58902470f6c7ee7868bdc (patch) | |
| tree | 0bb720a409d4e0a021682aca5e18ce8217c01303 | |
| parent | 4d28f232e2fd598aa52361e975005bbc9fcf2139 (diff) | |
| parent | 07e53ab7ad1ff5d54c71d6cb08462442116badc5 (diff) | |
Auto merge of #12038 - ehuss:beta-Win32_System_Console, r=weihanglo0.71.0rust-1.70.0
[beta-1.70] backport add the Win32_System_Console feature
This is a beta backport of #12016 which is required to build the cargo library on Windows.
This also includes #12011 to get CI passing.
| -rw-r--r-- | Cargo.toml | 1 | ||||
| -rw-r--r-- | src/doc/src/reference/semver.md | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Cargo.toml b/Cargo.toml index 319037cde..56c9827cb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -90,6 +90,7 @@ version = "0.45" features = [ "Win32_Foundation", "Win32_Storage_FileSystem", + "Win32_System_Console", "Win32_System_IO", "Win32_System_Threading", "Win32_System_JobObjects", diff --git a/src/doc/src/reference/semver.md b/src/doc/src/reference/semver.md index c8d7167fc..22c42610f 100644 --- a/src/doc/src/reference/semver.md +++ b/src/doc/src/reference/semver.md @@ -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 } ``` |