@@ -28,58 +28,85 @@ mod private
2828 {
2929 if table_config. as_table
3030 {
31- display_table ( data, f, & table_config. filter_columns )
31+ display_table ( data, f, table_config )
3232 }
3333 else if table_config. as_records
3434 {
35- display_records ( data, f, & table_config. filter_columns )
35+ display_records ( data, f, table_config )
3636 }
3737 else if table_config. columns
3838 {
39- display_columns ( data, f, & table_config. filter_columns )
39+ display_columns ( data, f, table_config )
4040 }
4141 else
4242 {
43- display_table ( data, f, & table_config. filter_columns )
43+ display_table ( data, f, table_config )
4444 }
4545 }
4646
4747 fn display_table < ' a >
4848 (
4949 data : & ' a impl TableFormatter < ' a > ,
5050 f : & mut fmt:: Formatter < ' _ > ,
51- filter_columns : & ' a Vec < String > ,
51+ table_config : & ' a TableConfig ,
5252 ) -> fmt:: Result
5353 {
54- display_data ( data, f, filter_columns, output_format:: Table :: default ( ) )
54+ let mut format = output_format:: Table :: default ( ) ;
55+ format. max_width = table_config. max_table_width ;
56+
57+ display_data
58+ (
59+ data,
60+ f,
61+ format,
62+ & table_config. filter_columns ,
63+ )
5564 }
5665
5766 fn display_records < ' a >
5867 (
5968 data : & ' a impl TableFormatter < ' a > ,
6069 f : & mut fmt:: Formatter < ' _ > ,
61- filter_columns : & ' a Vec < String > ,
70+ table_config : & ' a TableConfig ,
6271 ) -> fmt:: Result
6372 {
64- display_data ( data, f, filter_columns, output_format:: Records :: default ( ) )
73+ let mut format = output_format:: Records :: default ( ) ;
74+ format. max_width = table_config. max_table_width ;
75+
76+ display_data
77+ (
78+ data,
79+ f,
80+ format,
81+ & table_config. filter_columns ,
82+ )
6583 }
6684
6785 fn display_columns < ' a >
6886 (
6987 data : & ' a impl TableFormatter < ' a > ,
7088 f : & mut fmt:: Formatter < ' _ > ,
71- filter_columns : & ' a Vec < String > ,
89+ table_config : & ' a TableConfig ,
7290 ) -> fmt:: Result
7391 {
74- display_data ( data, f, filter_columns, output_format:: Keys :: default ( ) )
92+ let mut format = output_format:: Records :: default ( ) ;
93+ format. max_width = table_config. max_table_width ;
94+
95+ display_data
96+ (
97+ data,
98+ f,
99+ format,
100+ & table_config. filter_columns ,
101+ )
75102 }
76103
77104 fn display_data < ' a >
78105 (
79106 data : & ' a impl TableFormatter < ' a > ,
80107 f : & mut fmt:: Formatter < ' _ > ,
81- filter_columns : & ' a Vec < String > ,
82108 format : impl TableOutputFormat ,
109+ filter_columns : & ' a Vec < String > ,
83110 ) -> fmt:: Result
84111 {
85112 let mut printer = print:: Printer :: with_format ( & format ) ;
0 commit comments