Merge pull request #262 from stepchowfun/varint-serialization-bug

Fix a bug in the varint serialization logic

Author: stepchowfun

CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.0.7] - 2021-10-25
+
+### Fixed
+- Fixed a bug in the variable-width integer serialization logic for Rust which affected numbers in the range [`567,382,630,219,904`, `72,624,976,668,147,840`).
+
 ## [0.0.6] - 2021-10-24
 
 ### Changed

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "typical"
-version = "0.0.6"
+version = "0.0.7"
 authors = ["Stephan Boyer <stephan@stephanboyer.com>"]
 edition = "2021"
 description = "Algebraic data types for data interchange."

Cargo.toml

@@ -176,9 +176,15 @@ pub fn run() -> io::Result<()> {
     for i in i64::MIN..=i64::MIN + 1000 {
         check_match::<BarOut, BarIn>(BarOut::WRequired(i))?;
     }
+    for i in (i64::MIN >> 32) - 1000..=(i64::MIN >> 32) + 1000 {
+        check_match::<BarOut, BarIn>(BarOut::WRequired(i))?;
+    }
     for i in -1000_i64..=1000_i64 {
         check_match::<BarOut, BarIn>(BarOut::WRequired(i))?;
     }
+    for i in (i64::MAX >> 32) - 1000..=(i64::MAX >> 32) + 1000 {
+        check_match::<BarOut, BarIn>(BarOut::WRequired(i))?;
+    }
     for i in i64::MAX - 1000..=i64::MAX {
         check_match::<BarOut, BarIn>(BarOut::WRequired(i))?;
     }
@@ -190,6 +196,9 @@ pub fn run() -> io::Result<()> {
     for i in u64::MIN..=u64::MIN + 1000 {
         check_match::<BarOut, BarIn>(BarOut::YRequired(i))?;
     }
+    for i in (u64::MAX >> 32) - 1000..=(u64::MAX >> 32) + 1000 {
+        check_match::<BarOut, BarIn>(BarOut::YRequired(i))?;
+    }
     for i in u64::MAX / 2 - 1000..=u64::MAX / 2 + 1000 {
         check_match::<BarOut, BarIn>(BarOut::YRequired(i))?;
     }

integration_tests/rust/src/comprehensive.rs

@@ -177,7 +177,7 @@ fn serialize_varint<T: Write>(mut value: u64, writer: &mut T) -> io::Result<()>
             ])
         }}
         567_382_630_219_904_u64..=72_624_976_668_147_839_u64 => {{
-            value -= 72_624_976_668_147_839_u64;
+            value -= 567_382_630_219_904_u64;
             writer.write_all(&[
                 0b1000_0000,
                 value as u8,
@@ -2011,7 +2011,7 @@ fn serialize_varint<T: Write>(mut value: u64, writer: &mut T) -> io::Result<()>
             ])
         }
         567_382_630_219_904_u64..=72_624_976_668_147_839_u64 => {
-            value -= 72_624_976_668_147_839_u64;
+            value -= 567_382_630_219_904_u64;
             writer.write_all(&[
                 0b1000_0000,
                 value as u8,