chore: Update code analysis

Author: mikkihugo

BUILD.bazel

@@ -1,26 +1 @@
-load("@rules_rust//rust:defs.bzl", "rust_library", "rust_test", "rust_doc_test")
-load("@crate_index//:defs.bzl", "aliases", "all_crate_deps")
-
-package(default_visibility = ["//visibility:public"])
-
-rust_library(
-    name = "singularity-code-analysis",
-    srcs = glob(["src/**/*.rs"]),
-    aliases = aliases(),
-    deps = all_crate_deps() + [
-        "//crates/vendor/singularity-code-analysis/enums",
-        "//crates/vendor/singularity-language-registry",
-    ],
-    proc_macro_deps = all_crate_deps(proc_macro = True),
-)
-
-rust_test(
-    name = "singularity_code_analysis_test",
-    crate = ":singularity-code-analysis",
-    deps = all_crate_deps(test = True),
-)
-
-rust_doc_test(
-    name = "singularity_code_analysis_doc_test",
-    crate = ":singularity-code-analysis",
-)
+# singularity-code-analysis

Cargo.toml

@@ -9,6 +9,9 @@ keywords = ["metrics", "complexity", "analysis", "ai"]
 repository = "https://github.com/mikkihugo/singularity-code-analysis"
 categories = ["development-tools", "parsing"]
 
+# Mark as standalone crate (not part of parent workspace)
+[workspace]
+
 [lib]
 name = "singularity_analysis_engine"
 crate-type = ["rlib", "cdylib"]
@@ -22,7 +25,7 @@ num-derive = "0.4"
 num-format = "0.4"
 petgraph = "0.8"
 regex = "1.0"
-serde = { workspace = true, features = ["derive"] }
+serde = { version = "1.0", features = ["derive"] }
 termcolor = "1.2"
 walkdir = "2.0"
 

enums/BUILD.bazel

@@ -1,23 +1 @@
-load("@rules_rust//rust:defs.bzl", "rust_library", "rust_test", "rust_doc_test")
-load("@crate_index//:defs.bzl", "aliases", "all_crate_deps")
-
-package(default_visibility = ["//visibility:public"])
-
-rust_library(
-    name = "enums",
-    srcs = glob(["src/**/*.rs"]),
-    aliases = aliases(),
-    deps = all_crate_deps(),
-    proc_macro_deps = all_crate_deps(proc_macro = True),
-)
-
-rust_test(
-    name = "enums_test",
-    crate = ":enums",
-    deps = all_crate_deps(test = True),
-)
-
-rust_doc_test(
-    name = "enums_doc_test",
-    crate = ":enums",
-)
+# enums subpackage

enums/src/main.rs

@@ -206,9 +206,11 @@ fn apply_existing_variants(
     existing: &mut HashMap<String, VecDeque<String>>,
 ) -> Vec<KindInfo> {
     for kind in &mut kinds {
-        if let Some(names) = existing.get_mut(&kind.literal) && let Some(existing_name) = names.pop_front() {
-            kind.variant = existing_name;
+        if let Some(names) = existing.get_mut(&kind.literal) {
+            if let Some(existing_name) = names.pop_front() {
+                kind.variant = existing_name;
                 continue;
+            }
         }
     }
     kinds

examples/inspect_elixir.rs

@@ -42,8 +42,10 @@ end
         let Ok(kind_id) = u16::try_from(i) else {
             break;
         };
-        if language.node_kind_is_named(kind_id) && let Some(kind) = language.node_kind_for_id(kind_id) {
-            println!("{kind_id:3}: {kind}");
+        if language.node_kind_is_named(kind_id) {
+            if let Some(kind) = language.node_kind_for_id(kind_id) {
+                println!("{kind_id:3}: {kind}");
+            }
         }
     }
 }

examples/inspect_erlang.rs

@@ -31,8 +31,10 @@ is_even(N) ->
 
     println!("\n=== All Named Node Kinds ===");
     for i in 0..language.node_kind_count() {
-        if language.node_kind_is_named(i as u16) && let Some(kind) = language.node_kind_for_id(i as u16) {
-            println!("{:3}: {}", i, kind);
+        if language.node_kind_is_named(i as u16) {
+            if let Some(kind) = language.node_kind_for_id(i as u16) {
+                println!("{:3}: {}", i, kind);
+            }
         }
     }
 }

examples/inspect_gleam.rs

@@ -37,8 +37,10 @@ fn private_function(x: Int) -> String {
 
     println!("\n=== All Named Node Kinds ===");
     for i in 0..language.node_kind_count() {
-        if language.node_kind_is_named(i as u16) && let Some(kind) = language.node_kind_for_id(i as u16) {
-            println!("{:3}: {}", i, kind);
+        if language.node_kind_is_named(i as u16) {
+            if let Some(kind) = language.node_kind_for_id(i as u16) {
+                println!("{:3}: {}", i, kind);
+            }
         }
     }
 }

examples/inspect_python.rs

@@ -25,8 +25,10 @@ def f(a, b):
         let Ok(kind_id) = u16::try_from(i) else {
             break;
         };
-        if language.node_kind_is_named(kind_id) && let Some(kind) = language.node_kind_for_id(kind_id) {
-            println!("{kind_id:3}: {kind}");
+        if language.node_kind_is_named(kind_id) {
+            if let Some(kind) = language.node_kind_for_id(kind_id) {
+                println!("{kind_id:3}: {kind}");
+            }
         }
     }
 }

src/alterator.rs

@@ -84,8 +84,10 @@ impl Alterator for CppCode {
                 AstNode::new(node.kind(), text, span, Vec::new())
             }
             Cpp::PreprocDef | Cpp::PreprocFunctionDef | Cpp::PreprocCall => {
-                if let Some(last) = children.last() && last.r#type == "\n" {
-                    children.pop();
+                if let Some(last) = children.last() {
+                    if last.r#type == "\n" {
+                        children.pop();
+                    }
                 }
                 Self::get_default(node, code, span, children)
             }

src/bin/cli.rs

@@ -473,8 +473,12 @@ fn collect_files_recursive(dir: &Path) -> Result<Vec<PathBuf>> {
     let mut files = Vec::new();
     for entry in walkdir::WalkDir::new(dir).follow_links(true) {
         let entry = entry?;
-        if entry.file_type().is_file() && let Some(ext) = entry.path().extension() && is_source_file(ext.to_str().unwrap_or("")) {
-            files.push(entry.path().to_path_buf());
+        if entry.file_type().is_file() {
+            if let Some(ext) = entry.path().extension() {
+                if is_source_file(ext.to_str().unwrap_or("")) {
+                    files.push(entry.path().to_path_buf());
+                }
+            }
         }
     }
     Ok(files)
@@ -484,8 +488,12 @@ fn collect_files_single(dir: &Path) -> Result<Vec<PathBuf>> {
     let mut files = Vec::new();
     for entry in fs::read_dir(dir)? {
         let entry = entry?;
-        if entry.file_type()?.is_file() && let Some(ext) = entry.path().extension() && is_source_file(ext.to_str().unwrap_or("")) {
-            files.push(entry.path());
+        if entry.file_type()?.is_file() {
+            if let Some(ext) = entry.path().extension() {
+                if is_source_file(ext.to_str().unwrap_or("")) {
+                    files.push(entry.path());
+                }
+            }
         }
     }
     Ok(files)