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

cargo update & lint/clippy/rustfmt/cargo-deny fixes. #3

Merged
merged 5 commits into from
Oct 4, 2024

Conversation

eddyb
Copy link
Collaborator

@eddyb eddyb commented Oct 3, 2024

This fixes the remaining CI failures.

The rustfmt.toml change was prompted by @Firestar99's formatting changes in #2, and the subsequent local rebasing, with version = "Two" causing warnings due to:

So the perma-unstable rustfmt.toml version config is now style_edition = "2024", and hopefully that gets stabilized at the same time as Rust 2024 becoming stable.

@eddyb eddyb marked this pull request as draft October 3, 2024 20:23
@eddyb eddyb marked this pull request as ready for review October 3, 2024 20:39
@eddyb eddyb enabled auto-merge October 3, 2024 20:54
@eddyb eddyb disabled auto-merge October 3, 2024 20:55
@eddyb eddyb enabled auto-merge October 3, 2024 20:55
@eddyb eddyb marked this pull request as draft October 3, 2024 21:17
auto-merge was automatically disabled October 3, 2024 21:17

Pull request was converted to draft

@eddyb
Copy link
Collaborator Author

eddyb commented Oct 3, 2024

Oops, just noticed "Ensure compatibility with rust-gpu nightly rust version" check doesn't actually do anything because of how the rustup override stuff works, will try to fix that before it gets lost to time again.

@eddyb eddyb force-pushed the ci-fix branch 3 times, most recently from bdf3dcf to e018d86 Compare October 3, 2024 21:46
@eddyb
Copy link
Collaborator Author

eddyb commented Oct 3, 2024

"Ensure compatibility with rust-gpu nightly rust version" check works now, it even fully builds with only this warning:

warning: unused manifest key: lints.rust.unexpected_cfgs.check-cfg

(if we were running cargo clippy there might've been issues but it's just cargo check)

@eddyb eddyb marked this pull request as ready for review October 3, 2024 21:57
@eddyb eddyb changed the title cargo update & lint/clippy/rustfmt fixes. cargo update & lint/clippy/rustfmt/cargo-deny fixes. Oct 3, 2024
@eddyb eddyb enabled auto-merge October 3, 2024 22:09
Copy link
Collaborator

@LegNeato LegNeato left a comment

Choose a reason for hiding this comment

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

🚀

@LegNeato LegNeato disabled auto-merge October 4, 2024 07:35
@eddyb eddyb added this pull request to the merge queue Oct 4, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Oct 4, 2024
@LegNeato LegNeato merged commit 65d95b5 into Rust-GPU:main Oct 4, 2024
6 checks passed
@eddyb eddyb deleted the ci-fix branch October 4, 2024 07:42
@eddyb
Copy link
Collaborator Author

eddyb commented Oct 4, 2024

The merge queue failure was real, literally today's nightly introduced it:
image

Will open another PR.

github-merge-queue bot pushed a commit that referenced this pull request Oct 4, 2024
…`). (#5)

Was left out of #3 because they
just got added/enabled.
github-merge-queue bot pushed a commit that referenced this pull request Oct 4, 2024
*(This won't pass CI until #3 lands)*

Similar to EmbarkStudios/spirt#61, the main
reason for the bump is to avoid being stuck behind on definitions in a
new release (even when there's not much going on).
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