Move to `windows` 0.58.0, and also permit version 0.59 #65

ErichDonGubler · 2025-01-10T21:29:05Z

No description provided.

codecov · 2025-01-10T21:45:33Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 86.53%. Comparing base (ded3b5b) to head (4afd54a).
Report is 1 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main      #65      +/-   ##
==========================================
- Coverage   86.71%   86.53%   -0.18%     
==========================================
  Files           5        5              
  Lines         557      557              
  Branches      557      557              
==========================================
- Hits          483      482       -1     
- Misses         48       49       +1     
  Partials       26       26

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

ErichDonGubler · 2025-01-10T22:42:15Z

Not sure what the Linux-only nightly debug failure is, but it's something to do with LSAN. 😬 I don't think I have the bandwidth to figure it out right this moment, though.

ErichDonGubler · 2025-01-10T22:45:59Z

This PR only upgrades windows-* dependencies, though @mxinden had invited me to make them a range dependency instead. The reason I didn't is that while things seem source-compatible between versions of windows-core releases, windows-bindgen's output supposedly changes significantly between the 0.58 and 0.59 versions. I wasn't sure if it was safe to use a range in that case.

It seems that bindgen is/was used to avoid bringing in the windows crate, but I think that should actually be fine to use now in mozilla-central. Was there another reason not to use the windows crate directly? If not, we might be able to use a range over the windows crate itself.

mxinden · 2025-01-13T13:24:10Z

Not sure what the Linux-only nightly debug failure is, but it's something to do with LSAN. 😬 I don't think I have the bandwidth to figure it out right this moment, though.

Will be fixed with #69.

mxinden · 2025-01-13T13:26:49Z

It seems that bindgen is/was used to avoid bringing in the windows crate, but I think that should actually be fine to use now in mozilla-central. Was there another reason not to use the windows crate directly? If not, we might be able to use a range over the windows crate itself.

@larseggert can you explain why bindgen is used?

Cargo.toml

larseggert · 2025-01-13T13:31:36Z

In earlier versions, we tried to avoid pulling in the other largerwindows crates by having a static Rust binding file for the few Windows APIs we called, together with a CI test that called bindgen to detect any changes.

We abandoned that at some point, and converted to calling bindgen during build. I don't think there was any reason other than it was a simply change.

If we can avoid bindgen by just using the other windows crates, let's do so, esp. if it makes integration easier.

larseggert · 2025-01-13T13:32:52Z

@ErichDonGubler I don't seem to have the ability to rebase your PR; did you maybe not give owners the relevant permission?

ErichDonGubler · 2025-01-13T14:06:27Z

@larseggert: Huh, that's strange, I'm not sure why you can't rebase. I don't see the Allow maintainers to edit this PR checkbox, but that's normally what I'd check. 🤔

I've rebased using the GH UI.

larseggert · 2025-01-13T14:08:15Z

@ErichDonGubler Thanks for rebasing. Would you want to switch us from the bindgen dep to the other windows deps in this PR?

ErichDonGubler · 2025-01-13T16:05:00Z

@larseggert: Sure!

mxinden · 2025-01-17T19:07:54Z

For what my input is worth here, I am in favor of moving from windows-bindgen to windows, as the former is not yet part of mozilla-central, but the latter is.

While I assume we can bring windows-bindgen into mozilla-central, it will require a cargo vet audit and, more generally, increase our dependency footprint.

        new file:   third_party/rust/windows-bindgen/.cargo-checksum.json
        new file:   third_party/rust/windows-bindgen/Cargo.toml
        new file:   third_party/rust/windows-bindgen/default/Windows.Wdk.winmd
        new file:   third_party/rust/windows-bindgen/default/Windows.Win32.winmd
        new file:   third_party/rust/windows-bindgen/default/Windows.winmd
        new file:   third_party/rust/windows-bindgen/default/readme.md
        new file:   third_party/rust/windows-bindgen/license-apache-2.0
        new file:   third_party/rust/windows-bindgen/license-mit
        new file:   third_party/rust/windows-bindgen/readme.md
        new file:   third_party/rust/windows-bindgen/src/args.rs
        new file:   third_party/rust/windows-bindgen/src/error.rs
        new file:   third_party/rust/windows-bindgen/src/lib.rs
        new file:   third_party/rust/windows-bindgen/src/metadata.rs
        new file:   third_party/rust/windows-bindgen/src/rdl/fmt.rs
        new file:   third_party/rust/windows-bindgen/src/rdl/from_reader.rs
        new file:   third_party/rust/windows-bindgen/src/rdl/mod.rs
        new file:   third_party/rust/windows-bindgen/src/rdl/to_winmd.rs
        new file:   third_party/rust/windows-bindgen/src/rust/cfg.rs
        new file:   third_party/rust/windows-bindgen/src/rust/classes.rs
        new file:   third_party/rust/windows-bindgen/src/rust/com_methods.rs
        new file:   third_party/rust/windows-bindgen/src/rust/constants.rs
        new file:   third_party/rust/windows-bindgen/src/rust/delegates.rs
        new file:   third_party/rust/windows-bindgen/src/rust/enums.rs
        new file:   third_party/rust/windows-bindgen/src/rust/extensions/mod.rs
        new file:   third_party/rust/windows-bindgen/src/rust/functions.rs
        new file:   third_party/rust/windows-bindgen/src/rust/handles.rs
        new file:   third_party/rust/windows-bindgen/src/rust/implements.rs
        new file:   third_party/rust/windows-bindgen/src/rust/index.rs
        new file:   third_party/rust/windows-bindgen/src/rust/interfaces.rs
        new file:   third_party/rust/windows-bindgen/src/rust/iterators.rs
        new file:   third_party/rust/windows-bindgen/src/rust/method_names.rs
        new file:   third_party/rust/windows-bindgen/src/rust/mod.rs
        new file:   third_party/rust/windows-bindgen/src/rust/standalone.rs
        new file:   third_party/rust/windows-bindgen/src/rust/structs.rs
        new file:   third_party/rust/windows-bindgen/src/rust/try_format.rs
        new file:   third_party/rust/windows-bindgen/src/rust/winrt_methods.rs
        new file:   third_party/rust/windows-bindgen/src/rust/writer.rs
        new file:   third_party/rust/windows-bindgen/src/tokens/mod.rs
        new file:   third_party/rust/windows-bindgen/src/tokens/runtime.rs
        new file:   third_party/rust/windows-bindgen/src/tokens/to_tokens.rs
        new file:   third_party/rust/windows-bindgen/src/tokens/token_stream.rs
        new file:   third_party/rust/windows-bindgen/src/tree.rs
        new file:   third_party/rust/windows-bindgen/src/winmd/from_reader.rs
        new file:   third_party/rust/windows-bindgen/src/winmd/mod.rs
        new file:   third_party/rust/windows-bindgen/src/winmd/writer/blobs.rs
        new file:   third_party/rust/windows-bindgen/src/winmd/writer/codes.rs
        new file:   third_party/rust/windows-bindgen/src/winmd/writer/file.rs
        new file:   third_party/rust/windows-bindgen/src/winmd/writer/mod.rs
        new file:   third_party/rust/windows-bindgen/src/winmd/writer/strings.rs
        new file:   third_party/rust/windows-bindgen/src/winmd/writer/tables.rs
        new file:   third_party/rust/windows-bindgen/src/winmd/writer/traits.rs
        new file:   third_party/rust/windows-bindgen/src/winmd/writer/type.rs
        new file:   third_party/rust/windows-metadata/.cargo-checksum.json
        new file:   third_party/rust/windows-metadata/Cargo.toml
        new file:   third_party/rust/windows-metadata/license-apache-2.0
        new file:   third_party/rust/windows-metadata/license-mit
        new file:   third_party/rust/windows-metadata/readme.md
        new file:   third_party/rust/windows-metadata/src/attributes.rs
        new file:   third_party/rust/windows-metadata/src/bindings.rs
        new file:   third_party/rust/windows-metadata/src/blob.rs
        new file:   third_party/rust/windows-metadata/src/codes.rs
        new file:   third_party/rust/windows-metadata/src/column.rs
        new file:   third_party/rust/windows-metadata/src/file.rs
        new file:   third_party/rust/windows-metadata/src/filter.rs
        new file:   third_party/rust/windows-metadata/src/lib.rs
        new file:   third_party/rust/windows-metadata/src/reader.rs
        new file:   third_party/rust/windows-metadata/src/row.rs
        new file:   third_party/rust/windows-metadata/src/table.rs
        new file:   third_party/rust/windows-metadata/src/tables.rs
        new file:   third_party/rust/windows-metadata/src/type.rs
        new file:   third_party/rust/windows-metadata/src/type_name.rs

@ErichDonGubler I appreciate your support here. Let me know if you need any help.

ErichDonGubler · 2025-01-17T20:09:14Z

Just force-pushed to move to the windows crate, plus an extension to version 0.59. 🙌🏻 Nice, that was easier than I'd hoped it'd be!

ErichDonGubler · 2025-01-17T20:11:20Z

Just made an example showing that windows 0.59.0 can be consolidated into after patching libloading here: erichdongubler-mozilla@3a713aa

You can recreate this commit by: 1. Applying a `patch.crates-io.libloading` to point to the upstream PR allowing `windows` 0.59 in its dep. range. 2. Run `cargo update`.

ErichDonGubler · 2025-01-17T20:17:26Z

🙌🏻 This PR no longer has a hard dependency on libloading's upstream PR to extend its windows dependency version range (nagisa/rust_libloading#169), but an upgrade of libloading after it releases that PR's contents is necessary to allow downstream crates to upgrade to windows 0.59.0.

mxinden · 2025-01-20T14:50:39Z

Thanks for the quick help here @ErichDonGubler! Will make my life a lot easier bringing mtu into mozilla-central!

ErichDonGubler requested review from KershawChang, larseggert, martinthomson and mxinden as code owners January 10, 2025 21:29

ErichDonGubler changed the title ~~WIP: build: allow windows-core 0.59, windows-targets 0.53~~ build: allow windows-core 0.59, windows-targets 0.53 Jan 10, 2025

ErichDonGubler changed the title ~~build: allow windows-core 0.59, windows-targets 0.53~~ build: use windows-{core,bindgen} 0.59, windows-targets 0.53 Jan 10, 2025

ErichDonGubler force-pushed the windows-0.59 branch from 1852406 to 69a984f Compare January 10, 2025 21:40

ErichDonGubler force-pushed the windows-0.59 branch 2 times, most recently from d2f010a to 5da7513 Compare January 10, 2025 22:35

ErichDonGubler mentioned this pull request Jan 10, 2025

[d3d12 wgl] Upgrade to windows 0.62 crates gfx-rs/wgpu#6876

Open

8 tasks

mxinden reviewed Jan 13, 2025

View reviewed changes

Cargo.toml Outdated Show resolved Hide resolved

ErichDonGubler force-pushed the windows-0.59 branch from 5da7513 to 8b708e3 Compare January 13, 2025 14:03

ErichDonGubler force-pushed the windows-0.59 branch from 8b708e3 to 16bcd32 Compare January 17, 2025 20:08

ErichDonGubler changed the title ~~build: use windows-{core,bindgen} 0.59, windows-targets 0.53~~ Move to windows 0.58.0, and also permit version 0.59 Jan 17, 2025

build!: move to windows from windows-{bindgen,core,targets}

f6ccb41

ErichDonGubler force-pushed the windows-0.59 branch from 16bcd32 to c7b03de Compare January 17, 2025 20:14

build: expand windows version range to include 0.59

4afd54a

ErichDonGubler force-pushed the windows-0.59 branch from c7b03de to 4afd54a Compare January 17, 2025 20:27

larseggert approved these changes Jan 17, 2025

View reviewed changes

larseggert merged commit 758a40b into mozilla:main Jan 20, 2025
30 of 31 checks passed

Move to windows 0.58.0, and also permit version 0.59 #65

Move to windows 0.58.0, and also permit version 0.59 #65

Uh oh!

Conversation

ErichDonGubler commented Jan 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Jan 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

ErichDonGubler commented Jan 10, 2025

Uh oh!

ErichDonGubler commented Jan 10, 2025

Uh oh!

mxinden commented Jan 13, 2025

Uh oh!

mxinden commented Jan 13, 2025

Uh oh!

Uh oh!

larseggert commented Jan 13, 2025

Uh oh!

larseggert commented Jan 13, 2025

Uh oh!

ErichDonGubler commented Jan 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

larseggert commented Jan 13, 2025

Uh oh!

ErichDonGubler commented Jan 13, 2025

Uh oh!

mxinden commented Jan 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ErichDonGubler commented Jan 17, 2025

Uh oh!

ErichDonGubler commented Jan 17, 2025

Uh oh!

ErichDonGubler commented Jan 17, 2025

Uh oh!

Uh oh!

mxinden commented Jan 20, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Move to `windows` 0.58.0, and also permit version 0.59 #65

Move to `windows` 0.58.0, and also permit version 0.59 #65

ErichDonGubler commented Jan 10, 2025 •

edited

Loading

codecov bot commented Jan 10, 2025 •

edited

Loading

ErichDonGubler commented Jan 13, 2025 •

edited

Loading

mxinden commented Jan 17, 2025 •

edited

Loading