msrv patch for tokio-stream, and other lint changes (#2086)

open-telemetry · Sep 9, 2024 · 6c4f50e · 6c4f50e
1 parent a50e3ff
commit 6c4f50e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/examples/self-diagnostics/src/main.rs b/examples/self-diagnostics/src/main.rs
@@ -12,7 +12,6 @@ use once_cell::sync::Lazy;
 use std::collections::HashSet;
 use std::sync::{Arc, Mutex};
 
-use ctrlc;
 use std::sync::mpsc::channel;
 
 struct ErrorState {

diff --git a/opentelemetry-sdk/src/metrics/view.rs b/opentelemetry-sdk/src/metrics/view.rs
@@ -107,7 +107,7 @@ pub fn new_view(criteria: Instrument, mask: Stream) -> Result<Box<dyn View>> {
         )));
         return Ok(Box::new(empty_view));
     }
-    let contains_wildcard = criteria.name.contains(|c| c == '*' || c == '?');
+    let contains_wildcard = criteria.name.contains(['*', '?']);
     let err_msg_criteria = criteria.clone();
 
     let match_fn: Box<dyn Fn(&Instrument) -> bool + Send + Sync> = if contains_wildcard {

diff --git a/opentelemetry-zipkin/src/exporter/model/mod.rs b/opentelemetry-zipkin/src/exporter/model/mod.rs
@@ -37,11 +37,10 @@ pub(crate) fn into_zipkin_span(local_endpoint: Endpoint, span_data: SpanData) ->
         span_data
             .attributes
             .into_iter()
-            .map(|kv| {
+            .inspect(|kv| {
                 if kv.key == Key::new("span.kind") {
                     user_defined_span_kind = true;
                 }
-                kv
             })
             .chain(
                 [

diff --git a/scripts/patch_dependencies.sh b/scripts/patch_dependencies.sh
@@ -10,3 +10,5 @@ patch_version cc 1.0.105
 patch_version url 2.5.0
 patch_version hyper-rustls 0.27.2 # 0.27.3 needs rustc v1.70.0
 patch_version tokio-util 0.7.11 # 0.7.12 needs rustc v1.70.0
+patch_version tokio-stream 0.1.15 # 0.1.16 needs rustc v1.70.0
+
diff --git a/stress/src/throughput.rs b/stress/src/throughput.rs
@@ -36,7 +36,7 @@ where
     if let Some(arg_str) = args_iter.nth(1) {
         let arg = arg_str.parse::<usize>();
 
-        if !arg.is_ok() {
+        if arg.is_err() {
             eprintln!("Invalid command line argument '{}' as number of threads. Make sure the value is a positive integer.", arg_str);
             std::process::exit(1);
         }
@@ -50,7 +50,7 @@ where
                     arg_num, num_threads
                 );
             }
-            num_threads = arg_num as usize;
+            num_threads = arg_num;
         } else {
             eprintln!("Invalid command line argument {} as number of threads. Make sure the value is above 0 and less than or equal to number of available logical cores ({}).", arg_num, num_threads);
             std::process::exit(1);