Narrow lint scope and simplify generated dead_code handling

Signed-off-by: Michael Ingley <mingley@linkedin.com>

Author: Michael Ingley

examples/raw.rs

@@ -18,8 +18,6 @@ const KEY: &str = "TiKV";
 const VALUE: &str = "Rust";
 
 #[tokio::main]
-// Rust 1.93's clippy::all now flags the crate's existing Result alias in examples.
-#[allow(clippy::result_large_err)]
 async fn main() -> Result<()> {
     env_logger::init();
 

proto-build/src/main.rs

@@ -1,9 +1,6 @@
 // Copyright 2023 TiKV Project Authors. Licensed under Apache-2.0.
 
 fn main() {
-    let generated_mod = "src/generated/mod.rs";
-    let dead_code_context = "// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.";
-
     tonic_build::configure()
         .emit_rerun_if_changed(false)
         .build_server(false)
@@ -17,19 +14,4 @@ fn main() {
             &["proto/include", "proto"],
         )
         .unwrap();
-
-    // Keep dead_code allowance scoped to generated modules only.
-    let mod_rs = std::fs::read_to_string(generated_mod).unwrap();
-    let mut mod_rs = mod_rs
-        .replace(
-            &format!("\n{dead_code_context}\n#[allow(dead_code)]\n"),
-            "\n",
-        )
-        .replace("\n#[allow(dead_code)]\n", "\n");
-    let dead_code_prefix = format!("{dead_code_context}\n#[allow(dead_code)]\n");
-    mod_rs = mod_rs.replace("\npub mod ", &format!("\n{dead_code_prefix}pub mod "));
-    if mod_rs.starts_with("pub mod ") {
-        mod_rs = format!("{dead_code_prefix}{mod_rs}");
-    }
-    std::fs::write(generated_mod, mod_rs).unwrap();
 }

src/common/errors.rs

@@ -68,7 +68,7 @@ pub enum Error {
     /// Wraps a `reqwest::Error`.
     /// Wraps a `grpcio::Error`.
     #[error("gRPC api error: {0}")]
-    GrpcAPI(#[from] tonic::Status),
+    GrpcAPI(Box<tonic::Status>),
     /// Wraps a `grpcio::Error`.
     #[error("url error: {0}")]
     Url(#[from] tonic::codegen::http::uri::InvalidUri),
@@ -142,6 +142,12 @@ impl From<ProtoKeyError> for Error {
     }
 }
 
+impl From<tonic::Status> for Error {
+    fn from(status: tonic::Status) -> Error {
+        Error::GrpcAPI(Box::new(status))
+    }
+}
+
 /// A result holding an [`Error`](enum@Error).
 pub type Result<T> = result::Result<T, Error>;
 

src/generated/mod.rs

@@ -1,178 +1,108 @@
 // This file is @generated by prost-build.
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod autoid {
     include!("autoid.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod backup {
     include!("backup.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod cdcpb {
     include!("cdcpb.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod configpb {
     include!("configpb.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod coprocessor {
     include!("coprocessor.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod deadlock {
     include!("deadlock.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod debugpb {
     include!("debugpb.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod diagnosticspb {
     include!("diagnosticspb.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod disaggregated {
     include!("disaggregated.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod disk_usage {
     include!("disk_usage.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod encryptionpb {
     include!("encryptionpb.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod enginepb {
     include!("enginepb.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod eraftpb {
     include!("eraftpb.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod errorpb {
     include!("errorpb.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod gcpb {
     include!("gcpb.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod google {
     pub mod api {
         include!("google.api.rs");
     }
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod import_kvpb {
     include!("import_kvpb.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod import_sstpb {
     include!("import_sstpb.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod keyspacepb {
     include!("keyspacepb.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod kvrpcpb {
     include!("kvrpcpb.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod logbackup {
     include!("logbackup.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod meta_storagepb {
     include!("meta_storagepb.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod metapb {
     include!("metapb.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod mpp {
     include!("mpp.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod pdpb {
     include!("pdpb.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod raft_cmdpb {
     include!("raft_cmdpb.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod raft_serverpb {
     include!("raft_serverpb.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod recover_data {
     include!("recover_data.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod replication_modepb {
     include!("replication_modepb.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod resource_manager {
     include!("resource_manager.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod resource_usage_agent {
     include!("resource_usage_agent.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod schedulingpb {
     include!("schedulingpb.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod tikvpb {
     include!("tikvpb.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod tracepb {
     include!("tracepb.rs");
 }
-// Rust 1.93's clippy::all now flags unused generated wire types as dead code; prior toolchain did not fail on these.
-#[allow(dead_code)]
 pub mod tsopb {
     include!("tsopb.rs");
 }

src/lib.rs

@@ -91,9 +91,6 @@
 //! ```
 
 #![allow(clippy::field_reassign_with_default)]
-// Rust 1.93's clippy::all flags this existing public Result surface as `result_large_err`;
-// prior toolchain (1.84.1) did not fail CI on these signatures.
-#![allow(clippy::result_large_err)]
 
 pub mod backoff;
 #[doc(hidden)]

src/proto.rs

@@ -5,7 +5,10 @@
 
 pub use protos::*;
 
+// Rust 1.93's clippy::all flags many protobuf-generated wire types as dead code.
+// Prior toolchain (1.84.1) did not fail on these generated definitions.
 #[allow(clippy::doc_lazy_continuation)]
+#[allow(dead_code)]
 mod protos {
     include!("generated/mod.rs");
 }

src/store/request.rs

@@ -42,7 +42,7 @@ macro_rules! impl_request {
                     .$fun(req)
                     .await
                     .map(|r| Box::new(r.into_inner()) as Box<dyn Any>)
-                    .map_err(Error::GrpcAPI)
+                    .map_err(Error::from)
             }
 
             fn label(&self) -> &'static str {