Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[beta-1.70] backport add the Win32_System_Console feature #12038

Merged
merged 2 commits into from
Apr 25, 2023

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Apr 25, 2023

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.

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`.
@rustbot
Copy link
Collaborator

rustbot commented Apr 25, 2023

r? @weihanglo

(rustbot has picked a reviewer for you, use r? to override)

@rustbot
Copy link
Collaborator

rustbot commented Apr 25, 2023

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against rust-1.70.0. Please double check that you specified the right target!

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 25, 2023
Fix semver checks for 1.69

There is a small wording change in the 1.69 release that was causing this test to fail.
@rustbot rustbot added the A-documenting-cargo-itself Area: Cargo's documentation label Apr 25, 2023
@weihanglo
Copy link
Member

Thanks!

@bors r+

@bors
Copy link
Contributor

bors commented Apr 25, 2023

📌 Commit 07e53ab has been approved by weihanglo

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 25, 2023
@bors
Copy link
Contributor

bors commented Apr 25, 2023

⌛ Testing commit 07e53ab with merge ec8a8a0...

@bors
Copy link
Contributor

bors commented Apr 25, 2023

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing ec8a8a0 to rust-1.70.0...

@bors bors merged commit ec8a8a0 into rust-lang:rust-1.70.0 Apr 25, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request May 5, 2023
…nglo

[beta] Update cargo

2 commits in 84b7041fd2745ee6b3b4a150314f81aabb78e6b2..ec8a8a0cabb0e0cadef58902470f6c7ee7868bdc
2023-04-13 20:08:40 +0000 to 2023-04-25 19:46:25 +0000
- [beta-1.70] backport add the Win32_System_Console feature (rust-lang/cargo#12038)
- [beta-1.70] Backport not_found_permutations test fix. (rust-lang/cargo#11983)

r? `@ghost`
@ehuss ehuss added this to the 1.70.0 milestone May 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-documenting-cargo-itself Area: Cargo's documentation S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants