Skip to content

Commit 3ba6275

Browse files
authored
Merge branch 'tokio-rs:master' into master
2 parents 86bcfa7 + 68f830d commit 3ba6275

File tree

9 files changed

+13
-13
lines changed

9 files changed

+13
-13
lines changed

clippy.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
blacklisted-names = []
1+
disallowed-names = []
22
cognitive-complexity-threshold = 100
33
too-many-arguments-threshold = 8
44
type-complexity-threshold = 375

tracing-attributes/src/expand.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ fn gen_block<B: ToTokens>(
135135
.into_iter()
136136
.flat_map(|param| match param {
137137
FnArg::Typed(PatType { pat, ty, .. }) => {
138-
param_names(*pat, RecordType::parse_from_ty(&*ty))
138+
param_names(*pat, RecordType::parse_from_ty(&ty))
139139
}
140140
FnArg::Receiver(_) => Box::new(iter::once((
141141
Ident::new("self", param.span()),

tracing-core/src/dispatch.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ pub fn get_current<T>(f: impl FnOnce(&Dispatch) -> T) -> Option<T> {
475475
CURRENT_STATE
476476
.try_with(|state| {
477477
let entered = state.enter()?;
478-
Some(f(&*entered.current()))
478+
Some(f(&entered.current()))
479479
})
480480
.ok()?
481481
}

tracing-subscriber/benches/support/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ impl MultithreadedBench {
3535
thread::spawn(move || {
3636
let dispatch = this.dispatch.clone();
3737
tracing::dispatch::with_default(&dispatch, move || {
38-
f(&*this.start);
38+
f(&this.start);
3939
this.end.wait();
4040
})
4141
});

tracing-subscriber/src/fmt/format/json.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ mod test {
681681
);
682682

683683
let span = tracing::info_span!("the span", na = tracing::field::Empty);
684-
span.record("na", &"value");
684+
span.record("na", "value");
685685
let _enter = span.enter();
686686

687687
tracing::info!("an event inside the root span");

tracing-subscriber/src/registry/sharded.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ impl<'a> SpanData<'a> for Data<'a> {
418418
}
419419

420420
fn metadata(&self) -> &'static Metadata<'static> {
421-
(*self).inner.metadata
421+
self.inner.metadata
422422
}
423423

424424
fn parent(&self) -> Option<&Id> {
@@ -898,7 +898,7 @@ mod tests {
898898

899899
drop(span3);
900900

901-
state.assert_closed_in_order(&["child", "parent", "grandparent"]);
901+
state.assert_closed_in_order(["child", "parent", "grandparent"]);
902902
});
903903
}
904904
}

tracing-subscriber/tests/field_filter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ fn record_after_created() {
103103
tracing::debug!("i'm disabled!");
104104
});
105105

106-
span.record("enabled", &true);
106+
span.record("enabled", true);
107107
span.in_scope(|| {
108108
tracing::debug!("i'm enabled!");
109109
});

tracing/src/span.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1604,7 +1604,7 @@ mod test {
16041604

16051605
#[test]
16061606
fn test_record_backwards_compat() {
1607-
Span::current().record("some-key", &"some text");
1608-
Span::current().record("some-key", &false);
1607+
Span::current().record("some-key", "some text");
1608+
Span::current().record("some-key", false);
16091609
}
16101610
}

tracing/tests/span.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ fn record_new_value_for_field() {
563563

564564
with_default(collector, || {
565565
let span = tracing::span!(Level::TRACE, "foo", bar = 5, baz = false);
566-
span.record("baz", &true);
566+
span.record("baz", true);
567567
span.in_scope(|| {})
568568
});
569569

@@ -598,8 +598,8 @@ fn record_new_values_for_fields() {
598598

599599
with_default(collector, || {
600600
let span = tracing::span!(Level::TRACE, "foo", bar = 4, baz = false);
601-
span.record("bar", &5);
602-
span.record("baz", &true);
601+
span.record("bar", 5);
602+
span.record("baz", true);
603603
span.in_scope(|| {})
604604
});
605605

0 commit comments

Comments
 (0)