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

Auto merge of #17658 - alibektas:rename_get_field, r=Veykril

Browse Source 
minor: Rename `config::get_field` to `config::get_field_json`
This commit is contained in:
bors 2024-07-22 06:24:53 +00:00
commit 6512e29a80
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -857,7 +857,7 @@ impl Config {
tracing::info!("updating config from JSON: {:#}", json); tracing::info!("updating config from JSON: {:#}", json);
if !(json.is_null() || json.as_object().map_or(false, |it| it.is_empty())) { if !(json.is_null() || json.as_object().map_or(false, |it| it.is_empty())) {
let mut json_errors = vec![]; let mut json_errors = vec![];
let detached_files = get_field::<Vec<Utf8PathBuf>>( let detached_files = get_field_json::<Vec<Utf8PathBuf>>(
&mut json, &mut json,
&mut json_errors, &mut json_errors,
"detachedFiles", "detachedFiles",
@ -2660,7 +2660,7 @@ macro_rules! _config_data {
fn from_json(json: &mut serde_json::Value, error_sink: &mut Vec<(String, serde_json::Error)>) -> Self { fn from_json(json: &mut serde_json::Value, error_sink: &mut Vec<(String, serde_json::Error)>) -> Self {
Self {$( Self {$(
$field: get_field( $field: get_field_json(
json, json,
error_sink, error_sink,
stringify!($field), stringify!($field),
@ -2778,7 +2778,7 @@ impl GlobalLocalConfigInput {
} }
} }
fn get_field<T: DeserializeOwned>( fn get_field_json<T: DeserializeOwned>(
json: &mut serde_json::Value, json: &mut serde_json::Value,
error_sink: &mut Vec<(String, serde_json::Error)>, error_sink: &mut Vec<(String, serde_json::Error)>,
field: &'static str, field: &'static str,