RustPython
diff --git a/‎crates/vm/src/stdlib/_codecs.rs‎
Lines changed: 5 additions & 6 deletions b/‎crates/vm/src/stdlib/_codecs.rs‎
Lines changed: 5 additions & 6 deletions
diff --git a/‎crates/vm/src/vm/mod.rs‎
Lines changed: 4 additions & 9 deletions b/‎crates/vm/src/vm/mod.rs‎
Lines changed: 4 additions & 9 deletions
@@ -791,19 +791,18 @@ mod _codecs_windows {
 
             // Convert code point to UTF-16
             let mut wchars = [0u16; 2];
-            let wchar_len;
             let is_surrogate = (0xD800..=0xDFFF).contains(&ch);
 
-            if is_surrogate {
-                wchar_len = 0; // Can't encode surrogates normally
+            let wchar_len = if is_surrogate {
+                0 // Can't encode surrogates normally
             } else if ch < 0x10000 {
                 wchars[0] = ch as u16;
-                wchar_len = 1;
+                1
             } else {
                 wchars[0] = ((ch - 0x10000) >> 10) as u16 + 0xD800;
                 wchars[1] = ((ch - 0x10000) & 0x3FF) as u16 + 0xDC00;
-                wchar_len = 2;
-            }
+                2
+            };
 
             if !is_surrogate {
                 let mut buf = [0u8; 8];
 
@@ -50,6 +50,7 @@ use core::ptr::NonNull;
 use core::sync::atomic::AtomicI64;
 use core::{
     cell::{Cell, OnceCell, RefCell},
+    mem,
     sync::atomic::{AtomicBool, AtomicU64, Ordering},
 };
 use crossbeam_utils::atomic::AtomicCell;
@@ -1467,9 +1468,7 @@ impl VirtualMachine {
 
         let initial_ptr = self.take_pending_tailcall();
         // Drain the refs that keep the initial callee's raw pointers alive.
-        let initial_refs = unsafe { &mut *self.pending_tailcall_refs.get() }
-            .drain(..)
-            .collect();
+        let initial_refs = mem::take(unsafe { &mut *self.pending_tailcall_refs.get() });
         frame_stack.push(SuspendedFrame {
             iframe: iframe as *mut crate::frame::InterpreterFrame,
             entry_state,
@@ -1498,9 +1497,7 @@ impl VirtualMachine {
                     let result = crate::frame::run_iframe(callee, self);
                     match result {
                         Ok(ExecutionResult::TailCall) => {
-                            let refs = unsafe { &mut *self.pending_tailcall_refs.get() }
-                                .drain(..)
-                                .collect();
+                            let refs = mem::take(unsafe { &mut *self.pending_tailcall_refs.get() });
                             frame_stack.push(SuspendedFrame {
                                 iframe: callee_ptr,
                                 entry_state: callee_entry,
@@ -1548,9 +1545,7 @@ impl VirtualMachine {
                     let result = crate::frame::run_iframe(caller_iframe, self);
                     match result {
                         Ok(ExecutionResult::TailCall) => {
-                            let refs = unsafe { &mut *self.pending_tailcall_refs.get() }
-                                .drain(..)
-                                .collect();
+                            let refs = mem::take(unsafe { &mut *self.pending_tailcall_refs.get() });
                             drop(_caller_refs);
                             frame_stack.push(SuspendedFrame {
                                 iframe: caller_iframe_ptr,