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

Bump windows-bindgen to 0.55.0 #122390

Merged
merged 3 commits into from Mar 16, 2024
Merged

Bump windows-bindgen to 0.55.0 #122390

merged 3 commits into from Mar 16, 2024

Conversation

ChrisDenton
Copy link
Contributor

windows-bindgen is the crate used to generate std's Windows API bindings.

Not many changes for us, it's mostly just simplifying the generate code (e.g. no more -> ()). The one substantial change is some structs now use i8 byte arrays instead of u8. However, this only impacts one test.

@rustbot
Copy link
Collaborator

rustbot commented Mar 12, 2024

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added O-windows Operating system: Windows S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Mar 12, 2024
@rustbot
Copy link
Collaborator

rustbot commented Mar 12, 2024

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.

Copy link
Contributor

@workingjubilee workingjubilee left a comment

Choose a reason for hiding this comment

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

While we have traditionally not cared much about the u8-vs-i8 difference here for c_char, I am somewhat concerned about this sudden variation. Is there a reason that they have changed it upstream, or is this by chance?

Comment on lines 3845 to +3848
#[repr(C)]
pub struct SOCKADDR {
pub sa_family: ADDRESS_FAMILY,
pub sa_data: [u8; 14],
pub sa_data: [i8; 14],
Copy link
Contributor

Choose a reason for hiding this comment

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

The sa_data in SOCKADDR seems to be ffi::c_char:

typedef struct sockaddr {
#if ...
  u_short        sa_family;
#else
  ADDRESS_FAMILY sa_family;
#endif
  CHAR           sa_data[14];
} SOCKADDR, *PSOCKADDR, *LPSOCKADDR;

@Mark-Simulacrum
Copy link
Member

@bors r+

It sounds to me like the above discussion resolved that this is OK, but if not we can revert/unapprove.

@bors
Copy link
Contributor

bors commented Mar 16, 2024

📌 Commit 6cb2f03 has been approved by Mark-Simulacrum

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 Mar 16, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 16, 2024
…enton

Rollup of 7 pull requests

Successful merges:

 - rust-lang#122323 (configure.py: add flag for loongarch64 musl-root)
 - rust-lang#122372 (prevent notifying the same changes more than once)
 - rust-lang#122390 (Bump windows-bindgen to 0.55.0)
 - rust-lang#122401 (Check library crates for all tier 1 targets in PR CI)
 - rust-lang#122489 (Bump `cargo update` PR more often)
 - rust-lang#122583 (Use `UnsafeCell` for fast constant thread locals)
 - rust-lang#122590 (bootstrap: Don't name things copy that are not copies)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ceef59f into rust-lang:master Mar 16, 2024
11 checks passed
@rustbot rustbot added this to the 1.78.0 milestone Mar 16, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 16, 2024
Rollup merge of rust-lang#122390 - ChrisDenton:bindgen, r=Mark-Simulacrum

Bump windows-bindgen to 0.55.0

windows-bindgen is the crate used to generate std's Windows API bindings.

Not many changes for us, it's mostly just simplifying the generate code (e.g. no more `-> ()`). The one substantial change is some structs now use `i8` byte arrays instead of `u8`. However, this only impacts one test.
@ChrisDenton ChrisDenton deleted the bindgen branch March 19, 2024 03:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
O-windows Operating system: Windows S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants