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

Raise MSRV to Rust 1.80 #6105

Draft
wants to merge 10 commits into
base: trunk
Choose a base branch
from
Draft

Raise MSRV to Rust 1.80 #6105

wants to merge 10 commits into from
+95 −126

Conversation

ErichDonGubler
Copy link
Member

@ErichDonGubler ErichDonGubler commented Aug 12, 2024 •
edited
Loading

@ErichDonGubler ErichDonGubler added area: infrastructure Testing, building, coordinating issues kind: refactor Making existing function faster or nicer labels Aug 12, 2024
@ErichDonGubler ErichDonGubler self-assigned this Aug 12, 2024
@ErichDonGubler ErichDonGubler force-pushed the rust-lints-with-1.80 branch 6 times, most recently from 5b300f7 to 13db95e Compare August 12, 2024 12:26
@ErichDonGubler
Copy link
Member Author

Heeey, we're finally running into the same annoying errors here that I wasn't sure what to do with locally when I saw them:

error: trait `ContextId` is never used
  --> wgpu/src/context.rs:25:11
   |
25 | pub trait ContextId: Into<ObjectId> + From<ObjectId> + Debug + 'static {}
   |           ^^^^^^^^^
   |
   = note: `-D dead-code` implied by `-D warnings`
   = help: to override `-D warnings` add `#[allow(dead_code)]`

error: methods `device_downlevel_properties`, `device_mark_lost`, `render_bundle_encoder_multi_draw_indirect`, `render_bundle_encoder_multi_draw_indexed_indirect`, `render_bundle_encoder_multi_draw_indirect_count`, and `render_bundle_encoder_multi_draw_indexed_indirect_count` are never used
   --> wgpu/src/context.rs:190:8
    |
34  | pub trait Context: Debug + WasmNotSendSync + Sized {
    |           ------- methods in this trait
...
190 |     fn device_downlevel_properties(
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
...
290 |     fn device_mark_lost(
    |        ^^^^^^^^^^^^^^^^
...
793 |     fn render_bundle_encoder_multi_draw_indirect(
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
...
802 |     fn render_bundle_encoder_multi_draw_indexed_indirect(
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
...
812 |     fn render_bundle_encoder_multi_draw_indirect_count(
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
...
825 |     fn render_bundle_encoder_multi_draw_indexed_indirect_count(
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: methods `device_downlevel_properties`, `device_mark_lost`, `render_bundle_encoder_multi_draw_indirect`, `render_bundle_encoder_multi_draw_indexed_indirect`, `render_bundle_encoder_multi_draw_indirect_count`, and `render_bundle_encoder_multi_draw_indexed_indirect_count` are never used
    --> wgpu/src/context.rs:1249:8
     |
1171 | pub(crate) trait DynContext: Debug + WasmNotSendSync {
     |                  ---------- methods in this trait
...
1249 |     fn device_downlevel_properties(
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^
...
1349 |     fn device_mark_lost(&self, device: &ObjectId, device_data: &crate::Data, message: &str);
     |        ^^^^^^^^^^^^^^^^
...
1790 |     fn render_bundle_encoder_multi_draw_indirect(
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
...
1799 |     fn render_bundle_encoder_multi_draw_indexed_indirect(
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
...
1809 |     fn render_bundle_encoder_multi_draw_indirect_count(
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
...
1822 |     fn render_bundle_encoder_multi_draw_indexed_indirect_count(
     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

    Checking naga-fuzz v0.0.0 (/Users/runner/work/wgpu/wgpu/naga/fuzz)
    Checking d3d12 v22.0.0 (/Users/runner/work/wgpu/wgpu/d3d12)
error: could not compile `wgpu` (lib) due to 3 previous errors

☝🏻 @cwfitzgerald, @Wumpf: Not sure how to best proceed here, but I haven't given it many brain cycles, either. Will dedicate more in the absence of feedback in the next day or so.

@ErichDonGubler ErichDonGubler force-pushed the rust-lints-with-1.80 branch 4 times, most recently from 3aa12e9 to b5973ab Compare August 12, 2024 12:53
@ErichDonGubler ErichDonGubler mentioned this pull request Aug 12, 2024
Open
@ErichDonGubler ErichDonGubler changed the title Resolve yet more lints from Rust 1.80, but which are only resolvable in Rust 1.80 or newer Resolve Rust 1.80 lints Aug 12, 2024
@ErichDonGubler ErichDonGubler force-pushed the rust-lints-with-1.80 branch 2 times, most recently from a7cfba6 to 4e2f6ce Compare August 13, 2024 07:49
@ErichDonGubler ErichDonGubler mentioned this pull request Aug 13, 2024
Closed
@ErichDonGubler
Copy link
Member Author

Leaving this as a draft until we actually have the option to upgrade to Rust 1.80.

We might be able to hoist the upgrade to cfg_aliases out if katharostech/cfg_aliases#10 merges and is released.

@ErichDonGubler

This comment was marked as resolved.

Sign in to view
@kornelski

This comment was marked as resolved.

Sign in to view
@ErichDonGubler

This comment was marked as resolved.

Sign in to view
@ErichDonGubler ErichDonGubler mentioned this pull request Aug 23, 2024
Merged
6 tasks
@ErichDonGubler ErichDonGubler force-pushed the rust-lints-with-1.80 branch 3 times, most recently from b8278cb to 0adf9c8 Compare August 28, 2024 17:31
kornelski
kornelski reviewed Aug 28, 2024
View reviewed changes
naga/src/back/msl/mod.rs Outdated Show resolved Hide resolved
@ErichDonGubler ErichDonGubler mentioned this pull request Aug 28, 2024
Merged
6 tasks
This was referenced Oct 1, 2024
Open
Open
ErichDonGubler added a commit to erichdongubler-mozilla/wgpu that referenced this pull request Oct 11, 2024
@ErichDonGubler
chore: satisfy unused_qualifications (again)
823b0c9 
Regressed by
[gfx-rs#6354](https://github.com/gfx-rs/wgpu/pull/6354/files#diff-1dd0973ceb242a02442d33e422f9dff40e007b505d0ee726613e1763e61e768dR2809)
(CC @jimb). Hopefully will get plugged by
[gfx-rs#6105](gfx-rs#6105).
@ErichDonGubler ErichDonGubler mentioned this pull request Oct 11, 2024
Merged
@ErichDonGubler ErichDonGubler mentioned this pull request Oct 11, 2024
Open
3 tasks
jimblandy pushed a commit that referenced this pull request Oct 11, 2024
@ErichDonGubler @jimblandy
chore: satisfy unused_qualifications (again)
a13e710 
Regressed by
[#6354](https://github.com/gfx-rs/wgpu/pull/6354/files#diff-1dd0973ceb242a02442d33e422f9dff40e007b505d0ee726613e1763e61e768dR2809)
(CC @jimb). Hopefully will get plugged by
[#6105](#6105).
@ErichDonGubler ErichDonGubler mentioned this pull request Oct 11, 2024
Merged
@ErichDonGubler ErichDonGubler force-pushed the rust-lints-with-1.80 branch 4 times, most recently from 3cf47a6 to 6edb2b1 Compare October 17, 2024 16:54
@ErichDonGubler ErichDonGubler force-pushed the rust-lints-with-1.80 branch 2 times, most recently from c7e6991 to 16f5d35 Compare October 23, 2024 16:42
@ErichDonGubler ErichDonGubler force-pushed the rust-lints-with-1.80 branch 4 times, most recently from e43fe55 to 85229ca Compare November 5, 2024 18:33
@ErichDonGubler
WIP: build: update Rust 1.76 → 1.78
8662028
@ErichDonGubler
chore: warn on clippy::ref_as_ptr
cdfa879
@ErichDonGubler
build(ci): update nightly 2024-01-31 → 2024-08-11
26ed368
@ErichDonGubler
build: upgrade rust-version for Firefox crates 1.77.2 → 1.80.1
fba3bde
@ErichDonGubler
build: upgrade cfg_aliases 0.1.1 → 0.2.1
2fe43bd 
Consumes
[`cfg_aliases`#8](katharostech/cfg_aliases#8) to
eliminate warnings from `rustc`.
@ErichDonGubler
chore(core): allow wgpu_* cfg keys not exposed in features
1b33ee2 
This resolves remaining outstanding cases that offend [`--check-cfg` in
Rust
1.80](https://blog.rust-lang.org/2024/07/25/Rust-1.80.0.html#checked-cfg-names-and-values)
in `wgpu-core`.
@ErichDonGubler
chore: add web_sys_unstable_apis to `lints.rust.unexpected_cfgs.che…
161222d 
…ck-cfg` in `wgpu_{hal,types}`
@ErichDonGubler
chore(benches): add tracy to lints.rust.unexpected_cfgs.check-cfg
a5a787e
@ErichDonGubler
chore: remove std::mem::* imports now unnecessary with Rust 1.80
66cd7cf 
`std::mem::{size,align}_of{,_val}` was added to `std::prelude` in Rust
1.80; see
[`rust`#123168](rust-lang/rust#123168).
@ErichDonGubler
refactor: s/once_cell::Lazy/std::sync::LazyLock
8d79c85 
Weaken our dependence on the `once_cell` crate by using functionality
from `std` instead that was upstreamed from `once_cell`, this time with
what's available in Rust 1.80+.

It's not yet possible to eliminate this dependency entirely, but do what
we can for now.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kornelski kornelski kornelski left review comments

@cwfitzgerald cwfitzgerald cwfitzgerald approved these changes

At least 1 approving review is required to merge this pull request.

Assignees

@ErichDonGubler ErichDonGubler

Labels
area: infrastructure Testing, building, coordinating issues kind: refactor Making existing function faster or nicer
Projects
WebGPU for Firefox
Status: In Progress
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ErichDonGubler @kornelski @cwfitzgerald