@@ -801,8 +801,7 @@ pub struct Config {
801
801
/// Since it is a `global` command at the moment, its final value can only be determined by
802
802
/// traversing through `global` configs and the `client` config. However the non-null value constraint
803
803
/// is config level agnostic, so this requires an independent error storage
804
- /// FIXME : bad name I know...
805
- other_errors : ConfigErrors ,
804
+ validation_errors : ConfigErrors ,
806
805
807
806
detached_files : Vec < AbsPathBuf > ,
808
807
}
@@ -833,7 +832,7 @@ impl Config {
833
832
/// The return tuple's bool component signals whether the `GlobalState` should call its `update_configuration()` method.
834
833
fn apply_change_with_sink ( & self , change : ConfigChange ) -> ( Config , bool ) {
835
834
let mut config = self . clone ( ) ;
836
- config. other_errors = ConfigErrors :: default ( ) ;
835
+ config. validation_errors = ConfigErrors :: default ( ) ;
837
836
838
837
let mut should_update = false ;
839
838
@@ -1013,7 +1012,7 @@ impl Config {
1013
1012
}
1014
1013
1015
1014
if config. check_command ( ) . is_empty ( ) {
1016
- config. other_errors . 0 . push ( Arc :: new ( ConfigErrorInner :: Json {
1015
+ config. validation_errors . 0 . push ( Arc :: new ( ConfigErrorInner :: Json {
1017
1016
config_key : "/check/command" . to_owned ( ) ,
1018
1017
error : serde_json:: Error :: custom ( "expected a non-empty string" ) ,
1019
1018
} ) ) ;
@@ -1036,7 +1035,7 @@ impl Config {
1036
1035
. chain ( config. root_ratoml . as_ref ( ) . into_iter ( ) . flat_map ( |it| it. 1 . 0 . iter ( ) ) )
1037
1036
. chain ( config. user_config . as_ref ( ) . into_iter ( ) . flat_map ( |it| it. 1 . 0 . iter ( ) ) )
1038
1037
. chain ( config. ratoml_files . values ( ) . flat_map ( |it| it. 1 . 0 . iter ( ) ) )
1039
- . chain ( config. other_errors . 0 . iter ( ) )
1038
+ . chain ( config. validation_errors . 0 . iter ( ) )
1040
1039
. cloned ( )
1041
1040
. collect ( ) ,
1042
1041
) ;
@@ -1363,7 +1362,7 @@ impl Config {
1363
1362
root_ratoml : None ,
1364
1363
root_ratoml_path,
1365
1364
detached_files : Default :: default ( ) ,
1366
- other_errors : Default :: default ( ) ,
1365
+ validation_errors : Default :: default ( ) ,
1367
1366
}
1368
1367
}
1369
1368
0 commit comments