Clippy 177 backport7 #10695
Closed
Clippy 177 backport7 #10695
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Ticket: 6883 error: field `0` is never read --> src/asn1/mod.rs:36:14 | 36 | BerError(Err<der_parser::error::BerError>), | -------- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | | | field in this variant | (cherry picked from commit 02f2fb8)
error: unnecessary use of `to_vec`
--> src/smb/smb.rs:1048:62
|
1048 | let (name, is_dcerpc) = match self.guid2name_map.get(&guid.to_vec()) {
| ^^^^^^^^^^^^^^ help: replace it with: `guid`
|
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_to_owned
= note: `#[deny(clippy::unnecessary_to_owned)]` implied by `#[deny(warnings)]`
And also other uses of to_vec() on already Vec
(cherry picked from commit f7cde8f)
rror: creating a mutable reference to mutable static is discouraged
--> src/mqtt/mqtt.rs:752:23
|
752 | let max_msg_len = &mut MAX_MSG_LEN;
| ^^^^^^^^^^^^^^^^ mutable reference to mutable static
|
= note: for more information, see issue #114447 <rust-lang/rust#114447>
= note: this will be a hard error in the 2024 edition
= note: this mutable reference has lifetime `'static`, but if the static gets accessed (read or written) by any other means, or any other reference is created, then any further use of this mutable reference is Undefined Behavior
catenacyber
force-pushed
the
clippy-177-backport7
branch
from
6c4b93a
to
4996535
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main-7.0.x #10695 +/- ##
==============================================
- Coverage 82.43% 82.41% -0.02%
==============================================
Files 976 976
Lines 275062 275062
==============================================
- Hits 226744 226700 -44
- Misses 48318 48362 +44
Flags with carried forward coverage won't be shown. Click here to find out more. |
|
Information: QA ran without warnings. Pipeline 19753 |
| @@ -749,7 +750,7 @@ export_state_data_get!(rs_mqtt_get_state_data, MQTTState); | |||
| #[no_mangle] | |||
| pub unsafe extern "C" fn rs_mqtt_register_parser(cfg_max_msg_len: u32) { | |||
| let default_port = CString::new("[1883]").unwrap(); | |||
| let max_msg_len = &mut MAX_MSG_LEN; | |||
| let max_msg_len = addr_of_mut!(MAX_MSG_LEN); | |||
There was a problem hiding this comment.
this is the first time I see this in use for us, why do we need it? master also doesn't have it
There was a problem hiding this comment.
Could we just do:
diff --git a/rust/src/mqtt/mqtt.rs b/rust/src/mqtt/mqtt.rs
index 8260251218..35f3c6d459 100644
--- a/rust/src/mqtt/mqtt.rs
+++ b/rust/src/mqtt/mqtt.rs
@@ -749,8 +749,7 @@ export_state_data_get!(rs_mqtt_get_state_data, MQTTState);
#[no_mangle]
pub unsafe extern "C" fn rs_mqtt_register_parser(cfg_max_msg_len: u32) {
let default_port = CString::new("[1883]").unwrap();
- let max_msg_len = &mut MAX_MSG_LEN;
- *max_msg_len = cfg_max_msg_len;
+ MAX_MSG_LEN = cfg_max_msg_len;
let parser = RustParser {
name: PARSER_NAME.as_ptr() as *const std::os::raw::c_char,
default_port: default_port.as_ptr(),There was a problem hiding this comment.
This was "accidentally" fixed in master by f12e026
Thanks Jason, your fix is better than the one proposed by the compiler
|
Replaced by #10721 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Link to redmine ticket:
https://redmine.openinfosecfoundation.org/issues/6884
Describe changes: