chore: Apply clippy lints from 1.59.0 (#11595)

Signed-off-by: Jesse Szwedko <[email protected]>

Author: jszwedko

lib/datadog/grok/src/matchers/date.rs

@@ -108,17 +108,12 @@ fn parse_tz_id_or_name(tz: &str) -> Result<FixedOffset, String> {
 }
 
 fn parse_offset(tz: &str) -> Result<FixedOffset, String> {
-    let offset_format;
     if tz.len() <= 3 {
         // +5, -12
         let hours_diff = tz.parse::<i32>().map_err(|e| e.to_string())?;
         return Ok(FixedOffset::east(hours_diff * 3600));
     }
-    if tz.contains(':') {
-        offset_format = "%:z";
-    } else {
-        offset_format = "%z";
-    }
+    let offset_format = if tz.contains(':') { "%:z" } else { "%z" };
     // apparently the easiest way to parse tz offset is parsing the complete datetime
     let date_str = format!("2020-04-12 22:10:57 {}", tz);
     let datetime =

lib/datadog/search-syntax/src/field.rs

@@ -59,7 +59,7 @@ pub fn normalize_fields<T: AsRef<str>>(value: T) -> Vec<Field> {
             .collect();
     }
 
-    let field = match value.replace("@", "custom.") {
+    let field = match value.replace('@', "custom.") {
         v if value.starts_with('@') => Field::Facet(v),
         v if DEFAULT_FIELDS.contains(&v.as_ref()) => Field::Default(v),
         v if RESERVED_ATTRIBUTES.contains(&v.as_ref()) => Field::Reserved(v),

lib/dnsmsg-parser/src/dns_message_parser.rs

@@ -1033,7 +1033,7 @@ fn parse_character_string(decoder: &mut BinDecoder<'_>) -> DnsParserResult<Strin
                 "Unexpected data length: expected {}, got {}. Raw data {}",
                 len,
                 raw_data.len(),
-                format_bytes_as_hex_string(&raw_data.to_vec())
+                format_bytes_as_hex_string(raw_data)
             ),
         }),
     }
@@ -1106,7 +1106,7 @@ fn parse_domain_name(decoder: &mut BinDecoder<'_>) -> DnsParserResult<Name> {
 }
 
 fn escape_string_for_text_representation(original_string: String) -> String {
-    original_string.replace("\\", "\\\\").replace("\"", "\\\"")
+    original_string.replace('\\', "\\\\").replace('\"', "\\\"")
 }
 
 fn parse_unknown_record_type(rtype: u16) -> Option<String> {

lib/file-source/src/fingerprinter.rs

@@ -455,12 +455,7 @@ mod test {
         let mut buf = Vec::new();
         let mut small_files = HashSet::new();
         assert!(fingerprinter
-            .get_fingerprint_or_log_error(
-                &target_dir.path().to_owned(),
-                &mut buf,
-                &mut small_files,
-                &NoErrors
-            )
+            .get_fingerprint_or_log_error(target_dir.path(), &mut buf, &mut small_files, &NoErrors)
             .is_none());
     }
 

lib/file-source/src/paths_provider/glob.rs

@@ -36,8 +36,7 @@ impl<E: FileSourceInternalEvents> Glob<E> {
 
         let exclude_patterns = exclude_patterns
             .iter()
-            .map(|path| path.to_str().map(|path| Pattern::new(path).ok()))
-            .flatten()
+            .filter_map(|path| path.to_str().map(|path| Pattern::new(path).ok()))
             .collect::<Option<Vec<_>>>()?;
 
         Some(Self {

lib/k8s-e2e-tests/src/lib.rs

@@ -45,7 +45,7 @@ pub fn get_override_name(namespace: &str, suffix: &str) -> String {
 
 /// Is the MULTINODE environment variable set?
 pub fn is_multinode() -> bool {
-    env::var("MULTINODE".to_string()).is_ok()
+    env::var("MULTINODE").is_ok()
 }
 
 /// Create config adding fullnameOverride entry. This allows multiple tests

lib/k8s-test-framework/src/kubernetes_version.rs

@@ -23,14 +23,14 @@ pub async fn get(kubectl_command: &str) -> Result<K8sVersion> {
     let json: serde_json::Value = serde_json::from_slice(&reader.stdout)?;
 
     Ok(K8sVersion {
-        major: json["serverVersion"]["major"].to_string().replace("\"", ""),
-        minor: json["serverVersion"]["minor"].to_string().replace("\"", ""),
+        major: json["serverVersion"]["major"].to_string().replace('\"', ""),
+        minor: json["serverVersion"]["minor"].to_string().replace('\"', ""),
         platform: json["serverVersion"]["platform"]
             .to_string()
-            .replace("\"", ""),
+            .replace('\"', ""),
         git_version: json["serverVersion"]["gitVersion"]
             .to_string()
-            .replace("\"", ""),
+            .replace('\"', ""),
     })
 }
 

lib/lookup/src/lookup_buf/segmentbuf.rs

@@ -64,7 +64,7 @@ impl Arbitrary for FieldBuf {
         let name = (0..len)
             .map(|_| chars[usize::arbitrary(g) % chars.len()])
             .collect::<String>()
-            .replace(r#"""#, r#"\""#);
+            .replace('"', r#"\""#);
         FieldBuf::from(name)
     }
 
@@ -74,7 +74,7 @@ impl Arbitrary for FieldBuf {
                 .shrink()
                 .filter(|name| !name.is_empty())
                 .map(|name| {
-                    let name = name.replace(r#"""#, r#"/""#);
+                    let name = name.replace('"', r#"/""#);
                     FieldBuf::from(name)
                 }),
         )

lib/value/src/value/api.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::use_self)] // I don't think Self can be used here, it creates a cycle
+
 use async_graphql::scalar;
 
 use crate::value::Value;

lib/value/src/value/display.rs

@@ -9,9 +9,9 @@ impl fmt::Display for Value {
                 f,
                 r#""{}""#,
                 String::from_utf8_lossy(val)
-                    .replace(r#"\"#, r#"\\"#)
-                    .replace(r#"""#, r#"\""#)
-                    .replace("\n", r#"\n"#)
+                    .replace('\\', r#"\\"#)
+                    .replace('"', r#"\""#)
+                    .replace('\n', r#"\n"#)
             ),
             Value::Integer(val) => write!(f, "{}", val),
             Value::Float(val) => write!(f, "{}", val),

lib/value/src/value/path.rs

@@ -7,6 +7,7 @@ impl Value {
     ///
     /// For example, given the path `.foo.bar` and value `true`, the return
     /// value would be an object representing `{ "foo": { "bar": true } }`.
+    #[must_use]
     pub fn at_path(mut self, path: &LookupBuf) -> Self {
         for segment in path.as_segments().iter().rev() {
             match segment {

lib/vector-buffers/src/config.rs

@@ -335,7 +335,7 @@ impl BufferConfig {
     {
         let mut builder = TopologyBuilder::default();
 
-        for stage in self.stages.iter().copied() {
+        for stage in &self.stages {
             stage.add_to_builder(&mut builder, data_dir.clone(), buffer_id.clone())?;
         }
 

lib/vector-core/src/config/id.rs

@@ -18,6 +18,7 @@ impl ComponentKey {
         &self.id
     }
 
+    #[must_use]
     pub fn join<D: fmt::Display>(&self, name: D) -> Self {
         Self {
             id: format!("{}.{}", self.id, name),

lib/vector-core/src/config/mod.rs

@@ -119,6 +119,7 @@ impl Output {
     }
 
     /// Set the schema definition for this output.
+    #[must_use]
     pub fn with_schema_definition(mut self, schema_definition: schema::Definition) -> Self {
         self.log_schema_definition = Some(schema_definition);
         self
@@ -141,6 +142,7 @@ pub struct AcknowledgementsConfig {
 }
 
 impl AcknowledgementsConfig {
+    #[must_use]
     pub fn merge_default(&self, other: &Self) -> Self {
         let enabled = self.enabled.or(other.enabled);
         Self { enabled }

lib/vector-core/src/config/proxy.rs

@@ -89,6 +89,7 @@ impl ProxyConfig {
     // overrides current proxy configuration with other configuration
     // if `self` is the global config and `other` the component config,
     // if both have the `http` proxy set, the one from `other` should be kept
+    #[must_use]
     pub fn merge(&self, other: &Self) -> Self {
         let no_proxy = if other.no_proxy.is_empty() {
             self.no_proxy.clone()
@@ -188,7 +189,7 @@ mod tests {
         let result = first.merge(&second).merge(&third);
         assert_eq!(result.http, Some("http://1.2.3.4:5678".into()));
         assert_eq!(result.https, Some("https://2.3.4.5:9876".into()));
-        assert!(result.no_proxy.matches(&"localhost".to_string()));
+        assert!(result.no_proxy.matches("localhost"));
     }
 
     #[test]
@@ -207,8 +208,8 @@ mod tests {
         let result = first.merge(&second);
         assert_eq!(result.http, Some("http://1.2.3.4:5678".into()));
         assert_eq!(result.https, Some("https://2.3.4.5:9876".into()));
-        assert!(!result.no_proxy.matches(&"127.0.0.1".to_string()));
-        assert!(result.no_proxy.matches(&"localhost".to_string()));
+        assert!(!result.no_proxy.matches("127.0.0.1"));
+        assert!(result.no_proxy.matches("localhost"));
     }
 
     #[test]

lib/vector-core/src/event/finalization.rs

@@ -309,6 +309,7 @@ impl EventStatus {
     /// Passing a new status of `Dropped` is a programming error and
     /// will panic in debug/test builds.
     #[allow(clippy::match_same_arms)] // False positive: https://github.com/rust-lang/rust-clippy/issues/860
+    #[must_use]
     pub fn update(self, status: Self) -> Self {
         match (self, status) {
             // `Recorded` always overwrites existing status and is never updated

lib/vector-core/src/event/log_event.rs

@@ -95,11 +95,13 @@ impl LogEvent {
         )
     }
 
+    #[must_use]
     pub fn with_batch_notifier(mut self, batch: &Arc<BatchNotifier>) -> Self {
         self.metadata = self.metadata.with_batch_notifier(batch);
         self
     }
 
+    #[must_use]
     pub fn with_batch_notifier_option(mut self, batch: &Option<Arc<BatchNotifier>>) -> Self {
         self.metadata = self.metadata.with_batch_notifier_option(batch);
         self

lib/vector-core/src/event/metadata.rs

@@ -77,17 +77,20 @@ impl ByteSizeOf for EventMetadata {
 
 impl EventMetadata {
     /// Replace the finalizers array with the given one.
+    #[must_use]
     pub fn with_finalizer(mut self, finalizer: EventFinalizer) -> Self {
         self.finalizers = EventFinalizers::new(finalizer);
         self
     }
 
     /// Replace the finalizer with a new one created from the given batch notifier.
+    #[must_use]
     pub fn with_batch_notifier(self, batch: &Arc<BatchNotifier>) -> Self {
         self.with_finalizer(EventFinalizer::new(Arc::clone(batch)))
     }
 
     /// Replace the finalizer with a new one created from the given optional batch notifier.
+    #[must_use]
     pub fn with_batch_notifier_option(self, batch: &Option<Arc<BatchNotifier>>) -> Self {
         match batch {
             Some(batch) => self.with_finalizer(EventFinalizer::new(Arc::clone(batch))),
@@ -96,6 +99,7 @@ impl EventMetadata {
     }
 
     /// Replace the schema definition with the given one.
+    #[must_use]
     pub fn with_schema_definition(mut self, schema_definition: &Arc<schema::Definition>) -> Self {
         self.schema_definition = Arc::clone(schema_definition);
         self

lib/vector-core/src/event/metric.rs

@@ -589,18 +589,21 @@ impl Metric {
     }
 
     #[inline]
+    #[must_use]
     pub fn with_name(mut self, name: impl Into<String>) -> Self {
         self.series.name.name = name.into();
         self
     }
 
     #[inline]
+    #[must_use]
     pub fn with_namespace<T: Into<String>>(mut self, namespace: Option<T>) -> Self {
         self.series.name.namespace = namespace.map(Into::into);
         self
     }
 
     #[inline]
+    #[must_use]
     pub fn with_timestamp(mut self, timestamp: Option<DateTime<Utc>>) -> Self {
         self.data.timestamp = timestamp;
         self
@@ -610,23 +613,27 @@ impl Metric {
         self.metadata.add_finalizer(finalizer);
     }
 
+    #[must_use]
     pub fn with_batch_notifier(mut self, batch: &Arc<BatchNotifier>) -> Self {
         self.metadata = self.metadata.with_batch_notifier(batch);
         self
     }
 
+    #[must_use]
     pub fn with_batch_notifier_option(mut self, batch: &Option<Arc<BatchNotifier>>) -> Self {
         self.metadata = self.metadata.with_batch_notifier_option(batch);
         self
     }
 
     #[inline]
+    #[must_use]
     pub fn with_tags(mut self, tags: Option<MetricTags>) -> Self {
         self.series.tags = tags;
         self
     }
 
     #[inline]
+    #[must_use]
     pub fn with_value(mut self, value: MetricValue) -> Self {
         self.data.value = value;
         self
@@ -647,6 +654,7 @@ impl Metric {
     }
 
     /// Rewrite this into a Metric with the data marked as absolute.
+    #[must_use]
     pub fn into_absolute(self) -> Self {
         Self {
             series: self.series,
@@ -656,6 +664,7 @@ impl Metric {
     }
 
     /// Rewrite this into a Metric with the data marked as incremental.
+    #[must_use]
     pub fn into_incremental(self) -> Self {
         Self {
             series: self.series,
@@ -840,6 +849,7 @@ impl MetricSeries {
 
 impl MetricData {
     /// Rewrite this data to mark it as absolute.
+    #[must_use]
     pub fn into_absolute(self) -> Self {
         Self {
             timestamp: self.timestamp,
@@ -849,6 +859,7 @@ impl MetricData {
     }
 
     /// Rewrite this data to mark it as incremental.
+    #[must_use]
     pub fn into_incremental(self) -> Self {
         Self {
             timestamp: self.timestamp,

lib/vector-core/src/event/mod.rs

@@ -256,6 +256,7 @@ impl Event {
         }
     }
 
+    #[must_use]
     pub fn with_batch_notifier(self, batch: &Arc<BatchNotifier>) -> Self {
         match self {
             Self::Log(log) => log.with_batch_notifier(batch).into(),
@@ -264,6 +265,7 @@ impl Event {
         }
     }
 
+    #[must_use]
     pub fn with_batch_notifier_option(self, batch: &Option<Arc<BatchNotifier>>) -> Self {
         match self {
             Self::Log(log) => log.with_batch_notifier_option(batch).into(),

lib/vector-core/src/event/proto.rs

@@ -383,7 +383,7 @@ impl From<sketch::AgentDdSketch> for MetricSketch {
             .map(|k| (k, k > 0))
             .map(|(k, pos)| {
                 k.try_into()
-                    .unwrap_or_else(|_| if pos { i16::MAX } else { i16::MIN })
+                    .unwrap_or(if pos { i16::MAX } else { i16::MIN })
             })
             .collect::<Vec<_>>();
         let counts = sketch

lib/vector-core/src/event/util/log/all_fields.rs

@@ -75,7 +75,7 @@ impl<'a> FieldsIter<'a> {
                 None => return res,
                 Some(PathComponent::Key(key)) => {
                     if key.contains('.') {
-                        res.push_str(&key.replace(".", "\\."));
+                        res.push_str(&key.replace('.', "\\."));
                     } else {
                         res.push_str(key);
                     }