Apply coderabbit reviews

youknowone · youknowone · commit 5677cf84aea1 · 2025-06-15T15:33:58.000+09:00
diff --git a/src/shell.rs b/src/shell.rs
@@ -152,6 +152,7 @@ pub fn run_shell(vm: &VirtualMachine, scope: Scope) -> PyResult<()> {
         continuing_line = false;
         let result = match repl.readline(prompt) {
             ReadlineResult::Line(line) => {
+                #[cfg(debug_assertions)]
                 debug!("You entered {line:?}");
 
                 repl.add_history_entry(line.trim_end()).unwrap();
diff --git a/stdlib/src/csv.rs b/stdlib/src/csv.rs
@@ -346,10 +346,9 @@ mod _csv {
         if !rest.args.is_empty() {
             let arg_len = rest.args.len();
             if arg_len != 1 {
-                return Err(vm.new_type_error(
-                    format!("field_size_limit() takes at most 1 argument ({arg_len} given)")
-                        .to_string(),
-                ));
+                return Err(vm.new_type_error(format!(
+                    "field_size_limit() takes at most 1 argument ({arg_len} given)"
+                )));
             }
             let Ok(new_size) = rest.args.first().unwrap().try_int(vm) else {
                 return Err(vm.new_type_error("limit must be an integer".to_string()));
diff --git a/vm/src/frame.rs b/vm/src/frame.rs
@@ -1667,6 +1667,7 @@ impl ExecutingFrame<'_> {
                 .topmost_exception()
                 .ok_or_else(|| vm.new_runtime_error("No active exception to reraise".to_owned()))?,
         };
+        #[cfg(debug_assertions)]
         debug!("Exception raised: {exception:?} with cause: {cause:?}");
         if let Some(cause) = cause {
             exception.set_cause(cause);
diff --git a/vm/src/protocol/number.rs b/vm/src/protocol/number.rs
@@ -476,7 +476,7 @@ impl PyNumber<'_> {
                     format!(
                         "__int__ returned non-int (type {ret_class}).  \
                     The ability to return an instance of a strict subclass of int \
-                    is deprecated, and may be removed in a future version of Python.",
+                    is deprecated, and may be removed in a future version of Python."
                     ),
                     1,
                     vm,
@@ -509,7 +509,7 @@ impl PyNumber<'_> {
                     format!(
                         "__index__ returned non-int (type {ret_class}).  \
                     The ability to return an instance of a strict subclass of int \
-                    is deprecated, and may be removed in a future version of Python.",
+                    is deprecated, and may be removed in a future version of Python."
                     ),
                     1,
                     vm,
@@ -542,7 +542,7 @@ impl PyNumber<'_> {
                     format!(
                         "__float__ returned non-float (type {ret_class}).  \
                     The ability to return an instance of a strict subclass of float \
-                    is deprecated, and may be removed in a future version of Python.",
+                    is deprecated, and may be removed in a future version of Python."
                     ),
                     1,
                     vm,
diff --git a/vm/src/stdlib/ctypes/function.rs b/vm/src/stdlib/ctypes/function.rs
@@ -13,6 +13,7 @@ use libffi::middle::{Arg, Cif, CodePtr, Type};
 use libloading::Symbol;
 use num_traits::ToPrimitive;
 use rustpython_common::lock::PyRwLock;
+use std::ffi::CString;
 use std::fmt::Debug;
 
 // https://github.com/python/cpython/blob/4f8bb3947cfbc20f970ff9d9531e1132a9e95396/Modules/_ctypes/callproc.c#L15
@@ -77,10 +78,11 @@ impl Function {
                 }
             })
             .collect::<PyResult<Vec<Type>>>()?;
-        let terminated = format!("{function}\0");
+        let c_function_name = CString::new(function)
+            .map_err(|_| vm.new_value_error("Function name contains null bytes".to_string()))?;
         let pointer: Symbol<'_, FP> = unsafe {
             library
-                .get(terminated.as_bytes())
+                .get(c_function_name.as_bytes())
                 .map_err(|err| err.to_string())
                 .map_err(|err| vm.new_attribute_error(err))?
         };
