Rust: trim comments and fix test import

Author: santiagomed

compiler/cpp/src/thrift/generate/t_rs_generator.cc

@@ -1704,7 +1704,6 @@ void t_rs_generator::render_struct_sync_read(const string& struct_name,
       f_gen_ << indent() << rust_safe_field_id(tfield->get_key()) << " => {" << '\n';
       indent_up();
       if (is_union_field) {
-        // Catch EmptyUnion from unknown variants for forward compatibility.
         // Use the resolved (non-Box) type since Box<T>::method() isn't valid syntax.
         string resolved_type = to_rust_type(resolved);
         bool is_boxed_union = to_rust_type(tfield->get_type()) != resolved_type;
@@ -1714,9 +1713,6 @@ void t_rs_generator::render_struct_sync_read(const string& struct_name,
         indent_up();
         f_gen_ << indent() << "Ok(val) => { " << struct_field_read_temp_variable(tfield) << " = Some(" << val_expr << "); }," << '\n';
         f_gen_ << indent() << "Err(thrift::Error::Protocol(ref e)) if e.kind == ProtocolErrorKind::EmptyUnion => {" << '\n';
-        indent_up();
-        f_gen_ << indent() << "// forward compatibility: unknown union variant skipped" << '\n';
-        indent_down();
         f_gen_ << indent() << "}," << '\n';
         f_gen_ << indent() << "Err(e) => return Err(e)," << '\n';
         indent_down();

lib/rs/test/src/lib.rs

@@ -57,7 +57,7 @@ mod tests {
 
         use thrift::protocol::{
             TBinaryInputProtocol, TBinaryOutputProtocol, TFieldIdentifier, TOutputProtocol,
-            TStructIdentifier, TType,
+            TSerializable, TStructIdentifier, TType,
         };
 
         // Serialize AidKit with an unknown union variant (id=99), verify it deserializes as None.
@@ -71,19 +71,16 @@ mod tests {
                 name: "AidKit".to_owned(),
             })
             .unwrap();
-            // field 1: optional aid (union => Struct on wire)
             prot.write_field_begin(&TFieldIdentifier {
                 name: None,
                 field_type: TType::Struct,
                 id: Some(1),
             })
             .unwrap();
-            // inner union-as-struct
             prot.write_struct_begin(&TStructIdentifier {
                 name: "MeasuringAids".to_owned(),
             })
             .unwrap();
-            // unknown variant: use an id that doesn't exist (99), type i32
             prot.write_field_begin(&TFieldIdentifier {
                 name: None,
                 field_type: TType::I32,
@@ -94,13 +91,11 @@ mod tests {
             prot.write_field_end().unwrap();
             prot.write_field_stop().unwrap();
             prot.write_struct_end().unwrap();
-            // end outer field
             prot.write_field_end().unwrap();
             prot.write_field_stop().unwrap();
             prot.write_struct_end().unwrap();
         }
 
-        // Read it back using generated code
         let read_cursor = Cursor::new(write_buf);
         let mut rprot = TBinaryInputProtocol::new(read_cursor, false);
         let kit = base_one::AidKit::read_from_in_protocol(&mut rprot)