Skip to content

Commit 3a5e7d9

Browse files
committed
Rename config::get_field to config::get_field_json
1 parent 216bef3 commit 3a5e7d9

File tree

1 file changed

+3
-3
lines changed
  • src/tools/rust-analyzer/crates/rust-analyzer/src

1 file changed

+3
-3
lines changed

src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@ impl Config {
761761
tracing::info!("updating config from JSON: {:#}", json);
762762
if !(json.is_null() || json.as_object().map_or(false, |it| it.is_empty())) {
763763
let mut json_errors = vec![];
764-
let detached_files = get_field::<Vec<Utf8PathBuf>>(
764+
let detached_files = get_field_json::<Vec<Utf8PathBuf>>(
765765
&mut json,
766766
&mut json_errors,
767767
"detachedFiles",
@@ -2485,7 +2485,7 @@ macro_rules! _config_data {
24852485

24862486
fn from_json(json: &mut serde_json::Value, error_sink: &mut Vec<(String, serde_json::Error)>) -> Self {
24872487
Self {$(
2488-
$field: get_field(
2488+
$field: get_field_json(
24892489
json,
24902490
error_sink,
24912491
stringify!($field),
@@ -2603,7 +2603,7 @@ impl GlobalLocalConfigInput {
26032603
}
26042604
}
26052605

2606-
fn get_field<T: DeserializeOwned>(
2606+
fn get_field_json<T: DeserializeOwned>(
26072607
json: &mut serde_json::Value,
26082608
error_sink: &mut Vec<(String, serde_json::Error)>,
26092609
field: &'static str,

0 commit comments

Comments
 (0)