fix: trailing whitespace

cloudwego · Aug 9, 2023 · bd18043 · bd18043
1 parent 32b720e
commit bd18043
Show file tree

Hide file tree

Showing 10 changed files with 236 additions and 41 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pilota-build/Cargo.toml b/pilota-build/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pilota-build"
-version = "0.8.1"
+version = "0.8.2"
 edition = "2021"
 description = "Compile thrift and protobuf idl into rust code at compile-time."
 documentation = "https://docs.rs/pilota-build"

diff --git a/pilota-build/src/codegen/mod.rs b/pilota-build/src/codegen/mod.rs
@@ -11,7 +11,10 @@ use itertools::Itertools;
 use normpath::PathExt;
 use pkg_tree::PkgNode;
 use quote::quote;
-use rayon::prelude::IntoParallelRefIterator;
+use rayon::{
+    prelude::{IntoParallelRefIterator, ParallelIterator},
+    str::ParallelString,
+};
 use traits::CodegenBackend;
 
 use self::workspace::Workspace;
@@ -429,8 +432,6 @@ where
     where
         B: Send,
     {
-        use rayon::iter::ParallelIterator;
-
         let mods = items.into_group_map_by(|CodegenItem { def_id, .. }| {
             let path = Arc::from_iter(self.mod_path(*def_id).iter().map(|s| s.0.clone()));
             tracing::debug!("ths path of {:?} is {:?}", def_id, path);
@@ -504,9 +505,9 @@ where
                 #![allow(warnings, clippy::all)]
                 {stream}
             }}"#};
-
+        let stream = stream.lines().map(|s| s.trim_end()).join("\n");
         let mut file = std::io::BufWriter::new(std::fs::File::create(&file_name).unwrap());
-        file.write_all(stream.to_string().as_bytes()).unwrap();
+        file.write_all(stream.as_bytes()).unwrap();
         file.flush().unwrap();
         fmt_file(file_name)
     }

diff --git a/pilota-build/src/codegen/thrift/mod.rs b/pilota-build/src/codegen/thrift/mod.rs
@@ -398,7 +398,7 @@ impl ThriftBackend {
                 {record_ptr}
                 let field_ident = {read_field_begin};
                 if field_ident.field_type == ::pilota::thrift::TType::Stop {{
-                    {field_stop_len} 
+                    {field_stop_len}
                     break;
                 }} else {{
                     {field_begin_len}
@@ -685,7 +685,7 @@ impl CodegenBackend for ThriftBackend {
                                 {record_ptr}
                                 let field_ident = {read_field_begin};
                                 if field_ident.field_type == ::pilota::thrift::TType::Stop {{
-                                    {field_stop_len} 
+                                    {field_stop_len}
                                     break;
                                 }} else {{
                                     {field_begin_len}

diff --git a/pilota-build/src/codegen/workspace.rs b/pilota-build/src/codegen/workspace.rs
@@ -4,7 +4,10 @@ use anyhow::bail;
 use faststr::FastStr;
 use fxhash::FxHashMap;
 use itertools::Itertools;
-use rayon::prelude::{IntoParallelRefIterator, ParallelIterator};
+use rayon::{
+    prelude::{IntoParallelRefIterator, ParallelIterator},
+    str::ParallelString,
+};
 
 use super::CodegenItem;
 use crate::{
@@ -287,6 +290,8 @@ where
             stream.push_str(&format!("pub use {}::*;", main_mod_path.join("::")));
         }
 
+        let stream = stream.lines().map(|s| s.trim_end()).join("\n");
+
         let src_file = base_dir.as_ref().join(&*info.name).join("src/lib.rs");
 
         std::fs::write(&src_file, stream)?;

diff --git a/pilota-build/src/plugin/mod.rs b/pilota-build/src/plugin/mod.rs
@@ -347,7 +347,7 @@ impl Plugin for ImplDefaultPlugin {
                         if !fields.is_empty() {
                             fields.push_str(",\n");
                         }
-                        fields.push_str("unknown_fields: ::pilota::Bytes::new()");
+                        fields.push_str("_unknown_fields: ::pilota::LinkedBytes::new()");
                     }
 
                     cx.with_adjust_mut(def_id, |adj| {

diff --git a/pilota-build/src/test/mod.rs b/pilota-build/src/test/mod.rs
@@ -188,6 +188,7 @@ fn test_unknown_fields() {
         crate::Builder::thrift()
             .ignore_unused(false)
             .keep_unknown_fields([source.into()])
+            .plugin(SerdePlugin)
             .compile_with_config(
                 vec![IdlService::from_path(source.to_path_buf())],
                 crate::Output::File(target.into()),