cargo clippy --fix inside etw-reader

Author: mstange

etw-reader/src/etw_types.rs

@@ -22,7 +22,7 @@ impl Deref for EventRecord {
 
 impl EventRecord {
     pub(crate) fn user_buffer(&self) -> &[u8] {
-        if self.UserData == std::ptr::null_mut() {
+        if self.UserData.is_null() {
             return &[];
         }
         unsafe { std::slice::from_raw_parts(self.UserData as *mut _, self.UserDataLength.into()) }
@@ -71,21 +71,21 @@ pub const EVENT_HEADER_FLAG_32_BIT_HEADER: u16 = Etw::EVENT_HEADER_FLAG_32_BIT_H
 /// [DECODING_SOURCE]: https://microsoft.github.io/windows-docs-rs/doc/bindings/Windows/Win32/Etw/struct.DECODING_SOURCE.html
 #[derive(Debug)]
 pub enum DecodingSource {
-    DecodingSourceXMLFile,
-    DecodingSourceWbem,
-    DecodingSourceWPP,
-    DecodingSourceTlg,
-    DecodingSourceMax,
+    XMLFile,
+    Wbem,
+    Wpp,
+    Tlg,
+    Max,
 }
 
 impl From<Etw::DECODING_SOURCE> for DecodingSource {
     fn from(val: Etw::DECODING_SOURCE) -> Self {
         match val {
-            Etw::DecodingSourceXMLFile => DecodingSource::DecodingSourceXMLFile,
-            Etw::DecodingSourceWbem => DecodingSource::DecodingSourceWbem,
-            Etw::DecodingSourceWPP => DecodingSource::DecodingSourceWPP,
-            Etw::DecodingSourceTlg => DecodingSource::DecodingSourceTlg,
-            _ => DecodingSource::DecodingSourceMax,
+            Etw::DecodingSourceXMLFile => DecodingSource::XMLFile,
+            Etw::DecodingSourceWbem => DecodingSource::Wbem,
+            Etw::DecodingSourceWPP => DecodingSource::Wpp,
+            Etw::DecodingSourceTlg => DecodingSource::Tlg,
+            _ => DecodingSource::Max,
         }
     }
 }

etw-reader/src/parser.rs

@@ -179,9 +179,7 @@ impl<'a> Parser<'a> {
                 // as the size of AppName
 
                 // Fallback to Tdh
-                return Ok(
-                    tdh::property_size(self.event.record(), &property.name).unwrap() as usize,
-                );
+                Ok(tdh::property_size(self.event.record(), &property.name).unwrap() as usize)
             }
             PropertyLength::Length(length) => {
                 // TODO: Study heuristic method used in krabsetw :)
@@ -222,9 +220,7 @@ impl<'a> Parser<'a> {
                         }
                     }
                 }
-                return Ok(
-                    tdh::property_size(self.event.record(), &property.name).unwrap() as usize,
-                );
+                Ok(tdh::property_size(self.event.record(), &property.name).unwrap() as usize)
             }
         }
     }

etw-reader/src/schema.rs

@@ -466,12 +466,12 @@ impl<'a> TypedEvent<'a> {
     }
 }
 
-impl<'a> PartialEq for TypedEvent<'a> {
+impl PartialEq for TypedEvent<'_> {
     fn eq(&self, other: &Self) -> bool {
         self.schema.event_schema.event_id() == other.schema.event_schema.event_id()
             && self.schema.event_schema.provider_guid() == other.schema.event_schema.provider_guid()
             && self.schema.event_schema.event_version() == other.schema.event_schema.event_version()
     }
 }
 
-impl<'a> Eq for TypedEvent<'a> {}
+impl Eq for TypedEvent<'_> {}