Consolidate into single binary

Author: isaacparker0

tools/rust_analyzer/BUILD.bazel

@@ -7,11 +7,9 @@ package(default_visibility = ["//visibility:public"])
 rust_binary(
     name = "discover_bazel_rust_project",
     srcs = ["@rules_rust//tools/rust_analyzer:bin/discover_rust_project.rs"],
-    data = [":flycheck"],
     edition = "2018",
     rustc_env = {
         "ASPECT_REPOSITORY": aspect_repository(),
-        "FLYCHECK_RLOCATIONPATH": "$(rlocationpath :flycheck)",
     },
     deps = [
         ":gen_rust_project_lib",
@@ -21,29 +19,15 @@ rust_binary(
         "@rrra//:env_logger",
         "@rrra//:log",
         "@rrra//:serde_json",
-        "@rules_rust//rust/runfiles",
-    ],
-)
-
-rust_binary(
-    name = "flycheck",
-    srcs = ["flycheck.rs"],
-    edition = "2021",
-    deps = [
-        "@rrra//:clap",
-        "@rrra//:serde",
-        "@rrra//:serde_json",
     ],
 )
 
 rust_binary(
     name = "gen_rust_project",
     srcs = ["@rules_rust//tools/rust_analyzer:bin/gen_rust_project.rs"],
-    data = [":flycheck"],
     edition = "2018",
     rustc_env = {
         "ASPECT_REPOSITORY": aspect_repository(),
-        "FLYCHECK_RLOCATIONPATH": "$(rlocationpath :flycheck)",
     },
     deps = [
         ":gen_rust_project_lib",
@@ -53,7 +37,6 @@ rust_binary(
         "@rrra//:env_logger",
         "@rrra//:log",
         "@rrra//:serde_json",
-        "@rules_rust//rust/runfiles",
     ],
 )
 
@@ -80,6 +63,7 @@ rust_library(
     name = "gen_rust_project_lib",
     srcs = [
         "@rules_rust//tools/rust_analyzer:aquery.rs",
+        "@rules_rust//tools/rust_analyzer:flycheck.rs",
         "@rules_rust//tools/rust_analyzer:lib.rs",
         "@rules_rust//tools/rust_analyzer:rust_project.rs",
     ],