@@ -90,7 +90,7 @@ impl ConcurrentConfigTree {
90
90
self . rwlock . write ( ) . apply_changes ( changes, vfs, & mut errors) ;
91
91
errors
92
92
}
93
- pub fn read_config ( & self , file_id : FileId ) -> Result < Arc < LocalConfigData > , ConfigTreeError > {
93
+ pub fn local_config ( & self , file_id : FileId ) -> Result < Arc < LocalConfigData > , ConfigTreeError > {
94
94
let reader = self . rwlock . upgradable_read ( ) ;
95
95
if let Some ( computed) = reader. read_only ( file_id) ? {
96
96
return Ok ( computed) ;
@@ -480,7 +480,7 @@ mod tests {
480
480
481
481
dbg ! ( config_tree. apply_changes( changes, & vfs) ) ;
482
482
483
- let local = config_tree. read_config ( crate_a) . unwrap ( ) ;
483
+ let local = config_tree. local_config ( crate_a) . unwrap ( ) ;
484
484
// from root
485
485
assert_eq ! ( local. completion_autoself_enable, false ) ;
486
486
// from crate_a
@@ -518,11 +518,11 @@ mod tests {
518
518
dbg ! ( config_tree. apply_changes( changes, & vfs) ) ;
519
519
520
520
let prev = local;
521
- let local = config_tree. read_config ( crate_a) . unwrap ( ) ;
521
+ let local = config_tree. local_config ( crate_a) . unwrap ( ) ;
522
522
// Should have been recomputed
523
523
assert ! ( !Arc :: ptr_eq( & prev, & local) ) ;
524
524
// But without changes in between, should give the same Arc back
525
- assert ! ( Arc :: ptr_eq( & local, & config_tree. read_config ( crate_a) . unwrap( ) ) ) ;
525
+ assert ! ( Arc :: ptr_eq( & local, & config_tree. local_config ( crate_a) . unwrap( ) ) ) ;
526
526
527
527
// The newly added xdg_config_file_id should affect the output if nothing else touches
528
528
// this key
0 commit comments