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

rust: fix latest clippy issues - v1 #12170

Closed
wants to merge 4 commits into from

Conversation

jasonish
Copy link
Member

  • rust: update num-dervice to 0.4.2
    This prevents the clippy warning:

    508 | #[derive(FromPrimitive, Debug)]
    | ^------------
    | |
    | FromPrimitive is not local
    | move the impl block outside of this constant _IMPL_NUM_FromPrimitive_FOR_IsakmpPayloadType
    509 | pub enum IsakmpPayloadType {
    | ----------------- IsakmpPayloadType is not local
    |
    = note: the derive macro FromPrimitive defines the non-local impl, and may need to be changed
    = note: the derive macro FromPrimitive may come from an old version of the num_derive crate, try updating your dependency with cargo update -p num_derive
    = note: an impl is never scoped, even when it is nested inside an item, as it may impact type checking outside of that item, which can be the case if neither the trait or the self type are at the same nesting level as the impl
    = note: items in an anonymous const item (const _: () = { ... }) are treated as in the same scope as the anonymous const's declaration for the purpose of this lint
    = note: this warning originates in the derive macro FromPrimitive (in Nightly builds, run with -Z macro-backtrace for more info)

  • rust: remove unnecessary lifetimes
    Fix provided by cargo clippy --fix.

  • rust/smb: fix rustdoc line
    '///' style rust comments/documentation come before the item being
    documented.

    Spotted by clippy.

  • rust: allow static_mut_refs for now
    But we should fix all these soon.

This prevents the clippy warning:

508 | #[derive(FromPrimitive, Debug)]
    |          ^------------
    |          |
    |          `FromPrimitive` is not local
    |          move the `impl` block outside of this constant `_IMPL_NUM_FromPrimitive_FOR_IsakmpPayloadType`
509 | pub enum IsakmpPayloadType {
    |          ----------------- `IsakmpPayloadType` is not local
    |
    = note: the derive macro `FromPrimitive` defines the non-local `impl`, and may need to be changed
    = note: the derive macro `FromPrimitive` may come from an old version of the `num_derive` crate, try updating your dependency with `cargo update -p num_derive`
    = note: an `impl` is never scoped, even when it is nested inside an item, as it may impact type checking outside of that item, which can be the case if neither the trait or the self type are at the same nesting level as the `impl`
    = note: items in an anonymous const item (`const _: () = { ... }`) are treated as in the same scope as the anonymous const's declaration for the purpose of this lint
    = note: this warning originates in the derive macro `FromPrimitive` (in Nightly builds, run with -Z macro-backtrace for more info)
Fix provided by cargo clippy --fix.
'///' style rust comments/documentation come before the item being
documented.

Spotted by clippy.
But we should fix all these soon.
@@ -32,7 +32,7 @@ crc = "~1.8.1"
lzma-rs = { version = "~0.2.0", features = ["stream"] }
memchr = "~2.4.1"
num = "~0.2.1"
num-derive = "~0.2.5"
num-derive = "~0.4.2"
Copy link
Member

Choose a reason for hiding this comment

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

does this require a cargo lock.in update as well?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes.

@jasonish
Copy link
Member Author

Cargo.lock updated with #12171.

@jasonish jasonish closed this Nov 28, 2024
Copy link

codecov bot commented Nov 28, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 49.82%. Comparing base (bd7d38e) to head (4863000).

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #12170      +/-   ##
==========================================
+ Coverage   49.81%   49.82%   +0.01%     
==========================================
  Files         909      909              
  Lines      257904   257904              
==========================================
+ Hits       128467   128511      +44     
+ Misses     129437   129393      -44     
Flag Coverage Δ
fuzzcorpus 60.99% <ø> (+0.04%) ⬆️
livemode 19.43% <ø> (ø)
pcap 44.38% <ø> (-0.03%) ⬇️
suricata-verify 62.74% <ø> (-0.01%) ⬇️
unittests 8.98% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

@jasonish jasonish deleted the rust-clippy/v1 branch December 2, 2024 16:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants