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

Fix errors with rust v1.83 #68

Merged
merged 2 commits into from
Dec 4, 2024

Conversation

vigh-m
Copy link
Contributor

@vigh-m vigh-m commented Dec 3, 2024

Description of changes:

  • Silence newly added linter errors and warnings
  • Minor code changes based on linter warnings
  • Update licenses to for unicode-ident crate

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

Comment on lines 672 to 673
/// // =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^=

///
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we can remove the /// from line 672.

Comment on lines 9 to 13
#![expect(non_local_definitions)]
#![expect(clippy::needless_lifetimes)]
Copy link
Contributor

Choose a reason for hiding this comment

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

Do you mind elaborating that these also come from the StableAbi derive macro?

@vigh-m vigh-m force-pushed the extend-kubernetes-settings branch from fafc6db to ab14d15 Compare December 3, 2024 20:30
@vigh-m
Copy link
Contributor Author

vigh-m commented Dec 3, 2024

Updated based on comments.

deny.toml Outdated
@@ -20,7 +20,7 @@ allow = [

exceptions = [
{ name = "generational-arena", allow = ["MPL-2.0"] },
{ name = "unicode-ident", allow = ["MIT", "Apache-2.0", "Unicode-DFS-2016"] },
{ name = "unicode-ident", allow = ["MIT", "Apache-2.0", "Unicode-DFS-2016", "Unicode-3.0"] },
Copy link
Contributor

Choose a reason for hiding this comment

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

I also have a PR which is failing CI due to this issue. In the CI build, I see this:

registry+https://github.com/rust-lang/crates.io-index#[email protected]:4:36
  │
4 │ license = "(MIT OR Apache-2.0) AND Unicode-3.0"

Given this, can we remove the "Unicode-DFS-2016"?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Makes sense. Updated

@vigh-m vigh-m force-pushed the extend-kubernetes-settings branch from ab14d15 to d072a70 Compare December 3, 2024 23:43
@vigh-m
Copy link
Contributor Author

vigh-m commented Dec 3, 2024

Removed extra "Unicode-DFS-2016" license from deny.toml

@koooosh
Copy link
Contributor

koooosh commented Dec 4, 2024

Merging this to unblock my PR 😄

@koooosh koooosh merged commit e8ce179 into bottlerocket-os:develop Dec 4, 2024
2 checks passed
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.

3 participants