diff --git a/benches/microbenchmarks.rs b/benches/microbenchmarks.rs index ddfdb57c2..bbed9a890 100644 --- a/benches/microbenchmarks.rs +++ b/benches/microbenchmarks.rs @@ -4,7 +4,7 @@ use criterion::{ }; use rustpython_compiler::Mode; use rustpython_vm::{ - common::ascii, InitParameter, Interpreter, ItemProtocol, PyObjectWrap, PyResult, PySettings, + common::ascii, InitParameter, Interpreter, PyObjectWrap, PyResult, PySettings, }; use std::path::{Path, PathBuf}; use std::{ffi, fs, io}; diff --git a/examples/mini_repl.rs b/examples/mini_repl.rs index 87bf9b7c3..7e4bf2098 100644 --- a/examples/mini_repl.rs +++ b/examples/mini_repl.rs @@ -6,8 +6,6 @@ use rustpython_vm as vm; // these are needed for special memory shenanigans to let us share a variable with Python and Rust use std::sync::atomic::{AtomicBool, Ordering}; -// this needs to be in scope in order to insert things into scope.globals -use vm::ItemProtocol; // This has to be a macro because it uses the py_compile macro, // which compiles python source to optimized bytecode at compile time, so that diff --git a/stdlib/src/scproxy.rs b/stdlib/src/scproxy.rs index baceb9167..9e5c63c85 100644 --- a/stdlib/src/scproxy.rs +++ b/stdlib/src/scproxy.rs @@ -7,7 +7,7 @@ mod _scproxy { use crate::vm::{ builtins::{PyDictRef, PyStr}, function::IntoPyObject, - ItemProtocol, PyResult, VirtualMachine, + PyResult, VirtualMachine, }; use system_configuration::core_foundation::{ array::CFArray, diff --git a/stdlib/src/ssl.rs b/stdlib/src/ssl.rs index ad5578b1d..7fe420c68 100644 --- a/stdlib/src/ssl.rs +++ b/stdlib/src/ssl.rs @@ -39,7 +39,7 @@ mod _ssl { stdlib::os::PyPathLike, types::Constructor, utils::{Either, ToCString}, - ItemProtocol, PyObjectRef, PyObjectWeak, PyRef, PyResult, PyValue, VirtualMachine, + PyObjectRef, PyObjectWeak, PyRef, PyResult, PyValue, VirtualMachine, }, }; use crossbeam_utils::atomic::AtomicCell; diff --git a/vm/src/builtins/function/jitfunc.rs b/vm/src/builtins/function/jitfunc.rs index 3b97f299e..4d99fe3f8 100644 --- a/vm/src/builtins/function/jitfunc.rs +++ b/vm/src/builtins/function/jitfunc.rs @@ -2,8 +2,7 @@ use crate::{ builtins::{float, int, pybool, PyBaseExceptionRef, PyDictRef, PyFunction, PyStrRef}, bytecode::CodeFlags, function::{FuncArgs, IntoPyObject}, - IdProtocol, ItemProtocol, PyObject, PyObjectRef, PyResult, TryFromObject, TypeProtocol, - VirtualMachine, + IdProtocol, PyObject, PyObjectRef, PyResult, TryFromObject, TypeProtocol, VirtualMachine, }; use num_traits::ToPrimitive; use rustpython_jit::{AbiValue, Args, CompiledCode, JitArgumentError, JitType}; diff --git a/vm/src/stdlib/nt.rs b/vm/src/stdlib/nt.rs index 277094e99..5a8d12ac3 100644 --- a/vm/src/stdlib/nt.rs +++ b/vm/src/stdlib/nt.rs @@ -25,9 +25,9 @@ pub(crate) mod module { use std::io; use std::{env, fs}; + use crate::builtins::PyDictRef; #[cfg(target_env = "msvc")] use crate::builtins::PyListRef; - use crate::{builtins::PyDictRef, ItemProtocol}; use winapi::{um, vc::vcruntime::intptr_t}; #[pyattr] diff --git a/vm/src/stdlib/posix_compat.rs b/vm/src/stdlib/posix_compat.rs index 3a958f662..487f359ff 100644 --- a/vm/src/stdlib/posix_compat.rs +++ b/vm/src/stdlib/posix_compat.rs @@ -45,7 +45,6 @@ pub(crate) mod module { #[cfg(target_os = "wasi")] #[pyattr] fn environ(vm: &VirtualMachine) -> crate::builtins::PyDictRef { - use crate::ItemProtocol; use ffi_ext::OsStringExt; let environ = vm.ctx.new_dict(); diff --git a/vm/src/stdlib/winapi.rs b/vm/src/stdlib/winapi.rs index 33b86cf8a..2aea4cfe6 100644 --- a/vm/src/stdlib/winapi.rs +++ b/vm/src/stdlib/winapi.rs @@ -8,7 +8,7 @@ mod _winapi { function::{IntoPyException, OptionalArg}, protocol::PyMapping, stdlib::os::errno_err, - ItemProtocol, PyObjectRef, PyResult, PySequence, TryFromObject, VirtualMachine, + PyObjectRef, PyResult, PySequence, TryFromObject, VirtualMachine, }; use std::ptr::{null, null_mut}; use winapi::shared::winerror; diff --git a/wasm/lib/src/convert.rs b/wasm/lib/src/convert.rs index c71c4e1ec..0e7972391 100644 --- a/wasm/lib/src/convert.rs +++ b/wasm/lib/src/convert.rs @@ -7,8 +7,7 @@ use rustpython_vm::{ compile::{CompileError, CompileErrorType}, exceptions, function::{ArgBytesLike, FuncArgs}, - py_serde, ItemProtocol, PyObjectRef, PyResult, PyValue, TryFromBorrowedObject, TypeProtocol, - VirtualMachine, + py_serde, PyObjectRef, PyResult, PyValue, TryFromBorrowedObject, TypeProtocol, VirtualMachine, }; use wasm_bindgen::{closure::Closure, prelude::*, JsCast};