Skip to content

Commit 81f231c

Browse files
Folydkaffarell
authored andcommitted
subscriber: use struct update syntax when constructing from self (tokio-rs#1289)
This backports tokio-rs#1289 from `master`. This PR aims to remove a lot of initializer boilerplate code by adopting the`struct update syntax. If the [RFC 2528] gets merged and implemented, we can remove more. 😸 [RFC 2528]: rust-lang/rfcs#2528
1 parent 0f2693b commit 81f231c

File tree

1 file changed

+9
-33
lines changed

1 file changed

+9
-33
lines changed

tracing-subscriber/src/fmt/fmt_layer.rs

Lines changed: 9 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -279,11 +279,8 @@ where
279279
/// [time]: #method.without_time
280280
pub fn with_span_events(self, kind: FmtSpan) -> Self {
281281
Layer {
282-
fmt_event: self.fmt_event,
283-
fmt_fields: self.fmt_fields,
284282
fmt_span: self.fmt_span.with_kind(kind),
285-
make_writer: self.make_writer,
286-
_inner: self._inner,
283+
..self
287284
}
288285
}
289286

@@ -293,32 +290,23 @@ where
293290
pub fn with_ansi(self, ansi: bool) -> Layer<S, N, format::Format<L, T>, W> {
294291
Layer {
295292
fmt_event: self.fmt_event.with_ansi(ansi),
296-
fmt_fields: self.fmt_fields,
297-
fmt_span: self.fmt_span,
298-
make_writer: self.make_writer,
299-
_inner: self._inner,
293+
..self
300294
}
301295
}
302296

303297
/// Sets whether or not an event's target is displayed.
304298
pub fn with_target(self, display_target: bool) -> Layer<S, N, format::Format<L, T>, W> {
305299
Layer {
306300
fmt_event: self.fmt_event.with_target(display_target),
307-
fmt_fields: self.fmt_fields,
308-
fmt_span: self.fmt_span,
309-
make_writer: self.make_writer,
310-
_inner: self._inner,
301+
..self
311302
}
312303
}
313304

314305
/// Sets whether or not an event's level is displayed.
315306
pub fn with_level(self, display_level: bool) -> Layer<S, N, format::Format<L, T>, W> {
316307
Layer {
317308
fmt_event: self.fmt_event.with_level(display_level),
318-
fmt_fields: self.fmt_fields,
319-
fmt_span: self.fmt_span,
320-
make_writer: self.make_writer,
321-
_inner: self._inner,
309+
..self
322310
}
323311
}
324312

@@ -329,10 +317,7 @@ where
329317
pub fn with_thread_ids(self, display_thread_ids: bool) -> Layer<S, N, format::Format<L, T>, W> {
330318
Layer {
331319
fmt_event: self.fmt_event.with_thread_ids(display_thread_ids),
332-
fmt_fields: self.fmt_fields,
333-
fmt_span: self.fmt_span,
334-
make_writer: self.make_writer,
335-
_inner: self._inner,
320+
..self
336321
}
337322
}
338323

@@ -346,10 +331,7 @@ where
346331
) -> Layer<S, N, format::Format<L, T>, W> {
347332
Layer {
348333
fmt_event: self.fmt_event.with_thread_names(display_thread_names),
349-
fmt_fields: self.fmt_fields,
350-
fmt_span: self.fmt_span,
351-
make_writer: self.make_writer,
352-
_inner: self._inner,
334+
..self
353335
}
354336
}
355337

@@ -422,9 +404,7 @@ impl<S, T, W> Layer<S, format::JsonFields, format::Format<format::Json, T>, W> {
422404
Layer {
423405
fmt_event: self.fmt_event.flatten_event(flatten_event),
424406
fmt_fields: format::JsonFields::new(),
425-
fmt_span: self.fmt_span,
426-
make_writer: self.make_writer,
427-
_inner: self._inner,
407+
..self
428408
}
429409
}
430410

@@ -439,9 +419,7 @@ impl<S, T, W> Layer<S, format::JsonFields, format::Format<format::Json, T>, W> {
439419
Layer {
440420
fmt_event: self.fmt_event.with_current_span(display_current_span),
441421
fmt_fields: format::JsonFields::new(),
442-
fmt_span: self.fmt_span,
443-
make_writer: self.make_writer,
444-
_inner: self._inner,
422+
..self
445423
}
446424
}
447425

@@ -456,9 +434,7 @@ impl<S, T, W> Layer<S, format::JsonFields, format::Format<format::Json, T>, W> {
456434
Layer {
457435
fmt_event: self.fmt_event.with_span_list(display_span_list),
458436
fmt_fields: format::JsonFields::new(),
459-
fmt_span: self.fmt_span,
460-
make_writer: self.make_writer,
461-
_inner: self._inner,
437+
..self
462438
}
463439
}
464440
}

0 commit comments

Comments
 (0)