itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename config::ConfigChange::other_errors to validation_errors

Browse Source
This commit is contained in:
Ali Bektas 2024-07-23 15:54:39 +02:00
parent db2ba64540
commit 784d46e814
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crates/rust-analyzer/src/config.rs
View File

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