Address review: drop decorative separators and unused zstd crate

Remove the remaining `// ===...` section separators from zstd.rs per the project comment guidelines, drop the unused `zstd` crate dependency (only zstd-safe/zstd-sys are used) and declare zstd-safe's std feature explicitly instead of relying on the zstd crate's feature unification, and convert a doc comment on #[extend_class] to a regular comment.
JamesClarke7283 · May 23, 2026 · May 23, 2026 · May 23, 2026 · May 23, 2026 · May 23, 2026
commit dbe4626d0bebd7af878e1815ae32ed4d8680b5cb
diff --git a/Cargo.toml b/Cargo.toml
@@ -323,8 +323,7 @@ x509-cert = "0.3.0"
 x509-parser = "0.18"
 xml = "1.3"
 writeable = "0.6"
-zstd = { version = "0.13", default-features = false, features = ["zdict_builder"] }
-zstd-safe = { version = "7", default-features = false, features = ["zdict_builder"] }
+zstd-safe = { version = "7", default-features = false, features = ["std", "zdict_builder"] }
 
 # Lints
 

diff --git a/crates/stdlib/Cargo.toml b/crates/stdlib/Cargo.toml
@@ -121,7 +121,6 @@ pkcs8 = { workspace = true, features = ["encryption", "pkcs5", "pem"], optional
 libsqlite3-sys = { workspace = true, features = ["bundled"], optional = true }
 xz = { workspace = true }
 xz-sys = { workspace = true }
-zstd = { workspace = true }
 zstd-safe = { workspace = true }
 
 [target.'cfg(windows)'.dependencies]

diff --git a/crates/stdlib/src/zstd.rs b/crates/stdlib/src/zstd.rs
@@ -39,10 +39,6 @@ mod _zstd {
     use zstd_safe::zstd_sys;
     use zstd_safe::{CCtx, CParameter, DCtx, DParameter, InBuffer, OutBuffer};
 
-    // =========================================================================
-    // Module-level constants
-    // =========================================================================
-
     #[pyattr]
     const ZSTD_CLEVEL_DEFAULT: i32 = zstd_sys::ZSTD_CLEVEL_DEFAULT as i32;
 
@@ -138,10 +134,6 @@ mod _zstd {
     const DICT_TYPE_UNDIGESTED: i32 = 1;
     const DICT_TYPE_PREFIX: i32 = 2;
 
-    // =========================================================================
-    // ZstdError exception
-    // =========================================================================
-
     #[pyattr(once, name = "ZstdError")]
     fn zstd_error(vm: &VirtualMachine) -> PyTypeRef {
         vm.ctx.new_exception_type(
@@ -163,10 +155,6 @@ mod _zstd {
         new_zstd_error(zstd_safe::get_error_name(code).to_string(), vm)
     }
 
-    // =========================================================================
-    // Parameter helpers
-    // =========================================================================
-
     /// Reject an options-dict `key` whose class is the parameter enum that is
     /// invalid for the caller's context (a `CompressionParameter` passed to a
     /// decompressor, or vice versa) with a `TypeError` naming the type.
@@ -442,10 +430,6 @@ mod _zstd {
         Err(vm.new_type_error("zstd_dict argument should be a ZstdDict object"))
     }
 
-    // =========================================================================
-    // ZstdDict
-    // =========================================================================
-
     #[derive(FromArgs)]
     pub(super) struct ZstdDictArgs {
         #[pyarg(positional)]
@@ -558,10 +542,6 @@ mod _zstd {
         }
     }
 
-    // =========================================================================
-    // ZstdCompressor
-    // =========================================================================
-
     // The three flush modes for `ZstdCompressor.compress()`, mirrored as
     // class attributes via `extend_class` below. Values are positional and
     // chosen to match what CPython exposes.
@@ -1050,10 +1030,10 @@ mod _zstd {
             self.state.lock().last_mode
         }
 
-        /// Install class-level constants `CONTINUE`, `FLUSH_BLOCK`, and
-        /// `FLUSH_FRAME` so callers can reference them as
-        /// `ZstdCompressor.FLUSH_FRAME` (as the Python `ZstdFile` wrapper
-        /// does).
+        // Install class-level constants `CONTINUE`, `FLUSH_BLOCK`, and
+        // `FLUSH_FRAME` so callers can reference them as
+        // `ZstdCompressor.FLUSH_FRAME` (as the Python `ZstdFile` wrapper
+        // does).
         #[extend_class]
         fn extend_class(ctx: &Context, class: &'static Py<PyType>) {
             class.set_attr(
@@ -1085,10 +1065,6 @@ mod _zstd {
         mode: Option<i32>,
     }
 
-    // =========================================================================
-    // ZstdDecompressor
-    // =========================================================================
-
     /// Internal state of a `ZstdDecompressor`. The CPython decompressor is
     /// single-frame: once we hit end-of-frame, additional bytes go into
     /// `unused_data` and further `decompress` calls raise `EOFError`. Field
@@ -1339,10 +1315,6 @@ mod _zstd {
         }
     }
 
-    // =========================================================================
-    // Module-level functions
-    // =========================================================================
-
     #[pyfunction]
     fn get_frame_size(frame_buffer: ArgBytesLike, vm: &VirtualMachine) -> PyResult<usize> {
         let buf = frame_buffer.with_ref(|b| b.to_vec());