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

Update to nightly-2022-12-18 #982

Merged
merged 8 commits into from
Jan 5, 2023
Merged

Update to nightly-2022-12-18 #982

merged 8 commits into from
Jan 5, 2023

Conversation

oisyn
Copy link
Contributor

@oisyn oisyn commented Jan 4, 2023

This brings us on par with 1.67 due for release on January 26.

@oisyn oisyn requested a review from eddyb as a code owner January 4, 2023 16:14
@eddyb eddyb enabled auto-merge (rebase) January 4, 2023 17:44
@eddyb
Copy link
Contributor

eddyb commented Jan 4, 2023

The mergify stuff we forgot to fully remove is the only thing passing, actual GHA looks busted.
Will try to trigger GHA by closing and reopening the PR, can't really find any other controls :/.

EDIT: phew, that did actually work.

@eddyb eddyb closed this Jan 4, 2023
auto-merge was automatically disabled January 4, 2023 17:47

Pull request was closed

@eddyb eddyb reopened this Jan 4, 2023
@eddyb eddyb enabled auto-merge (rebase) January 4, 2023 17:48
@eddyb
Copy link
Contributor

eddyb commented Jan 4, 2023

Guess this brought in a rustfmt update as well (kind of wild it can do this sort of macro reformatting, at all):

$ rustfmt --check tests/ui/**/*.rs
Diff in /home/runner/work/rust-gpu/rust-gpu/tests/ui/image/format.rs at line 5:
 #[spirv(fragment)]
 pub fn main(
-    #[spirv(descriptor_set = 0, binding = 0)] image: &Image!(2D, format=rgba32f, sampled),
+    #[spirv(descriptor_set = 0, binding = 0)] image: &Image!(2D, format = rgba32f, sampled),
     output: &mut glam::Vec4,
 ) {
     let texel = image.fetch(glam::IVec2::new(0, 1));

@oisyn oisyn requested review from fu5ha and VZout as code owners January 5, 2023 10:04
@oisyn
Copy link
Contributor Author

oisyn commented Jan 5, 2023

And apparently a clippy --fix can introduce bad formatting 🙄

Copy link
Contributor

@eddyb eddyb left a comment

Choose a reason for hiding this comment

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

I found several instances of "{}", " - that indicates likely a bad replacement, where instead of formatting, you're printing the format string verbatim.

This is likely due to the editions, maybe we need to revive a partial version of my PR to switch to Rust 2021.

crates/spirv-builder/src/lib.rs Outdated Show resolved Hide resolved
@eddyb eddyb disabled auto-merge January 5, 2023 11:22
@eddyb
Copy link
Contributor

eddyb commented Jan 5, 2023

Looks like clippy got fixed in:

which got sync'd into rust-lang/rust in:

So theoretically updating to nightly-2022-12-18 should get us fixed clippy (that will not suggest incorrect changes on pre-Rust2021 code).

Alternatively, we could #![allow(...)] the lint for now, or try to land some version of #953 - I don't have a strong preference.

@oisyn
Copy link
Contributor Author

oisyn commented Jan 5, 2023

I'll try updating to nightly-2022-12-18. If that gives us headaches we can always just allow.

@oisyn oisyn changed the title Update to nightly-2022-12-10 Update to nightly-2022-12-18 Jan 5, 2023
@oisyn oisyn requested a review from eddyb January 5, 2023 12:31
@eddyb eddyb merged commit bab728f into main Jan 5, 2023
@eddyb eddyb deleted the new-version branch January 5, 2023 12:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants