revert: clippy and/or format changes that have nothing to do with the PR

Author: Aaalibaba42

datadog-sidecar-macros/src/lib.rs

@@ -3,9 +3,9 @@
 
 use proc_macro::TokenStream;
 use quote::{format_ident, quote};
+use syn::FnArg::Typed;
 use syn::__private::Span;
 use syn::parse::{Parse, ParseStream};
-use syn::FnArg::Typed;
 use syn::{parse_macro_input, parse_quote, Arm, Ident, ItemTrait, Pat, TraitItem};
 
 fn snake_to_camel(ident_str: &str) -> String {

libdd-common-ffi/src/vec.rs

@@ -181,7 +181,7 @@ mod tests {
         let vec = vec![0, 2, 4, 6];
         let ffi_vec: Vec<u8> = Vec::from(vec.clone());
 
-        for (a, b) in vec.iter().zip(&ffi_vec) {
+        for (a, b) in vec.iter().zip(ffi_vec.into_iter()) {
             assert_eq!(a, b)
         }
     }

libdd-trace-obfuscation/src/redis.rs

@@ -94,27 +94,29 @@ fn obfuscate_redis_cmd<'a>(str: &mut String, cmd: &'a str, mut args: Vec<&'a str
     let mut uppercase_cmd = [0; 32]; // no redis cmd is longer than 32 chars
     let uppercase_cmd = ascii_uppercase(cmd, &mut uppercase_cmd).unwrap_or(&[]);
     match uppercase_cmd {
-        b"AUTH" | b"MIGRATE" | b"HELLO"
+        b"AUTH" | b"MIGRATE" | b"HELLO" => {
             // Obfuscate everything after command:
             // • AUTH password
             // • MIGRATE host port key|"" destination-db timeout [COPY] [REPLACE] [AUTH password]
             //   [AUTH2 username password] [KEYS key [key ...]]
             // • HELLO [protover [AUTH username password] [SETNAME clientname]]
-            if !args.is_empty() => {
+            if !args.is_empty() {
                 args.clear();
                 args.push("?");
             }
-        b"ACL"
+        }
+        b"ACL" => {
             // Obfuscate all arguments after the subcommand:
             // • ACL SETUSER username on >password ~keys &channels +commands
             // • ACL GETUSER username
             // • ACL DELUSER username [username ...]
             // • ACL LIST
             // • ACL WHOAMI
-            if args.len() > 1 => {
+            if args.len() > 1 {
                 args[1] = "?";
                 args.drain(2..);
             }
+        }
         b"APPEND" | b"GETSET" | b"LPUSHX" | b"GEORADIUSBYMEMBER" | b"RPUSHX" | b"SET"
         | b"SETNX" | b"SISMEMBER" | b"ZRANK" | b"ZREVRANK" | b"ZSCORE" => {
             // Obfuscate 2nd argument:
@@ -153,7 +155,7 @@ fn obfuscate_redis_cmd<'a>(str: &mut String, cmd: &'a str, mut args: Vec<&'a str
             // • LINSERT key BEFORE|AFTER pivot value
             args = obfuscate_redis_args_n(args, 3);
         }
-        b"GEOHASH" | b"GEOPOS" | b"GEODIST" | b"LPUSH" | b"RPUSH" | b"SREM" | b"ZREM" | b"SADD"
+        b"GEOHASH" | b"GEOPOS" | b"GEODIST" | b"LPUSH" | b"RPUSH" | b"SREM" | b"ZREM" | b"SADD" => {
             // Obfuscate all arguments after the first one.
             // • GEOHASH key member [member ...]
             // • GEOPOS key member [member ...]
@@ -163,10 +165,11 @@ fn obfuscate_redis_cmd<'a>(str: &mut String, cmd: &'a str, mut args: Vec<&'a str
             // • SREM key member [member ...]
             // • ZREM key member [member ...]
             // • SADD key member [member ...]
-            if args.len() > 1 => {
+            if args.len() > 1 {
                 args[1] = "?";
                 args.drain(2..);
             }
+        }
         b"GEOADD" => {
             // Obfuscating every 3rd argument starting from first
             // • GEOADD key longitude latitude member [longitude latitude member ...]

libdd-trace-obfuscation/src/redis_tokenizer.rs

@@ -86,20 +86,30 @@ impl<'a> RedisTokenizer<'a> {
         loop {
             match self.curr_char() {
                 0 => break,
-                b'\\' if !escape => {
-                    escape = true;
-                    self.offset += 1;
-                    continue;
+                b'\\' => {
+                    if !escape {
+                        escape = true;
+                        self.offset += 1;
+                        continue;
+                    }
                 }
-                b'"' if !escape => quote = !quote,
-                b'\n' if !quote => {
-                    let span = (start, self.offset);
-                    self.offset += 1;
-                    self.state = RedisTokenType::RedisTokenCommand;
-                    return span;
+                b'"' => {
+                    if !escape {
+                        quote = !quote
+                    }
                 }
-                b' ' if !quote => {
-                    return (start, self.offset);
+                b'\n' => {
+                    if !quote {
+                        let span = (start, self.offset);
+                        self.offset += 1;
+                        self.state = RedisTokenType::RedisTokenCommand;
+                        return span;
+                    }
+                }
+                b' ' => {
+                    if !quote {
+                        return (start, self.offset);
+                    }
                 }
                 _ => {}
             }