File tree Expand file tree Collapse file tree 1 file changed +3
-3
lines changed
src/tools/rust-analyzer/crates/rust-analyzer/src Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -761,7 +761,7 @@ impl Config {
761
761
tracing:: info!( "updating config from JSON: {:#}" , json) ;
762
762
if !( json. is_null ( ) || json. as_object ( ) . map_or ( false , |it| it. is_empty ( ) ) ) {
763
763
let mut json_errors = vec ! [ ] ;
764
- let detached_files = get_field :: < Vec < Utf8PathBuf > > (
764
+ let detached_files = get_field_json :: < Vec < Utf8PathBuf > > (
765
765
& mut json,
766
766
& mut json_errors,
767
767
"detachedFiles" ,
@@ -2485,7 +2485,7 @@ macro_rules! _config_data {
2485
2485
2486
2486
fn from_json( json: & mut serde_json:: Value , error_sink: & mut Vec <( String , serde_json:: Error ) >) -> Self {
2487
2487
Self { $(
2488
- $field: get_field (
2488
+ $field: get_field_json (
2489
2489
json,
2490
2490
error_sink,
2491
2491
stringify!( $field) ,
@@ -2603,7 +2603,7 @@ impl GlobalLocalConfigInput {
2603
2603
}
2604
2604
}
2605
2605
2606
- fn get_field < T : DeserializeOwned > (
2606
+ fn get_field_json < T : DeserializeOwned > (
2607
2607
json : & mut serde_json:: Value ,
2608
2608
error_sink : & mut Vec < ( String , serde_json:: Error ) > ,
2609
2609
field : & ' static str ,
You can’t perform that action at this time.
0 commit comments