mirrors/RustPython
0
0 Fork 0
mirror of https://github.com/RustPython/RustPython.git synced 2026-10-28 18:59:04 +08:00
Code Activity

Allow and document clippy::drain_collect (#8500)

Browse Source 
RustPython's tail call machinery pre-allocates and reuses a vector.
The code drains the vector into a new vector which is stored elsewhere.

Clippy warns that this pattern causes a spurious location. Clippy is
usually right that this pattern is suspect, but in this case the initial
vector is reused so we want to keep the initial location.
This commit is contained in:
Joshua Megnauth authored and GitHub committed 2026-08-13 04:30:53 +09:00
1 parent 8cfa667182
commit df44fa50df
2 files changed
+21 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

crates/vm/src/stdlib/_codecs.rs
+5 -6
View File
@@ -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];
crates/vm/src/vm/mod.rs
+16
View File
@@ -1467,6 +1467,10 @@ impl VirtualMachine {
let initial_ptr = self.take_pending_tailcall();
// Drain the refs that keep the initial callee's raw pointers alive.
#[allow(
clippy::drain_collect,
reason = "`pending_tailcall_refs`'s allocation is intentionally reused"
)]
let initial_refs = unsafe { &mut *self.pending_tailcall_refs.get() }
.drain(..)
.collect();
@@ -1498,6 +1502,10 @@ impl VirtualMachine {
let result = crate::frame::run_iframe(callee, self);
match result {
Ok(ExecutionResult::TailCall) => {
#[allow(
clippy::drain_collect,
reason = "`pending_tailcall_refs`'s allocation is intentionally reused"
)]
let refs = unsafe { &mut *self.pending_tailcall_refs.get() }
.drain(..)
.collect();
@@ -1548,6 +1556,10 @@ impl VirtualMachine {
let result = crate::frame::run_iframe(caller_iframe, self);
match result {
Ok(ExecutionResult::TailCall) => {
#[allow(
clippy::drain_collect,
reason = "`pending_tailcall_refs`'s allocation is intentionally reused"
)]
let refs = unsafe { &mut *self.pending_tailcall_refs.get() }
.drain(..)
.collect();
@@ -1609,6 +1621,10 @@ impl VirtualMachine {
let result = crate::frame::run_iframe(caller_iframe, self);
match result {
Ok(ExecutionResult::TailCall) => {
#[allow(
clippy::drain_collect,
reason = "`pending_tailcall_refs`'s allocation is intentionally reused"
)]
let refs = unsafe { &mut *self.pending_tailcall_refs.get() }
.drain(..)
.collect();