Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-28 05:53:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove unnec copying of source_root_ids

Browse source
This commit is contained in:
Ali Bektas 2024-07-29 03:46:02 +02:00
parent f0d595dc77
commit 5ece296adf
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
crates/rust-analyzer/src/config.rs
View file

@ -2552,7 +2552,7 @@ macro_rules! _impl_for_config_data {
$($doc)* $($doc)*
#[allow(non_snake_case)] #[allow(non_snake_case)]
$vis fn $field(&self, source_root: Option<SourceRootId>) -> &$ty { $vis fn $field(&self, source_root: Option<SourceRootId>) -> &$ty {
let mut source_root = source_root; let mut source_root = source_root.as_ref();
while let Some(sr) = source_root { while let Some(sr) = source_root {
if let Some((file, _)) = self.ratoml_file.get(&sr) { if let Some((file, _)) = self.ratoml_file.get(&sr) {
match file { match file {
@ -2568,7 +2568,7 @@ macro_rules! _impl_for_config_data {
} }
} }
} }
source_root = self.source_root_parent_map.get(&sr).copied(); source_root = self.source_root_parent_map.get(&sr);
} }
if let Some(v) = self.client_config.0.local.$field.as_ref() { if let Some(v) = self.client_config.0.local.$field.as_ref() {
@ -2596,7 +2596,7 @@ macro_rules! _impl_for_config_data {
$($doc)* $($doc)*
#[allow(non_snake_case)] #[allow(non_snake_case)]
$vis fn $field(&self, source_root : Option<SourceRootId>) -> &$ty { $vis fn $field(&self, source_root : Option<SourceRootId>) -> &$ty {
let mut source_root = source_root; let mut source_root = source_root.as_ref();
while let Some(sr) = source_root { while let Some(sr) = source_root {
if let Some((file, _)) = self.ratoml_file.get(&sr) { if let Some((file, _)) = self.ratoml_file.get(&sr) {
match file { match file {
@ -2609,7 +2609,7 @@ macro_rules! _impl_for_config_data {
} }
} }
source_root = self.source_root_parent_map.get(&sr).copied(); source_root = self.source_root_parent_map.get(&sr);
} }
if let Some(v) = self.client_config.0.global.$field.as_ref() { if let Some(v) = self.client_config.0.global.$field.as_ref() {