Skip to content

Commit

Permalink
rust: remove unnecessary lifetimes
Browse files Browse the repository at this point in the history
Fix provided by cargo clippy --fix.
  • Loading branch information
jasonish authored and victorjulien committed Nov 29, 2024
1 parent 8e408d3 commit 7bdbe7e
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions rust/src/ldap/filters.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ pub enum Filter {
ExtensibleMatch(MatchingRuleAssertion),
}

impl<'a> From<ldap_parser::filter::Filter<'a>> for Filter {
impl From<ldap_parser::filter::Filter<'_>> for Filter {
fn from(f: ldap_parser::filter::Filter) -> Self {
match f {
ldap_parser::filter::Filter::And(val) => {
Expand Down Expand Up @@ -123,7 +123,7 @@ pub struct PartialAttribute {
pub attr_vals: Vec<AttributeValue>,
}

impl<'a> From<&ldap_parser::filter::PartialAttribute<'a>> for PartialAttribute {
impl From<&ldap_parser::filter::PartialAttribute<'_>> for PartialAttribute {
fn from(value: &ldap_parser::filter::PartialAttribute) -> Self {
let attr_type = LdapString(value.attr_type.0.to_string());
let attr_vals: Vec<AttributeValue> = value
Expand All @@ -145,7 +145,7 @@ pub struct Attribute {
pub attr_vals: Vec<AttributeValue>,
}

impl<'a> From<&ldap_parser::filter::Attribute<'a>> for Attribute {
impl From<&ldap_parser::filter::Attribute<'_>> for Attribute {
fn from(value: &ldap_parser::filter::Attribute) -> Self {
let attr_type = LdapString(value.attr_type.0.to_string());
let attr_vals: Vec<AttributeValue> = value
Expand All @@ -166,7 +166,7 @@ pub struct AttributeValueAssertion {
pub attribute_desc: LdapString,
pub assertion_value: Vec<u8>,
}
impl<'a> From<&ldap_parser::filter::AttributeValueAssertion<'a>> for AttributeValueAssertion {
impl From<&ldap_parser::filter::AttributeValueAssertion<'_>> for AttributeValueAssertion {
fn from(value: &ldap_parser::filter::AttributeValueAssertion) -> Self {
let attribute_desc = LdapString(value.attribute_desc.0.to_string());
let assertion_value = value.assertion_value.to_vec();
Expand Down Expand Up @@ -203,7 +203,7 @@ pub enum Substring {
Any(AssertionValue),
Final(AssertionValue),
}
impl<'a> From<ldap_parser::filter::Substring<'a>> for Substring {
impl From<ldap_parser::filter::Substring<'_>> for Substring {
fn from(value: ldap_parser::filter::Substring) -> Self {
match value {
ldap_parser::filter::Substring::Initial(val) => {
Expand Down
2 changes: 1 addition & 1 deletion rust/src/ldap/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ pub struct Control {
pub control_value: Option<Vec<u8>>,
}

impl<'a> From<ldap_parser::ldap::LdapMessage<'a>> for LdapMessage {
impl From<ldap_parser::ldap::LdapMessage<'_>> for LdapMessage {
fn from(ldap_msg: ldap_parser::ldap::LdapMessage) -> Self {
let message_id = MessageID(ldap_msg.message_id.0);
let protocol_op = match ldap_msg.protocol_op {
Expand Down
2 changes: 1 addition & 1 deletion rust/src/smb/nbss_records.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ pub struct NbssRecord<'a> {
pub data: &'a[u8],
}

impl<'a> NbssRecord<'a> {
impl NbssRecord<'_> {
pub fn is_valid(&self) -> bool {
let valid = match self.message_type {
NBSS_MSGTYPE_SESSION_MESSAGE |
Expand Down
2 changes: 1 addition & 1 deletion rust/src/smb/smb1_records.rs
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,7 @@ pub struct SmbRecord<'a> {
pub data: &'a[u8],
}

impl<'a> SmbRecord<'a> {
impl SmbRecord<'_> {
pub fn has_unicode_support(&self) -> bool {
self.flags2 & 0x8000_u16 != 0
}
Expand Down
2 changes: 1 addition & 1 deletion rust/src/smb/smb2_records.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ pub struct Smb2Record<'a> {
pub data: &'a [u8],
}

impl<'a> Smb2Record<'a> {
impl Smb2Record<'_> {
pub fn is_request(&self) -> bool {
self.direction == 0
}
Expand Down
2 changes: 1 addition & 1 deletion rust/src/snmp/snmp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ pub struct SNMPTransaction<'a> {
tx_data: applayer::AppLayerTxData,
}

impl<'a> Transaction for SNMPTransaction<'a> {
impl Transaction for SNMPTransaction<'_> {
fn id(&self) -> u64 {
self.id
}
Expand Down
2 changes: 1 addition & 1 deletion rust/src/ssh/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ pub struct SshPacketKeyExchange<'a> {

const SSH_HASSH_STRING_DELIMITER_SLICE: [u8; 1] = [b';'];

impl<'a> SshPacketKeyExchange<'a> {
impl SshPacketKeyExchange<'_> {
pub fn generate_hassh(
&self, hassh_string: &mut Vec<u8>, hassh: &mut Vec<u8>, to_server: &bool,
) {
Expand Down
2 changes: 1 addition & 1 deletion rust/src/x509/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ pub struct X509(X509Certificate<'static>);

pub struct SCGeneralName<'a>(&'a GeneralName<'a>);

impl<'a> fmt::Display for SCGeneralName<'a> {
impl fmt::Display for SCGeneralName<'_> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self.0 {
GeneralName::DNSName(s) => write!(f, "{}", s),
Expand Down

0 comments on commit 7bdbe7e

Please sign in to comment.