From 4d35a56798e8f33d758582c10a82659ac77de7ca Mon Sep 17 00:00:00 2001 From: edef Date: Fri, 27 Oct 2023 00:01:58 +0000 Subject: refactor(tvix/nix-compat): simplify encode_len Change-Id: Idfefd3b5b0d1ffbd4e9208e634a2d9989965a291 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9845 Reviewed-by: flokli Tested-by: BuildkiteCI --- tvix/nix-compat/src/nixbase32.rs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'tvix/nix-compat') diff --git a/tvix/nix-compat/src/nixbase32.rs b/tvix/nix-compat/src/nixbase32.rs index 7fef1d673e2f..86d900032d1a 100644 --- a/tvix/nix-compat/src/nixbase32.rs +++ b/tvix/nix-compat/src/nixbase32.rs @@ -104,10 +104,7 @@ pub fn decode_len(len: usize) -> usize { /// Returns the encoded length of an input of length len pub fn encode_len(len: usize) -> usize { - if len == 0 { - return 0; - } - (len * 8 - 1) / 5 + 1 + (len * 8 + 4) / 5 } #[cfg(test)] @@ -157,11 +154,13 @@ mod tests { #[test] fn encode_len() { - assert_eq!(super::encode_len(20), 32) + assert_eq!(super::encode_len(0), 0); + assert_eq!(super::encode_len(20), 32); } #[test] fn decode_len() { - assert_eq!(super::decode_len(32), 20) + assert_eq!(super::decode_len(0), 0); + assert_eq!(super::decode_len(32), 20); } } -- cgit 1.4.1