Skip to content

Commit a30e807

Browse files
committed
chore: address lints
1 parent 75a7351 commit a30e807

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

examples/tracing-grpc/src/client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fn init_tracer() -> sdktrace::TracerProvider {
2222

2323
struct MetadataMap<'a>(&'a mut tonic::metadata::MetadataMap);
2424

25-
impl<'a> Injector for MetadataMap<'a> {
25+
impl Injector for MetadataMap<'_> {
2626
/// Set a key and value in the MetadataMap. Does nothing if the key or value are not valid inputs
2727
fn set(&mut self, key: &str, value: String) {
2828
if let Ok(key) = tonic::metadata::MetadataKey::from_bytes(key.as_bytes()) {

examples/tracing-grpc/src/server.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pub mod hello_world {
2929

3030
struct MetadataMap<'a>(&'a tonic::metadata::MetadataMap);
3131

32-
impl<'a> Extractor for MetadataMap<'a> {
32+
impl Extractor for MetadataMap<'_> {
3333
/// Get a value for a key from the MetadataMap. If the value can't be converted to &str, returns None
3434
fn get(&self, key: &str) -> Option<&str> {
3535
self.0.get(key).and_then(|metadata| metadata.to_str().ok())

opentelemetry-appender-log/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ mod any_value {
239239
pub(crate) fn serialize(value: log::kv::Value) -> Option<AnyValue> {
240240
struct ValueVisitor(Option<AnyValue>);
241241

242-
impl<'kvs> log::kv::VisitValue<'kvs> for ValueVisitor {
242+
impl log::kv::VisitValue<'_> for ValueVisitor {
243243
fn visit_any(&mut self, value: log::kv::Value) -> Result<(), log::kv::Error> {
244244
self.0 = Some(AnyValue::String(StringValue::from(value.to_string())));
245245

opentelemetry-otlp/tests/integration_test/src/logs_asserter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
use anyhow::Result;
12
use opentelemetry_proto::tonic::logs::v1::{LogRecord, LogsData, ResourceLogs};
23
use std::fs::File;
3-
use anyhow::Result;
44

55
// Given two ResourceLogs, assert that they are equal except for the timestamps
66
pub struct LogsAsserter {

opentelemetry-otlp/tests/integration_test/tests/logs.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,25 @@ fn init_logs() -> Result<sdklogs::LoggerProvider> {
3838
mod logtests {
3939
use super::*;
4040
use integration_test_runner::logs_asserter::{read_logs_from_json, LogsAsserter};
41+
use opentelemetry_appender_tracing::layer::OpenTelemetryTracingBridge;
4142
use std::{fs::File, time::Duration};
4243
use tracing::info;
4344
use tracing_subscriber::layer::SubscriberExt;
44-
use opentelemetry_appender_tracing::layer::OpenTelemetryTracingBridge;
4545

4646
#[test]
4747
#[should_panic(expected = "assertion `left == right` failed: body does not match")]
4848
pub fn test_assert_logs_eq_failure() {
49-
let left = read_logs_from_json(File::open("./expected/logs.json")
50-
.expect("failed to open expected file"))
51-
.expect("Failed to read logs from expected file");
49+
let left = read_logs_from_json(
50+
File::open("./expected/logs.json").expect("failed to open expected file"),
51+
)
52+
.expect("Failed to read logs from expected file");
5253

53-
let right = read_logs_from_json(File::open("./expected/failed_logs.json")
54-
.expect("failed to open expected failed log file"))
55-
.expect("Failed to read logs from expected failed log file");
54+
let right = read_logs_from_json(
55+
File::open("./expected/failed_logs.json")
56+
.expect("failed to open expected failed log file"),
57+
)
58+
.expect("Failed to read logs from expected failed log file");
5659
LogsAsserter::new(right, left).assert();
57-
5860
}
5961

6062
#[test]
@@ -99,14 +101,13 @@ mod logtests {
99101

100102
#[test]
101103
#[cfg(any(feature = "tonic-client", feature = "reqwest-blocking-client"))]
102-
pub fn logs_batch_non_tokio_main() -> Result<()>{
103-
104+
pub fn logs_batch_non_tokio_main() -> Result<()> {
104105
// Initialize the logger provider inside a tokio runtime
105106
// as this allows tonic client to capture the runtime,
106107
// but actual export occurs from the dedicated std::thread
107108
// created by BatchLogProcessor.
108109
let rt = tokio::runtime::Runtime::new()?;
109-
let logger_provider = rt.block_on(async {
110+
let logger_provider = rt.block_on(async {
110111
// While we're here setup our collector container too, as this needs tokio to run
111112
test_utils::start_collector_container().await?;
112113
init_logs()
@@ -125,7 +126,6 @@ mod logtests {
125126

126127
Ok(())
127128
}
128-
129129
}
130130

131131
pub fn assert_logs_results(result: &str, expected: &str) -> Result<()> {

stress/src/throughput.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ struct UnsafeSlice<'a> {
140140
slice: &'a [UnsafeCell<WorkerStats>],
141141
}
142142

143-
unsafe impl<'a> Send for UnsafeSlice<'a> {}
144-
unsafe impl<'a> Sync for UnsafeSlice<'a> {}
143+
unsafe impl Send for UnsafeSlice<'_> {}
144+
unsafe impl Sync for UnsafeSlice<'_> {}
145145

146146
impl<'a> UnsafeSlice<'a> {
147147
fn new(slice: &'a mut [WorkerStats]) -> Self {
@@ -155,7 +155,7 @@ impl<'a> UnsafeSlice<'a> {
155155
#[inline(always)]
156156
unsafe fn increment(&self, i: usize) {
157157
let value = self.slice[i].get();
158-
(*value).count = (*value).count + 1;
158+
(*value).count += 1;
159159
}
160160

161161
#[inline(always)]

0 commit comments

Comments
 (0)