From 80404d3bd505a4b625c66986f800375f15784148 Mon Sep 17 00:00:00 2001 From: misilelaboratory Date: Sat, 19 Nov 2022 12:31:59 +0900 Subject: [PATCH 1/2] fix: deprecated function --- vm/src/frame.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vm/src/frame.rs b/vm/src/frame.rs index 222241f412..d2a8315225 100644 --- a/vm/src/frame.rs +++ b/vm/src/frame.rs @@ -20,6 +20,7 @@ use crate::{ AsObject, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, TryFromObject, VirtualMachine, }; use indexmap::IndexMap; +use std::iter::zip; use itertools::Itertools; use std::fmt; #[cfg(feature = "threading")] @@ -193,7 +194,7 @@ impl FrameRef { let j = std::cmp::min(map.len(), code.varnames.len()); if !code.varnames.is_empty() { let fastlocals = self.fastlocals.lock(); - for (&k, v) in itertools::zip(&map[..j], &**fastlocals) { + for (&k, v) in zip(&map[..j], &**fastlocals) { match locals.mapping().ass_subscript(k, v.clone(), vm) { Ok(()) => {} Err(e) if e.fast_isinstance(vm.ctx.exceptions.key_error) => {} @@ -203,7 +204,7 @@ impl FrameRef { } if !code.cellvars.is_empty() || !code.freevars.is_empty() { let map_to_dict = |keys: &[&PyStrInterned], values: &[PyCellRef]| { - for (&k, v) in itertools::zip(keys, values) { + for (&k, v) in zip(keys, values) { if let Some(value) = v.get() { locals.mapping().ass_subscript(k, Some(value), vm)?; } else { From 270b2ba98f02d29f3e801590f51c0f34b855b45e Mon Sep 17 00:00:00 2001 From: misilelaboratory Date: Sat, 19 Nov 2022 21:54:17 +0900 Subject: [PATCH 2/2] fix: cargo fmt --- vm/src/frame.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vm/src/frame.rs b/vm/src/frame.rs index d2a8315225..bfe3dd6290 100644 --- a/vm/src/frame.rs +++ b/vm/src/frame.rs @@ -20,9 +20,9 @@ use crate::{ AsObject, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, TryFromObject, VirtualMachine, }; use indexmap::IndexMap; -use std::iter::zip; use itertools::Itertools; use std::fmt; +use std::iter::zip; #[cfg(feature = "threading")] use std::sync::atomic;