Skip to content

Commit cca54b5

Browse files
committed
cleanup .clone() now that Level is Copy
Ideally, this would make `Metadata::Level` return `Level` instead of `&Level`. However that's a breaking change, so I didn't make it here.
1 parent b745d09 commit cca54b5

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

tracing-core/src/metadata.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -864,7 +864,7 @@ mod tests {
864864
// actual repr matches what we expect it to be --- we're testing
865865
// that *other* unsafe code is sound using the transmuted value.
866866
// We're not going to do anything with it that might be unsound.
867-
mem::transmute::<_, usize>(filter.clone())
867+
mem::transmute::<_, usize>(filter)
868868
};
869869
assert_eq!(expected, repr, "repr changed for {:?}", filter)
870870
}

tracing-log/src/lib.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,8 @@ lazy_static! {
310310
static ref ERROR_FIELDS: Fields = Fields::new(ERROR_CS);
311311
}
312312

313-
fn level_to_cs(level: &Level) -> (&'static dyn Callsite, &'static Fields) {
314-
match *level {
313+
fn level_to_cs(level: Level) -> (&'static dyn Callsite, &'static Fields) {
314+
match level {
315315
Level::TRACE => (TRACE_CS, &*TRACE_FIELDS),
316316
Level::DEBUG => (DEBUG_CS, &*DEBUG_FIELDS),
317317
Level::INFO => (INFO_CS, &*INFO_FIELDS),
@@ -415,13 +415,13 @@ impl<'a> NormalizeEvent<'a> for Event<'a> {
415415
fn normalized_metadata(&'a self) -> Option<Metadata<'a>> {
416416
let original = self.metadata();
417417
if self.is_log() {
418-
let mut fields = LogVisitor::new_for(self, level_to_cs(original.level()).1);
418+
let mut fields = LogVisitor::new_for(self, level_to_cs(*original.level()).1);
419419
self.record(&mut fields);
420420

421421
Some(Metadata::new(
422422
"log event",
423423
fields.target.unwrap_or("log"),
424-
original.level().clone(),
424+
*original.level(),
425425
fields.file,
426426
fields.line.map(|l| l as u32),
427427
fields.module_path,
@@ -434,7 +434,7 @@ impl<'a> NormalizeEvent<'a> for Event<'a> {
434434
}
435435

436436
fn is_log(&self) -> bool {
437-
self.metadata().callsite() == identify_callsite!(level_to_cs(self.metadata().level()).0)
437+
self.metadata().callsite() == identify_callsite!(level_to_cs(*self.metadata().level()).0)
438438
}
439439
}
440440

tracing-subscriber/src/filter/env/directive.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ impl Directive {
8585
Some(StaticDirective {
8686
target: self.target.clone(),
8787
field_names,
88-
level: self.level.clone(),
88+
level: self.level,
8989
})
9090
}
9191

@@ -119,7 +119,7 @@ impl Directive {
119119
.ok()?;
120120
Some(field::CallsiteMatch {
121121
fields,
122-
level: self.level.clone(),
122+
level: self.level,
123123
})
124124
}
125125

@@ -417,9 +417,9 @@ impl<T: Match + Ord> DirectiveSet<T> {
417417
pub(crate) fn add(&mut self, directive: T) {
418418
// does this directive enable a more verbose level than the current
419419
// max? if so, update the max level.
420-
let level = directive.level();
421-
if *level > self.max_level {
422-
self.max_level = level.clone();
420+
let level = *directive.level();
421+
if level > self.max_level {
422+
self.max_level = level;
423423
}
424424
// insert the directive into the vec of directives, ordered by
425425
// specificity (length of target + number of field filters). this
@@ -460,8 +460,8 @@ impl Dynamics {
460460
return Some(f);
461461
}
462462
match base_level {
463-
Some(ref b) if d.level > *b => base_level = Some(d.level.clone()),
464-
None => base_level = Some(d.level.clone()),
463+
Some(ref b) if d.level > *b => base_level = Some(d.level),
464+
None => base_level = Some(d.level),
465465
_ => {}
466466
}
467467
None
@@ -690,7 +690,7 @@ impl CallsiteMatcher {
690690
.collect();
691691
SpanMatcher {
692692
field_matches,
693-
base_level: self.base_level.clone(),
693+
base_level: self.base_level,
694694
}
695695
}
696696
}
@@ -702,7 +702,7 @@ impl SpanMatcher {
702702
.iter()
703703
.filter_map(field::SpanMatch::filter)
704704
.max()
705-
.unwrap_or_else(|| self.base_level.clone())
705+
.unwrap_or(self.base_level)
706706
}
707707

708708
pub(crate) fn record_update(&self, record: &span::Record<'_>) {

tracing-subscriber/src/filter/env/field.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ impl CallsiteMatch {
229229
.collect();
230230
SpanMatch {
231231
fields,
232-
level: self.level.clone(),
232+
level: self.level,
233233
has_matched: AtomicBool::new(false),
234234
}
235235
}
@@ -263,7 +263,7 @@ impl SpanMatch {
263263
#[inline]
264264
pub(crate) fn filter(&self) -> Option<LevelFilter> {
265265
if self.is_matched() {
266-
Some(self.level.clone())
266+
Some(self.level)
267267
} else {
268268
None
269269
}

0 commit comments

Comments
 (0)