@@ -238,7 +238,7 @@ impl Builder {
238
238
fmt
239
239
} else {
240
240
Box :: new ( move |buf, record| {
241
- let fmt = DefaultFormat {
241
+ let fmt = DefaultFormatWriter {
242
242
timestamp : built. format_timestamp ,
243
243
module_path : built. format_module_path ,
244
244
target : built. format_target ,
@@ -310,7 +310,7 @@ type StyledValue<T> = T;
310
310
/// The default format.
311
311
///
312
312
/// This format needs to work with any combination of crate features.
313
- struct DefaultFormat < ' a > {
313
+ struct DefaultFormatWriter < ' a > {
314
314
timestamp : Option < TimestampPrecision > ,
315
315
module_path : bool ,
316
316
target : bool ,
@@ -325,7 +325,7 @@ struct DefaultFormat<'a> {
325
325
kv_format : & ' a KvFormatFn ,
326
326
}
327
327
328
- impl DefaultFormat < ' _ > {
328
+ impl DefaultFormatWriter < ' _ > {
329
329
fn write ( mut self , record : & Record < ' _ > ) -> io:: Result < ( ) > {
330
330
self . write_timestamp ( ) ?;
331
331
self . write_level ( record) ?;
@@ -475,7 +475,7 @@ impl DefaultFormat<'_> {
475
475
// Create a wrapper around the buffer only if we have to actually indent the message
476
476
477
477
struct IndentWrapper < ' a , ' b > {
478
- fmt : & ' a mut DefaultFormat < ' b > ,
478
+ fmt : & ' a mut DefaultFormatWriter < ' b > ,
479
479
indent_count : usize ,
480
480
}
481
481
@@ -531,7 +531,7 @@ mod tests {
531
531
532
532
use log:: { Level , Record } ;
533
533
534
- fn write_record ( record : Record < ' _ > , fmt : DefaultFormat < ' _ > ) -> String {
534
+ fn write_record ( record : Record < ' _ > , fmt : DefaultFormatWriter < ' _ > ) -> String {
535
535
let buf = fmt. buf . buf . clone ( ) ;
536
536
537
537
fmt. write ( & record) . expect ( "failed to write record" ) ;
@@ -540,7 +540,7 @@ mod tests {
540
540
String :: from_utf8 ( buf. as_bytes ( ) . to_vec ( ) ) . expect ( "failed to read record" )
541
541
}
542
542
543
- fn write_target ( target : & str , fmt : DefaultFormat < ' _ > ) -> String {
543
+ fn write_target ( target : & str , fmt : DefaultFormatWriter < ' _ > ) -> String {
544
544
write_record (
545
545
Record :: builder ( )
546
546
. args ( format_args ! ( "log\n message" ) )
@@ -554,7 +554,7 @@ mod tests {
554
554
)
555
555
}
556
556
557
- fn write ( fmt : DefaultFormat < ' _ > ) -> String {
557
+ fn write ( fmt : DefaultFormatWriter < ' _ > ) -> String {
558
558
write_target ( "" , fmt)
559
559
}
560
560
@@ -570,7 +570,7 @@ mod tests {
570
570
fn format_with_header ( ) {
571
571
let mut f = formatter ( ) ;
572
572
573
- let written = write ( DefaultFormat {
573
+ let written = write ( DefaultFormatWriter {
574
574
timestamp : None ,
575
575
module_path : true ,
576
576
target : false ,
@@ -592,7 +592,7 @@ mod tests {
592
592
fn format_no_header ( ) {
593
593
let mut f = formatter ( ) ;
594
594
595
- let written = write ( DefaultFormat {
595
+ let written = write ( DefaultFormatWriter {
596
596
timestamp : None ,
597
597
module_path : false ,
598
598
target : false ,
@@ -614,7 +614,7 @@ mod tests {
614
614
fn format_indent_spaces ( ) {
615
615
let mut f = formatter ( ) ;
616
616
617
- let written = write ( DefaultFormat {
617
+ let written = write ( DefaultFormatWriter {
618
618
timestamp : None ,
619
619
module_path : true ,
620
620
target : false ,
@@ -636,7 +636,7 @@ mod tests {
636
636
fn format_indent_zero_spaces ( ) {
637
637
let mut f = formatter ( ) ;
638
638
639
- let written = write ( DefaultFormat {
639
+ let written = write ( DefaultFormatWriter {
640
640
timestamp : None ,
641
641
module_path : true ,
642
642
target : false ,
@@ -658,7 +658,7 @@ mod tests {
658
658
fn format_indent_spaces_no_header ( ) {
659
659
let mut f = formatter ( ) ;
660
660
661
- let written = write ( DefaultFormat {
661
+ let written = write ( DefaultFormatWriter {
662
662
timestamp : None ,
663
663
module_path : false ,
664
664
target : false ,
@@ -680,7 +680,7 @@ mod tests {
680
680
fn format_suffix ( ) {
681
681
let mut f = formatter ( ) ;
682
682
683
- let written = write ( DefaultFormat {
683
+ let written = write ( DefaultFormatWriter {
684
684
timestamp : None ,
685
685
module_path : false ,
686
686
target : false ,
@@ -702,7 +702,7 @@ mod tests {
702
702
fn format_suffix_with_indent ( ) {
703
703
let mut f = formatter ( ) ;
704
704
705
- let written = write ( DefaultFormat {
705
+ let written = write ( DefaultFormatWriter {
706
706
timestamp : None ,
707
707
module_path : false ,
708
708
target : false ,
@@ -726,7 +726,7 @@ mod tests {
726
726
727
727
let written = write_target (
728
728
"target" ,
729
- DefaultFormat {
729
+ DefaultFormatWriter {
730
730
timestamp : None ,
731
731
module_path : true ,
732
732
target : true ,
@@ -749,7 +749,7 @@ mod tests {
749
749
fn format_empty_target ( ) {
750
750
let mut f = formatter ( ) ;
751
751
752
- let written = write ( DefaultFormat {
752
+ let written = write ( DefaultFormatWriter {
753
753
timestamp : None ,
754
754
module_path : true ,
755
755
target : true ,
@@ -773,7 +773,7 @@ mod tests {
773
773
774
774
let written = write_target (
775
775
"target" ,
776
- DefaultFormat {
776
+ DefaultFormatWriter {
777
777
timestamp : None ,
778
778
module_path : true ,
779
779
target : false ,
@@ -796,7 +796,7 @@ mod tests {
796
796
fn format_with_source_file_and_line_number ( ) {
797
797
let mut f = formatter ( ) ;
798
798
799
- let written = write ( DefaultFormat {
799
+ let written = write ( DefaultFormatWriter {
800
800
timestamp : None ,
801
801
module_path : false ,
802
802
target : false ,
@@ -828,7 +828,7 @@ mod tests {
828
828
829
829
let written = write_record (
830
830
record,
831
- DefaultFormat {
831
+ DefaultFormatWriter {
832
832
timestamp : None ,
833
833
module_path : false ,
834
834
target : false ,
@@ -863,7 +863,7 @@ mod tests {
863
863
864
864
let written = write_record (
865
865
record,
866
- DefaultFormat {
866
+ DefaultFormatWriter {
867
867
timestamp : None ,
868
868
module_path : true ,
869
869
target : true ,
0 commit comments