Address comments

Signed-off-by: Breezewish <breezewish@pingcap.com>
tikv · May 10, 2019 · 3c1bbd1 · 3c1bbd1
1 parent 246230e
commit 3c1bbd1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/components/codec/src/byte.rs b/components/codec/src/byte.rs
@@ -439,10 +439,7 @@ impl CompactByteCodec {
             Err(_) => encoded.len(),
             Ok((value, decoded_n)) => {
                 let r = value as usize + decoded_n;
-                if unsafe { unlikely(r > encoded.len()) } {
-                    return encoded.len();
-                }
-                r
+                r.min(encoded.len())
             }
         }
     }

diff --git a/components/codec/src/number.rs b/components/codec/src/number.rs
@@ -483,7 +483,8 @@ impl NumberCodec {
     pub fn try_decode_var_i64(buf: &[u8]) -> Result<(i64, usize)> {
         let (uv, decoded_bytes) = Self::try_decode_var_u64(buf)?;
         let v = uv >> 1;
-        if unsafe { likely(uv & 1 == 0) } {
+        if uv & 1 == 0 {
+            // no need for likely/unlikely here
             Ok((v as i64, decoded_bytes))
         } else {
             Ok((!v as i64, decoded_bytes))
@@ -515,7 +516,7 @@ impl NumberCodec {
                 while ptr != ptr_end && *ptr >= 0x80 {
                     ptr = ptr.add(1);
                 }
-                // We we got here, we are either `ptr == ptr_end`, or `*ptr < 0x80`.
+                // When we got here, we are either `ptr == ptr_end`, or `*ptr < 0x80`.
                 // For `ptr == ptr_end` case, it means we are expecting a value < 0x80
                 //      but meet EOF, so only `len` is returned.
                 // For `*ptr < 0x80` case, it means currently it is pointing to the last byte