build: delete box_pointer patch for ttrpc build scripts

Upstream ttrpc crate has fixed the usage of boxed pointers. Thus we do not need to declare explicitly the lint error ignorance. Signed-off-by: Xynnn007 <xynnn@linux.alibaba.com>
confidential-containers · Oct 3, 2024 · 470afc6 · 470afc6
1 parent b54f90a
commit 470afc6
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 105 deletions.
diff --git a/api-server-rest/build.rs b/api-server-rest/build.rs
@@ -88,23 +88,6 @@ fn main() -> std::io::Result<()> {
     ];
     let protobuf_customized = ProtobufCustomize::default().gen_mod_rs(false);
 
-    use std::fs::File;
-    use std::io::{Read, Write};
-
-    fn replace_text_in_file(file_name: &str, from: &str, to: &str) -> Result<(), std::io::Error> {
-        let mut src = File::open(file_name)?;
-        let mut contents = String::new();
-        src.read_to_string(&mut contents).unwrap();
-        drop(src);
-
-        let new_contents = contents.replace(from, to);
-
-        let mut dst = File::create(file_name)?;
-        dst.write_all(new_contents.as_bytes())?;
-
-        Ok(())
-    }
-
     Codegen::new()
         .out_dir("src/ttrpc_proto")
         .inputs(&protos)
@@ -118,17 +101,6 @@ fn main() -> std::io::Result<()> {
         .run()
         .expect("Generate ttrpc protocol code failed.");
 
-    // Fix clippy warnings of code generated from ttrpc_codegen
-    replace_text_in_file(
-        "src/ttrpc_proto/attestation_agent_ttrpc.rs",
-        "#![allow(box_pointers)]\n",
-        "",
-    )?;
-    replace_text_in_file(
-        "src/ttrpc_proto/confidential_data_hub_ttrpc.rs",
-        "#![allow(box_pointers)]\n",
-        "",
-    )?;
     generate_openapi_document().expect("Generate restful OpenAPI yaml failed.");
 
     Ok(())

diff --git a/attestation-agent/attestation-agent/src/bin/ttrpc-aa/ttrpc_protocol/attestation_agent.rs b/attestation-agent/attestation-agent/src/bin/ttrpc-aa/ttrpc_protocol/attestation_agent.rs
@@ -1,4 +1,4 @@
-// This file is generated by rust-protobuf 3.5.0. Do not edit
+// This file is generated by rust-protobuf 3.5.1. Do not edit
 // .proto file is parsed by pure
 // @generated
 
@@ -9,7 +9,6 @@
 #![allow(unused_attributes)]
 #![cfg_attr(rustfmt, rustfmt::skip)]
 
-#![allow(box_pointers)]
 #![allow(dead_code)]
 #![allow(missing_docs)]
 #![allow(non_camel_case_types)]
@@ -23,7 +22,7 @@
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_5_0;
+const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_5_1;
 
 // @@protoc_insertion_point(message:attestation_agent.GetEvidenceRequest)
 #[derive(PartialEq,Clone,Default,Debug)]

diff --git a/...tation-agent/attestation-agent/src/bin/ttrpc-aa/ttrpc_protocol/attestation_agent_ttrpc.rs b/...tation-agent/attestation-agent/src/bin/ttrpc-aa/ttrpc_protocol/attestation_agent_ttrpc.rs
@@ -1,10 +1,9 @@
-// This file is generated by ttrpc-compiler 0.6.2. Do not edit
+// This file is generated by ttrpc-compiler 0.6.3. Do not edit
 // @generated
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unknown_lints)]
 #![allow(clipto_camel_casepy)]
-#![allow(box_pointers)]
 #![allow(dead_code)]
 #![allow(missing_docs)]
 #![allow(non_camel_case_types)]
@@ -64,7 +63,7 @@ impl AttestationAgentServiceClient {
 }
 
 struct GetEvidenceMethod {
-    service: Arc<Box<dyn AttestationAgentService + Send + Sync>>,
+    service: Arc<dyn AttestationAgentService + Send + Sync>,
 }
 
 #[async_trait]
@@ -75,7 +74,7 @@ impl ::ttrpc::r#async::MethodHandler for GetEvidenceMethod {
 }
 
 struct GetTokenMethod {
-    service: Arc<Box<dyn AttestationAgentService + Send + Sync>>,
+    service: Arc<dyn AttestationAgentService + Send + Sync>,
 }
 
 #[async_trait]
@@ -86,7 +85,7 @@ impl ::ttrpc::r#async::MethodHandler for GetTokenMethod {
 }
 
 struct ExtendRuntimeMeasurementMethod {
-    service: Arc<Box<dyn AttestationAgentService + Send + Sync>>,
+    service: Arc<dyn AttestationAgentService + Send + Sync>,
 }
 
 #[async_trait]
@@ -97,7 +96,7 @@ impl ::ttrpc::r#async::MethodHandler for ExtendRuntimeMeasurementMethod {
 }
 
 struct CheckInitDataMethod {
-    service: Arc<Box<dyn AttestationAgentService + Send + Sync>>,
+    service: Arc<dyn AttestationAgentService + Send + Sync>,
 }
 
 #[async_trait]
@@ -108,7 +107,7 @@ impl ::ttrpc::r#async::MethodHandler for CheckInitDataMethod {
 }
 
 struct UpdateConfigurationMethod {
-    service: Arc<Box<dyn AttestationAgentService + Send + Sync>>,
+    service: Arc<dyn AttestationAgentService + Send + Sync>,
 }
 
 #[async_trait]
@@ -119,7 +118,7 @@ impl ::ttrpc::r#async::MethodHandler for UpdateConfigurationMethod {
 }
 
 struct GetTeeTypeMethod {
-    service: Arc<Box<dyn AttestationAgentService + Send + Sync>>,
+    service: Arc<dyn AttestationAgentService + Send + Sync>,
 }
 
 #[async_trait]
@@ -151,7 +150,7 @@ pub trait AttestationAgentService: Sync {
     }
 }
 
-pub fn create_attestation_agent_service(service: Arc<Box<dyn AttestationAgentService + Send + Sync>>) -> HashMap<String, ::ttrpc::r#async::Service> {
+pub fn create_attestation_agent_service(service: Arc<dyn AttestationAgentService + Send + Sync>) -> HashMap<String, ::ttrpc::r#async::Service> {
     let mut ret = HashMap::new();
     let mut methods = HashMap::new();
     let streams = HashMap::new();

diff --git a/attestation-agent/kbs_protocol/build.rs b/attestation-agent/kbs_protocol/build.rs
@@ -46,11 +46,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             "client: client",
             "client",
         )?;
-        replace_text_in_file(
-            "src/token_provider/aa/attestation_agent_ttrpc.rs",
-            "#![allow(box_pointers)]\n",
-            "",
-        )?;
     }
 
     Ok(())

diff --git a/confidential-data-hub/hub/build.rs b/confidential-data-hub/hub/build.rs
@@ -51,16 +51,6 @@ fn main() {
 
         // Fix clippy warnings of code generated from ttrpc_codegen
         replace_text_in_file("src/bin/protos/api_ttrpc.rs", "client: client", "client");
-        replace_text_in_file(
-            "src/bin/protos/api_ttrpc.rs",
-            "#![allow(box_pointers)]\n",
-            "",
-        );
-        replace_text_in_file(
-            "src/bin/protos/keyprovider_ttrpc.rs",
-            "#![allow(box_pointers)]\n",
-            "",
-        );
     }
 
     #[cfg(feature = "bin")]

diff --git a/image-rs/build.rs b/image-rs/build.rs
@@ -3,53 +3,21 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-fn main() -> Result<(), Box<dyn std::error::Error>> {
+fn main() {
     #[cfg(feature = "tonic-build")]
     tonic_build::compile_protos("./protos/getresource.proto").expect("tonic build");
 
     #[cfg(feature = "ttrpc-codegen")]
-    {
-        use std::fs::File;
-        use std::io::{Read, Write};
-
-        fn replace_text_in_file(
-            file_name: &str,
-            from: &str,
-            to: &str,
-        ) -> Result<(), std::io::Error> {
-            let mut src = File::open(file_name)?;
-            let mut contents = String::new();
-            src.read_to_string(&mut contents).unwrap();
-            drop(src);
-
-            let new_contents = contents.replace(from, to);
-
-            let mut dst = File::create(file_name)?;
-            dst.write_all(new_contents.as_bytes())?;
-
-            Ok(())
-        }
-
-        ttrpc_codegen::Codegen::new()
-            .out_dir("./src/resource/kbs/ttrpc_proto")
-            .input("./protos/getresource.proto")
-            .include("./protos")
-            .rust_protobuf()
-            .customize(ttrpc_codegen::Customize {
-                async_all: true,
-                ..Default::default()
-            })
-            .rust_protobuf_customize(ttrpc_codegen::ProtobufCustomize::default().gen_mod_rs(false))
-            .run()
-            .expect("ttrpc build");
-
-        // Fix clippy warnings of code generated from ttrpc_codegen
-        replace_text_in_file(
-            "src/resource/kbs/ttrpc_proto/getresource_ttrpc.rs",
-            "#![allow(box_pointers)]\n",
-            "",
-        )?;
-    }
-
-    Ok(())
+    ttrpc_codegen::Codegen::new()
+        .out_dir("./src/resource/kbs/ttrpc_proto")
+        .input("./protos/getresource.proto")
+        .include("./protos")
+        .rust_protobuf()
+        .customize(ttrpc_codegen::Customize {
+            async_all: true,
+            ..Default::default()
+        })
+        .rust_protobuf_customize(ttrpc_codegen::ProtobufCustomize::default().gen_mod_rs(false))
+        .run()
+        .expect("ttrpc build");
 }
diff --git a/ocicrypt-rs/build.rs b/ocicrypt-rs/build.rs
@@ -50,11 +50,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             "client: client",
             "client",
         )?;
-        replace_text_in_file(
-            "src/utils/ttrpc/keyprovider_ttrpc.rs",
-            "#![allow(box_pointers)]\n",
-            "",
-        )?;
     }
 
     Ok(())