@@ -943,56 +943,49 @@ fn print_dep_table_msg(shell: &mut Shell, dep: &DependencyUI) -> CargoResult<()>
943
943
if matches ! ( shell. verbosity( ) , crate :: core:: shell:: Verbosity :: Quiet ) {
944
944
return Ok ( ( ) ) ;
945
945
}
946
+
946
947
let ( activated, deactivated) = dep. features ( ) ;
947
948
if !activated. is_empty ( ) || !deactivated. is_empty ( ) {
948
949
let prefix = format ! ( "{:>13}" , " " ) ;
949
- let suffix = format_feature_version_suffix ( & dep) ;
950
-
951
- shell. write_stderr ( format_args ! ( "{}Features{}:\n " , prefix, suffix) , & style:: NOP ) ?;
950
+ let suffix = format_features_version_suffix ( & dep) ;
952
951
953
- const MAX_FEATURE_PRINTS : usize = 50 ;
952
+ shell . write_stderr ( format_args ! ( "{prefix}Features{suffix}: \n " ) , & style :: NOP ) ? ;
954
953
955
- let mut activated_printed = 0 ;
954
+ const MAX_FEATURE_PRINTS : usize = 30 ;
956
955
let total_activated = activated. len ( ) ;
957
- for feat in activated {
958
- if activated_printed >= MAX_FEATURE_PRINTS {
959
- let remaining = total_activated - activated_printed;
960
- shell. write_stderr (
961
- format_args ! ( "{prefix}... {remaining} more activated features\n " ) ,
962
- & style:: NOP ,
963
- ) ?;
964
- break ;
965
- }
956
+ let total_deactivated = deactivated. len ( ) ;
966
957
967
- shell. write_stderr ( & prefix, & style:: NOP ) ?;
968
- shell. write_stderr ( '+' , & style:: GOOD ) ?;
969
- shell. write_stderr ( format_args ! ( " {}\n " , feat) , & style:: NOP ) ?;
970
- activated_printed += 1 ;
958
+ if total_activated <= MAX_FEATURE_PRINTS {
959
+ for feat in activated {
960
+ shell. write_stderr ( & prefix, & style:: NOP ) ?;
961
+ shell. write_stderr ( '+' , & style:: GOOD ) ?;
962
+ shell. write_stderr ( format_args ! ( " {feat}\n " ) , & style:: NOP ) ?;
963
+ }
964
+ } else {
965
+ shell. write_stderr (
966
+ format_args ! ( "{prefix}{total_activated} activated features\n " ) ,
967
+ & style:: NOP ,
968
+ ) ?;
971
969
}
972
970
973
- let mut deactivated_printed = 0 ;
974
- let total_deactivated = deactivated. len ( ) ;
975
- for feat in deactivated {
976
- if activated_printed + deactivated_printed >= MAX_FEATURE_PRINTS {
977
- let remaining = total_deactivated - deactivated_printed;
978
- shell. write_stderr (
979
- format_args ! ( "{prefix}... {remaining} more deactivated features\n " ) ,
980
- & style:: NOP ,
981
- ) ?;
982
- break ;
971
+ if total_activated + total_deactivated <= MAX_FEATURE_PRINTS {
972
+ for feat in deactivated {
973
+ shell. write_stderr ( & prefix, & style:: NOP ) ?;
974
+ shell. write_stderr ( '-' , & style:: ERROR ) ?;
975
+ shell. write_stderr ( format_args ! ( " {feat}\n " ) , & style:: NOP ) ?;
983
976
}
984
-
985
- shell. write_stderr ( & prefix , & style :: NOP ) ? ;
986
- shell . write_stderr ( '-' , & style :: ERROR ) ? ;
987
- shell . write_stderr ( format_args ! ( " {} \n " , feat ) , & style:: NOP ) ? ;
988
- deactivated_printed += 1 ;
977
+ } else {
978
+ shell. write_stderr (
979
+ format_args ! ( "{prefix}{total_deactivated} deactivated features \n " ) ,
980
+ & style:: NOP ,
981
+ ) ? ;
989
982
}
990
983
}
991
984
992
985
Ok ( ( ) )
993
986
}
994
987
995
- fn format_feature_version_suffix ( dep : & DependencyUI ) -> String {
988
+ fn format_features_version_suffix ( dep : & DependencyUI ) -> String {
996
989
if let Some ( version) = & dep. available_version {
997
990
let mut version = version. clone ( ) ;
998
991
version. build = Default :: default ( ) ;
0 commit comments