@@ -228,7 +228,7 @@ pub(crate) type FormatFn = Box<dyn RecordFormat + Sync + Send>;
228
228
229
229
#[ derive( Default ) ]
230
230
pub ( crate ) struct Builder {
231
- pub ( crate ) default_format : DefaultFormat ,
231
+ pub ( crate ) default_format : ConfigurableFormat ,
232
232
pub ( crate ) custom_format : Option < FormatFn > ,
233
233
built : bool ,
234
234
}
@@ -290,7 +290,7 @@ type StyledValue<T> = T;
290
290
/// The default format.
291
291
///
292
292
/// This format needs to work with any combination of crate features.
293
- pub ( crate ) struct DefaultFormat {
293
+ pub ( crate ) struct ConfigurableFormat {
294
294
pub ( crate ) timestamp : Option < TimestampPrecision > ,
295
295
pub ( crate ) module_path : bool ,
296
296
pub ( crate ) target : bool ,
@@ -303,7 +303,7 @@ pub(crate) struct DefaultFormat {
303
303
pub ( crate ) kv_format : Option < Box < KvFormatFn > > ,
304
304
}
305
305
306
- impl DefaultFormat {
306
+ impl ConfigurableFormat {
307
307
/// Whether or not to write the level in the default format.
308
308
pub ( crate ) fn level ( & mut self , write : bool ) -> & mut Self {
309
309
self . level = write;
@@ -375,7 +375,7 @@ impl DefaultFormat {
375
375
}
376
376
}
377
377
378
- impl Default for DefaultFormat {
378
+ impl Default for ConfigurableFormat {
379
379
fn default ( ) -> Self {
380
380
Self {
381
381
timestamp : Some ( Default :: default ( ) ) ,
@@ -392,9 +392,9 @@ impl Default for DefaultFormat {
392
392
}
393
393
}
394
394
395
- impl RecordFormat for DefaultFormat {
395
+ impl RecordFormat for ConfigurableFormat {
396
396
fn format ( & self , formatter : & mut Formatter , record : & Record < ' _ > ) -> io:: Result < ( ) > {
397
- let fmt = DefaultFormatWriter {
397
+ let fmt = ConfigurableFormatWriter {
398
398
format : self ,
399
399
buf : formatter,
400
400
written_header_value : false ,
@@ -407,13 +407,13 @@ impl RecordFormat for DefaultFormat {
407
407
/// The default format.
408
408
///
409
409
/// This format needs to work with any combination of crate features.
410
- struct DefaultFormatWriter < ' a > {
411
- format : & ' a DefaultFormat ,
410
+ struct ConfigurableFormatWriter < ' a > {
411
+ format : & ' a ConfigurableFormat ,
412
412
buf : & ' a mut Formatter ,
413
413
written_header_value : bool ,
414
414
}
415
415
416
- impl DefaultFormatWriter < ' _ > {
416
+ impl ConfigurableFormatWriter < ' _ > {
417
417
fn write ( mut self , record : & Record < ' _ > ) -> io:: Result < ( ) > {
418
418
self . write_timestamp ( ) ?;
419
419
self . write_level ( record) ?;
@@ -567,7 +567,7 @@ impl DefaultFormatWriter<'_> {
567
567
// Create a wrapper around the buffer only if we have to actually indent the message
568
568
569
569
struct IndentWrapper < ' a , ' b > {
570
- fmt : & ' a mut DefaultFormatWriter < ' b > ,
570
+ fmt : & ' a mut ConfigurableFormatWriter < ' b > ,
571
571
indent_count : usize ,
572
572
}
573
573
@@ -627,7 +627,7 @@ mod tests {
627
627
628
628
use log:: { Level , Record } ;
629
629
630
- fn write_record ( record : Record < ' _ > , fmt : DefaultFormatWriter < ' _ > ) -> String {
630
+ fn write_record ( record : Record < ' _ > , fmt : ConfigurableFormatWriter < ' _ > ) -> String {
631
631
let buf = fmt. buf . buf . clone ( ) ;
632
632
633
633
fmt. write ( & record) . expect ( "failed to write record" ) ;
@@ -636,7 +636,7 @@ mod tests {
636
636
String :: from_utf8 ( buf. as_bytes ( ) . to_vec ( ) ) . expect ( "failed to read record" )
637
637
}
638
638
639
- fn write_target ( target : & str , fmt : DefaultFormatWriter < ' _ > ) -> String {
639
+ fn write_target ( target : & str , fmt : ConfigurableFormatWriter < ' _ > ) -> String {
640
640
write_record (
641
641
Record :: builder ( )
642
642
. args ( format_args ! ( "log\n message" ) )
@@ -650,7 +650,7 @@ mod tests {
650
650
)
651
651
}
652
652
653
- fn write ( fmt : DefaultFormatWriter < ' _ > ) -> String {
653
+ fn write ( fmt : ConfigurableFormatWriter < ' _ > ) -> String {
654
654
write_target ( "" , fmt)
655
655
}
656
656
@@ -666,7 +666,7 @@ mod tests {
666
666
fn format_with_header ( ) {
667
667
let mut f = formatter ( ) ;
668
668
669
- let written = write ( DefaultFormatWriter {
669
+ let written = write ( ConfigurableFormatWriter {
670
670
timestamp : None ,
671
671
module_path : true ,
672
672
target : false ,
@@ -688,7 +688,7 @@ mod tests {
688
688
fn format_no_header ( ) {
689
689
let mut f = formatter ( ) ;
690
690
691
- let written = write ( DefaultFormatWriter {
691
+ let written = write ( ConfigurableFormatWriter {
692
692
timestamp : None ,
693
693
module_path : false ,
694
694
target : false ,
@@ -710,7 +710,7 @@ mod tests {
710
710
fn format_indent_spaces ( ) {
711
711
let mut f = formatter ( ) ;
712
712
713
- let written = write ( DefaultFormatWriter {
713
+ let written = write ( ConfigurableFormatWriter {
714
714
timestamp : None ,
715
715
module_path : true ,
716
716
target : false ,
@@ -732,7 +732,7 @@ mod tests {
732
732
fn format_indent_zero_spaces ( ) {
733
733
let mut f = formatter ( ) ;
734
734
735
- let written = write ( DefaultFormatWriter {
735
+ let written = write ( ConfigurableFormatWriter {
736
736
timestamp : None ,
737
737
module_path : true ,
738
738
target : false ,
@@ -754,7 +754,7 @@ mod tests {
754
754
fn format_indent_spaces_no_header ( ) {
755
755
let mut f = formatter ( ) ;
756
756
757
- let written = write ( DefaultFormatWriter {
757
+ let written = write ( ConfigurableFormatWriter {
758
758
timestamp : None ,
759
759
module_path : false ,
760
760
target : false ,
@@ -776,7 +776,7 @@ mod tests {
776
776
fn format_suffix ( ) {
777
777
let mut f = formatter ( ) ;
778
778
779
- let written = write ( DefaultFormatWriter {
779
+ let written = write ( ConfigurableFormatWriter {
780
780
timestamp : None ,
781
781
module_path : false ,
782
782
target : false ,
@@ -798,7 +798,7 @@ mod tests {
798
798
fn format_suffix_with_indent ( ) {
799
799
let mut f = formatter ( ) ;
800
800
801
- let written = write ( DefaultFormatWriter {
801
+ let written = write ( ConfigurableFormatWriter {
802
802
timestamp : None ,
803
803
module_path : false ,
804
804
target : false ,
@@ -822,7 +822,7 @@ mod tests {
822
822
823
823
let written = write_target (
824
824
"target" ,
825
- DefaultFormatWriter {
825
+ ConfigurableFormatWriter {
826
826
timestamp : None ,
827
827
module_path : true ,
828
828
target : true ,
@@ -845,7 +845,7 @@ mod tests {
845
845
fn format_empty_target ( ) {
846
846
let mut f = formatter ( ) ;
847
847
848
- let written = write ( DefaultFormatWriter {
848
+ let written = write ( ConfigurableFormatWriter {
849
849
timestamp : None ,
850
850
module_path : true ,
851
851
target : true ,
@@ -869,7 +869,7 @@ mod tests {
869
869
870
870
let written = write_target (
871
871
"target" ,
872
- DefaultFormatWriter {
872
+ ConfigurableFormatWriter {
873
873
timestamp : None ,
874
874
module_path : true ,
875
875
target : false ,
@@ -892,7 +892,7 @@ mod tests {
892
892
fn format_with_source_file_and_line_number ( ) {
893
893
let mut f = formatter ( ) ;
894
894
895
- let written = write ( DefaultFormatWriter {
895
+ let written = write ( ConfigurableFormatWriter {
896
896
timestamp : None ,
897
897
module_path : false ,
898
898
target : false ,
@@ -924,7 +924,7 @@ mod tests {
924
924
925
925
let written = write_record (
926
926
record,
927
- DefaultFormatWriter {
927
+ ConfigurableFormatWriter {
928
928
timestamp : None ,
929
929
module_path : false ,
930
930
target : false ,
@@ -959,7 +959,7 @@ mod tests {
959
959
960
960
let written = write_record (
961
961
record,
962
- DefaultFormatWriter {
962
+ ConfigurableFormatWriter {
963
963
timestamp : None ,
964
964
module_path : true ,
965
965
target : true ,
0 commit comments