From 73dc7d5b665e6ed97bad78189d6789f61d86255e Mon Sep 17 00:00:00 2001
From: bors <bors@rust-lang.org>
Date: Sun, 23 Apr 2023 02:30:29 +0000
Subject: [PATCH 1/2] Auto merge of #12016 - lu-zero:unbreak-master, r=epage

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`.
---
 Cargo.toml | 1 +
 1 file changed, 1 insertion(+)

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",

From 07e53ab7ad1ff5d54c71d6cb08462442116badc5 Mon Sep 17 00:00:00 2001
From: bors <bors@rust-lang.org>
Date: Thu, 20 Apr 2023 22:49:18 +0000
Subject: [PATCH 2/2] Auto merge of #12011 - ehuss:fix-semver-checks, r=epage

Fix semver checks for 1.69

There is a small wording change in the 1.69 release that was causing this test to fail.
---
 src/doc/src/reference/semver.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 }
 ```