fixes and formatting

arihant2math · arihant2math · commit ce6807b312a7 · 2025-04-20T17:01:06.000-07:00
diff --git a/stdlib/src/lzma.rs b/stdlib/src/lzma.rs
@@ -39,6 +39,11 @@ mod _lzma {
     use std::fmt;
     use xz2::stream::{Action, Check, Error, Filters, Status, Stream};
 
+    #[cfg(windows)]
+    type EnumVal = i32;
+    #[cfg(not(windows))]
+    type EnumVal = u32;
+
     const BUFSIZ: usize = 8192;
     // TODO: can't find this in lzma-sys, but find way not to hardcode this
     #[pyattr]
@@ -268,8 +273,11 @@ mod _lzma {
     }
 
     fn int_to_check(check: i32) -> Option<Check> {
-        match check {
-            -1 | CHECK_NONE => Some(Check::None),
+        if check == -1 {
+            return Some(Check::None);
+        }
+        match check as EnumVal {
+            CHECK_NONE => Some(Check::None),
             CHECK_CRC32 => Some(Check::Crc32),
             CHECK_CRC64 => Some(Check::Crc64),
             CHECK_SHA256 => Some(Check::Sha256),
@@ -374,7 +382,7 @@ mod _lzma {
 
         fn py_new(_cls: PyTypeRef, args: Self::Args, vm: &VirtualMachine) -> PyResult {
             let preset = args.preset.unwrap_or(PRESET_DEFAULT);
-            if args.format != FORMAT_XZ && args.check != -1 && args.check != CHECK_NONE {
+            if args.format != FORMAT_XZ as _ && args.check != -1 && args.check != CHECK_NONE as _ {
                 return Err(new_lzma_error(
                     "Integrity checks are only supported by FORMAT_XZ",
                     vm,
diff --git a/stdlib/src/zlib.rs b/stdlib/src/zlib.rs
@@ -573,10 +573,9 @@ mod zlib {
             flush: Self::Flush,
             vm: &VirtualMachine,
         ) -> PyResult<Self::Status> {
-            Ok(self
-                .compress
+            self.compress
                 .compress_vec(input, output, flush)
-                .map_err(|_| new_zlib_error("error while compressing", vm))?)
+                .map_err(|_| new_zlib_error("error while compressing", vm))
         }
 
         fn total_in(&mut self) -> usize {
