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

7.0.x: clippy fixes; update num-derive #12223

Merged
merged 5 commits into from
Dec 6, 2024

Conversation

jasonish
Copy link
Member

@jasonish jasonish commented Dec 4, 2024

  • rust: sync Cargo.lock with Cargo.toml
    This just updates some internal dependencies to our own crates in the
    work-space.

  • rust: update num-derive to 0.4.2
    Includes Cargo.lock.in generated for just this single crate update
    (minimal atomic update to keep Cargo.lock in sync with Cargo.toml).

    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)
    

    Backport of 8e408d3.

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

    (cherry picked from commit 4c12165)

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

    Spotted by clippy.

    (cherry picked from commit aa6e94f)

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

    Backport of 7bdbe7e.

This just updates some internal dependencies to our own crates in the
work-space.
Includes Cargo.lock.in generated for just this single crate update
(minimal atomic update to keep Cargo.lock in sync with Cargo.toml).

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)

Backport of 8e408d3.
But we should fix all these soon.

(cherry picked from commit 4c12165)
'///' style rust comments/documentation come before the item being
documented.

Spotted by clippy.

(cherry picked from commit aa6e94f)
Fix provided by cargo clipy --fix.

Backport of 7bdbe7e.
@jasonish
Copy link
Member Author

jasonish commented Dec 4, 2024

Still not fully clippy clean, but no errors so CI passes. Its not changes I want to make to 7.0.x right away to pass a linter.

Copy link

codecov bot commented Dec 4, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.17%. Comparing base (093397f) to head (825eadf).
Report is 5 commits behind head on main-7.0.x.

Additional details and impacted files
@@              Coverage Diff               @@
##           main-7.0.x   #12223      +/-   ##
==============================================
- Coverage       83.18%   83.17%   -0.01%     
==============================================
  Files             922      922              
  Lines          260858   260858              
==============================================
- Hits           216982   216979       -3     
- Misses          43876    43879       +3     
Flag Coverage Δ
fuzzcorpus 64.15% <ø> (ø)
suricata-verify 63.39% <ø> (+0.03%) ⬆️
unittests 62.38% <ø> (+<0.01%) ⬆️

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

@suricata-qa
Copy link

Information: QA ran without warnings.

Pipeline 23682

@victorjulien victorjulien merged commit 825eadf into OISF:main-7.0.x Dec 6, 2024
88 checks passed
@victorjulien
Copy link
Member

Merged in #12231, thanks!

@jasonish jasonish deleted the 7.0.x/20241204/clippy/v1 branch December 12, 2024 15:14
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.

3 participants