Remove unnec copying of source_root_ids

alibektas · alibektas · commit 45ef4f2c32cb · 2024-07-29T03:46:02.000+02:00
diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs b/src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs
@@ -2552,7 +2552,7 @@ macro_rules! _impl_for_config_data {
                 $($doc)*
                 #[allow(non_snake_case)]
                 $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 {
                         if let Some((file, _)) = self.ratoml_file.get(&sr) {
                             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() {
@@ -2596,7 +2596,7 @@ macro_rules! _impl_for_config_data {
                 $($doc)*
                 #[allow(non_snake_case)]
                 $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 {
                         if let Some((file, _)) = self.ratoml_file.get(&sr) {
                             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() {

Original file line number	Diff line number	Diff line change
`@@ -2552,7 +2552,7 @@ macro_rules! _impl_for_config_data {`
`2552`	`2552`	`$($doc)*`
`2553`	`2553`	`#[allow(non_snake_case)]`
`2554`	`2554`	`$vis fn $field(&self, source_root: Option<SourceRootId>) -> &$ty {`
`2555`		`- let mut source_root = source_root;`
	`2555`	`+ let mut source_root = source_root.as_ref();`
`2556`	`2556`	`while let Some(sr) = source_root {`
`2557`	`2557`	`if let Some((file, _)) = self.ratoml_file.get(&sr) {`
`2558`	`2558`	`match file {`
`@@ -2568,7 +2568,7 @@ macro_rules! _impl_for_config_data {`
`2568`	`2568`	`}`
`2569`	`2569`	`}`
`2570`	`2570`	`}`
`2571`		`- source_root = self.source_root_parent_map.get(&sr).copied();`
	`2571`	`+ source_root = self.source_root_parent_map.get(&sr);`
`2572`	`2572`	`}`
`2573`	`2573`
`2574`	`2574`	`if let Some(v) = self.client_config.0.local.$field.as_ref() {`
`@@ -2596,7 +2596,7 @@ macro_rules! _impl_for_config_data {`
`2596`	`2596`	`$($doc)*`
`2597`	`2597`	`#[allow(non_snake_case)]`
`2598`	`2598`	`$vis fn $field(&self, source_root : Option<SourceRootId>) -> &$ty {`
`2599`		`- let mut source_root = source_root;`
	`2599`	`+ let mut source_root = source_root.as_ref();`
`2600`	`2600`	`while let Some(sr) = source_root {`
`2601`	`2601`	`if let Some((file, _)) = self.ratoml_file.get(&sr) {`
`2602`	`2602`	`match file {`
`@@ -2609,7 +2609,7 @@ macro_rules! _impl_for_config_data {`
`2609`	`2609`	`}`
`2610`	`2610`	`}`
`2611`	`2611`
`2612`		`- source_root = self.source_root_parent_map.get(&sr).copied();`
	`2612`	`+ source_root = self.source_root_parent_map.get(&sr);`
`2613`	`2613`	`}`
`2614`	`2614`
`2615`	`2615`	`if let Some(v) = self.client_config.0.global.$field.as_ref() {`