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.

Sign up for GitHub

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

Jump to bottom

bump windows crate 0.46 -> 0.48 #111393

Merged
merged 3 commits into from
May 12, 2023
Merged

bump windows crate 0.46 -> 0.48 #111393

merged 3 commits into from
May 12, 2023

Conversation

klensy
Copy link
Contributor

@klensy klensy commented May 9, 2023 •
edited
Loading

This drops duped version of crate(0.46), reduces rustc_driver.dll ~800kb and reduces exported functions number from 26k to 22k.

Also while here, added tidy-alphabetical sorting to lists in tidy allowed lists.

@rustbot
Copy link
Collaborator

rustbot commented May 9, 2023

r? @oli-obk

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

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels May 9, 2023
@rustbot
Copy link
Collaborator

rustbot commented May 9, 2023

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@oli-obk
Copy link
Contributor

oli-obk commented May 9, 2023

looks like this has been attempted before and explicitly rejected from the tidy message.

@klensy
Copy link
Contributor Author

klensy commented May 9, 2023

Hmm, but why this worked with previous version? Dependency tree looks the same.

@oli-obk
Copy link
Contributor

oli-obk commented May 9, 2023

oh 🤦 I misread the "not explicitly permitted" as "explicitly not permitted". Yea, these deps just need to be added to the list of permitted dependencies. They look fine to me.

klensy
klensy commented May 9, 2023
View reviewed changes
src/tools/tidy/src/deps.rs
@@ -6,47 +6,53 @@ use std::path::Path;

/// These are licenses that are allowed for all crates, including the runtime,
/// rustc, tools, etc.
#[rustfmt::skip]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one and lower need to keep comments in vertical line, otherwise rustfmt will break it.

est31
est31 reviewed May 9, 2023
View reviewed changes
src/tools/tidy/src/deps.rs
@@ -268,6 +268,14 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
"winapi-i686-pc-windows-gnu",
"winapi-util",
"winapi-x86_64-pc-windows-gnu",
"windows-targets",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So this seems to be required now because in the version change, the way the windows-targets crate was included has changed. before:

[target."cfg(not(windows_raw_dylib))".dependencies.windows-targets]
version = "0.42.2"

after:

[dependencies.windows-targets]
version = "0.48.0"

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess cargo metadata just considered the non raw-dylib case before.

@oli-obk
Copy link
Contributor

oli-obk commented May 11, 2023

@bors r+

@bors
Copy link
Contributor

bors commented May 11, 2023

📌 Commit 4f12412 has been approved by oli-obk

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 May 11, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request May 12, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 12, 2023
@bors
Auto merge of rust-lang#111493 - matthiaskrgr:rollup-iw1z59b, r=matth…
0b79504 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#111179 (Fix instrument-coverage tests by using Python to sort instantiation groups)
 - rust-lang#111393 (bump windows crate 0.46 -> 0.48)
 - rust-lang#111441 (Verify copies of mutable pointers in 2 stages in ReferencePropagation)
 - rust-lang#111456 (Update cargo)
 - rust-lang#111490 (Don't ICE in layout computation for placeholder types)
 - rust-lang#111492 (use by ref TokenTree iterator to avoid a few clones)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit d075b6c into rust-lang:master May 12, 2023
@rustbot rustbot added this to the 1.71.0 milestone May 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@est31 est31 est31 left review comments

Assignees

@oli-obk oli-obk

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.71.0
Development

Successfully merging this pull request may close these issues.
6 participants
@klensy @rustbot @rust-log-analyzer @oli-obk @bors @est31