Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 21:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename config::get_field to config::get_field_json

Browse source
This commit is contained in:
Ali Bektas 2024-07-21 22:50:49 +02:00
parent cf156a7a43
commit d4214ec502
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

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