commit 85d82bfd0c244d88fb01a1e761606d78868dc49c
author Tdxdxoz <tdxdxoz@gmail.com> Sun Jul 17 14:14:12 2022 +0200
committer Jens Geyer <jensg@apache.org> Thu Sep 01 22:05:45 2022 +0200
tree 286391a5fc28f2d9cfc31ef80137682fbe091b25
parent 7815d645045b62ca74f6caabbb4cd2b60c33a6c4

THRIFT-5600: upgrade rust toolchain to 1.61 and edition 2021
THRIFT-5606: Wrong indent for const double
Client: rs
Patch: Ommy Zhang <tdxdxoz@gmail.com>

This closes #2634

lib/rs/src/protocol/compact.rs

diff --git a/lib/rs/src/protocol/compact.rs b/lib/rs/src/protocol/compact.rs
index 566f344..87cfbfc 100644
--- a/lib/rs/src/protocol/compact.rs
+++ b/lib/rs/src/protocol/compact.rs
@@ -84,14 +84,13 @@
         let header = self.read_byte()?;
         let element_type = collection_u8_to_type(header & 0x0F)?;
 
-        let element_count;
         let possible_element_count = (header & 0xF0) >> 4;
-        if possible_element_count != 15 {
+        let element_count = if possible_element_count != 15 {
             // high bits set high if count and type encoded separately
-            element_count = possible_element_count as i32;
+            possible_element_count as i32
         } else {
-            element_count = self.transport.read_varint::<u32>()? as i32;
-        }
+            self.transport.read_varint::<u32>()? as i32
+        };
 
         Ok((element_type, element_count))
     }