@@ -238,7 +238,7 @@ impl Builder {
238238 fmt
239239 } else {
240240 Box :: new ( move |buf, record| {
241- let fmt = DefaultFormat {
241+ let fmt = DefaultFormatWriter {
242242 timestamp : built. format_timestamp ,
243243 module_path : built. format_module_path ,
244244 target : built. format_target ,
@@ -310,7 +310,7 @@ type StyledValue<T> = T;
310310/// The default format.
311311///
312312/// This format needs to work with any combination of crate features.
313- struct DefaultFormat < ' a > {
313+ struct DefaultFormatWriter < ' a > {
314314 timestamp : Option < TimestampPrecision > ,
315315 module_path : bool ,
316316 target : bool ,
@@ -325,7 +325,7 @@ struct DefaultFormat<'a> {
325325 kv_format : & ' a KvFormatFn ,
326326}
327327
328- impl DefaultFormat < ' _ > {
328+ impl DefaultFormatWriter < ' _ > {
329329 fn write ( mut self , record : & Record < ' _ > ) -> io:: Result < ( ) > {
330330 self . write_timestamp ( ) ?;
331331 self . write_level ( record) ?;
@@ -475,7 +475,7 @@ impl DefaultFormat<'_> {
475475 // Create a wrapper around the buffer only if we have to actually indent the message
476476
477477 struct IndentWrapper < ' a , ' b > {
478- fmt : & ' a mut DefaultFormat < ' b > ,
478+ fmt : & ' a mut DefaultFormatWriter < ' b > ,
479479 indent_count : usize ,
480480 }
481481
@@ -531,7 +531,7 @@ mod tests {
531531
532532 use log:: { Level , Record } ;
533533
534- fn write_record ( record : Record < ' _ > , fmt : DefaultFormat < ' _ > ) -> String {
534+ fn write_record ( record : Record < ' _ > , fmt : DefaultFormatWriter < ' _ > ) -> String {
535535 let buf = fmt. buf . buf . clone ( ) ;
536536
537537 fmt. write ( & record) . expect ( "failed to write record" ) ;
@@ -540,7 +540,7 @@ mod tests {
540540 String :: from_utf8 ( buf. as_bytes ( ) . to_vec ( ) ) . expect ( "failed to read record" )
541541 }
542542
543- fn write_target ( target : & str , fmt : DefaultFormat < ' _ > ) -> String {
543+ fn write_target ( target : & str , fmt : DefaultFormatWriter < ' _ > ) -> String {
544544 write_record (
545545 Record :: builder ( )
546546 . args ( format_args ! ( "log\n message" ) )
@@ -554,7 +554,7 @@ mod tests {
554554 )
555555 }
556556
557- fn write ( fmt : DefaultFormat < ' _ > ) -> String {
557+ fn write ( fmt : DefaultFormatWriter < ' _ > ) -> String {
558558 write_target ( "" , fmt)
559559 }
560560
@@ -570,7 +570,7 @@ mod tests {
570570 fn format_with_header ( ) {
571571 let mut f = formatter ( ) ;
572572
573- let written = write ( DefaultFormat {
573+ let written = write ( DefaultFormatWriter {
574574 timestamp : None ,
575575 module_path : true ,
576576 target : false ,
@@ -592,7 +592,7 @@ mod tests {
592592 fn format_no_header ( ) {
593593 let mut f = formatter ( ) ;
594594
595- let written = write ( DefaultFormat {
595+ let written = write ( DefaultFormatWriter {
596596 timestamp : None ,
597597 module_path : false ,
598598 target : false ,
@@ -614,7 +614,7 @@ mod tests {
614614 fn format_indent_spaces ( ) {
615615 let mut f = formatter ( ) ;
616616
617- let written = write ( DefaultFormat {
617+ let written = write ( DefaultFormatWriter {
618618 timestamp : None ,
619619 module_path : true ,
620620 target : false ,
@@ -636,7 +636,7 @@ mod tests {
636636 fn format_indent_zero_spaces ( ) {
637637 let mut f = formatter ( ) ;
638638
639- let written = write ( DefaultFormat {
639+ let written = write ( DefaultFormatWriter {
640640 timestamp : None ,
641641 module_path : true ,
642642 target : false ,
@@ -658,7 +658,7 @@ mod tests {
658658 fn format_indent_spaces_no_header ( ) {
659659 let mut f = formatter ( ) ;
660660
661- let written = write ( DefaultFormat {
661+ let written = write ( DefaultFormatWriter {
662662 timestamp : None ,
663663 module_path : false ,
664664 target : false ,
@@ -680,7 +680,7 @@ mod tests {
680680 fn format_suffix ( ) {
681681 let mut f = formatter ( ) ;
682682
683- let written = write ( DefaultFormat {
683+ let written = write ( DefaultFormatWriter {
684684 timestamp : None ,
685685 module_path : false ,
686686 target : false ,
@@ -702,7 +702,7 @@ mod tests {
702702 fn format_suffix_with_indent ( ) {
703703 let mut f = formatter ( ) ;
704704
705- let written = write ( DefaultFormat {
705+ let written = write ( DefaultFormatWriter {
706706 timestamp : None ,
707707 module_path : false ,
708708 target : false ,
@@ -726,7 +726,7 @@ mod tests {
726726
727727 let written = write_target (
728728 "target" ,
729- DefaultFormat {
729+ DefaultFormatWriter {
730730 timestamp : None ,
731731 module_path : true ,
732732 target : true ,
@@ -749,7 +749,7 @@ mod tests {
749749 fn format_empty_target ( ) {
750750 let mut f = formatter ( ) ;
751751
752- let written = write ( DefaultFormat {
752+ let written = write ( DefaultFormatWriter {
753753 timestamp : None ,
754754 module_path : true ,
755755 target : true ,
@@ -773,7 +773,7 @@ mod tests {
773773
774774 let written = write_target (
775775 "target" ,
776- DefaultFormat {
776+ DefaultFormatWriter {
777777 timestamp : None ,
778778 module_path : true ,
779779 target : false ,
@@ -796,7 +796,7 @@ mod tests {
796796 fn format_with_source_file_and_line_number ( ) {
797797 let mut f = formatter ( ) ;
798798
799- let written = write ( DefaultFormat {
799+ let written = write ( DefaultFormatWriter {
800800 timestamp : None ,
801801 module_path : false ,
802802 target : false ,
@@ -828,7 +828,7 @@ mod tests {
828828
829829 let written = write_record (
830830 record,
831- DefaultFormat {
831+ DefaultFormatWriter {
832832 timestamp : None ,
833833 module_path : false ,
834834 target : false ,
@@ -863,7 +863,7 @@ mod tests {
863863
864864 let written = write_record (
865865 record,
866- DefaultFormat {
866+ DefaultFormatWriter {
867867 timestamp : None ,
868868 module_path : true ,
869869 target : true ,
0 commit comments