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.

Sign up for GitHub

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

Jump to bottom

rust: fix clippy issues #12201

Closed
wants to merge 4 commits into from
Closed

rust: fix clippy issues #12201

wants to merge 4 commits into from

Conversation

jlucovsky
Copy link
Contributor

Continuation of #12189

Based on #12171

Backport clippy fixes to main-7.0.x

Updates:

  • Removed changes to x509/mod.rs (not needed for main-7.0.x)

@jasonish @jlucovsky
rust: update num-derive to 0.4.2
4d6065e 
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)

(cherry picked from commit 8e408d3)
@jasonish @jlucovsky
rust: remove unnecessary lifetimes
ecb4ba5 
Fix provided by cargo clippy --fix.

(cherry picked from commit 7bdbe7e)
@jasonish @jlucovsky
rust/smb: fix rustdoc line
ab7daf6 
'///' style rust comments/documentation come before the item being
documented.

Spotted by clippy.

(cherry picked from commit aa6e94f)
@jasonish @jlucovsky
rust: allow static_mut_refs for now
e2cb4dd 
But we should fix all these soon.

(cherry picked from commit 4c12165)
@jlucovsky jlucovsky mentioned this pull request Dec 2, 2024
Closed
@codecov Codecov
Copy link

codecov bot commented Dec 2, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.17%. Comparing base (c3a6abf) to head (e2cb4dd).
Report is 5 commits behind head on main-7.0.x.

Additional details and impacted files 
@@              Coverage Diff               @@
##           main-7.0.x   #12201      +/-   ##
==============================================
- Coverage       83.18%   83.17%   -0.01%     
==============================================
  Files             922      922              
  Lines          260821   260845      +24     
==============================================
+ Hits           216953   216964      +11     
- Misses          43868    43881      +13
Flag Coverage Δ
fuzzcorpus 64.15% <ø> (+0.02%) ⬆️
suricata-verify 63.36% <ø> (+<0.01%) ⬆️
unittests 62.38% <ø> (-0.01%) ⬇️

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

@jasonish
Copy link
Member

jasonish commented Dec 2, 2024

The changes to Cargo.lock.in seem larger than I would have expected, how did you regenerate it? For reference, in master what I did was:

  • update num-derive in Cargo.toml.in
  • run make
  • run cp Cargo.lock Cargo.lock.in
  • doing the same on main-7.0.x results in a smaller diff to Cargo.lock.in.

Maybe make update-lock should do similar logic to prevent pulling in more stuff then needed to match a Cargo.toml change.

@suricata-qa
Copy link

WARNING:

field baseline test %
SURI_TLPR1_stats_chk
.uptime 650 680 104.62%

Pipeline 23633

@jlucovsky
Copy link
Contributor Author

The changes to Cargo.lock.in seem larger than I would have expected, how did you regenerate it? For reference, in master what I did was:

  • update num-derive in Cargo.toml.in
  • run make
  • run cp Cargo.lock Cargo.lock.in
  • doing the same on main-7.0.x results in a smaller diff to Cargo.lock.in.

Maybe make update-lock should do similar logic to prevent pulling in more stuff then needed to match a Cargo.toml change.

I cherry-picked the commit and resolved the issues.

I'm happy to try your suggestion if that will be cleaner. Please advise.

@victorjulien
Copy link
Member

My preference:

  1. cargo update, make, copy Cargo.lock to Cargo.lock.in, commit
  2. update num-derive in Cargo.toml.in
    run make
    run cp Cargo.lock Cargo.lock.in
  3. add the remaining commits

This splits the num-derive update from a regular update, and excludes any possible artifacts from master

@jlucovsky jlucovsky mentioned this pull request Dec 4, 2024
Closed
@jlucovsky
Copy link
Contributor Author

Continued in #12220

@jlucovsky jlucovsky closed this Dec 4, 2024
@jlucovsky jlucovsky deleted the clippy/2 branch December 5, 2024 13:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@catenacyber catenacyber Awaiting requested review from catenacyber catenacyber is a code owner

@victorjulien victorjulien Awaiting requested review from victorjulien victorjulien is a code owner

@jasonish jasonish Awaiting requested review from jasonish jasonish is a code owner

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jlucovsky @jasonish @suricata-qa @victorjulien