about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAli Bektas <bektasali@protonmail.com>2024-07-29 17:00:31 +0200
committerAli Bektas <bektasali@protonmail.com>2024-07-29 17:00:31 +0200
commitdc471c16b2a2d6ae68cb7668228d95a17afa6cbd (patch)
tree8e2c3179a5e28a0e1922af16e44660bfb6909b35
parent45ef4f2c32cb9a192b4cabfee8701eec42b64f20 (diff)
downloadrust-dc471c16b2a2d6ae68cb7668228d95a17afa6cbd.tar.gz
rust-dc471c16b2a2d6ae68cb7668228d95a17afa6cbd.zip
Remove clippy errors
-rw-r--r--src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs b/src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs
index 996f48482aa..8743c4faff6 100644
--- a/src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs
+++ b/src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs
@@ -758,6 +758,8 @@ pub enum RatomlFileKind {
 }
 
 #[derive(Debug, Clone)]
+// FIXME @alibektas : Seems like a clippy warning of this sort should tell that combining different ConfigInputs into one enum was not a good idea.
+#[allow(clippy::large_enum_variant)]
 enum RatomlFile {
     Workspace(GlobalLocalConfigInput),
     Crate(LocalConfigInput),
@@ -2598,14 +2600,9 @@ macro_rules! _impl_for_config_data {
                 $vis fn $field(&self, source_root : Option<SourceRootId>) -> &$ty {
                     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 {
-                                RatomlFile::Workspace(config) => {
-                                    if let Some(v) = config.global.$field.as_ref() {
-                                        return &v;
-                                    }
-                                },
-                                _ => ()
+                        if let Some((RatomlFile::Workspace(config), _)) = self.ratoml_file.get(&sr) {
+                            if let Some(v) = config.global.$field.as_ref() {
+                                return &v;
                             }
                         }