Skip to content

Commit 9a2eef6

Browse files
committed
fix compile
1 parent ca4e8f5 commit 9a2eef6

File tree

9 files changed

+7
-12
lines changed

9 files changed

+7
-12
lines changed

benches/microbenchmarks.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use criterion::{
44
};
55
use rustpython_compiler::Mode;
66
use rustpython_vm::{
7-
common::ascii, InitParameter, Interpreter, ItemProtocol, PyObjectWrap, PyResult, PySettings,
7+
common::ascii, InitParameter, Interpreter, PyObjectWrap, PyResult, PySettings,
88
};
99
use std::path::{Path, PathBuf};
1010
use std::{ffi, fs, io};

examples/mini_repl.rs

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
use rustpython_vm as vm;
77
// these are needed for special memory shenanigans to let us share a variable with Python and Rust
88
use std::sync::atomic::{AtomicBool, Ordering};
9-
// this needs to be in scope in order to insert things into scope.globals
10-
use vm::ItemProtocol;
119

1210
// This has to be a macro because it uses the py_compile macro,
1311
// which compiles python source to optimized bytecode at compile time, so that

stdlib/src/scproxy.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ mod _scproxy {
77
use crate::vm::{
88
builtins::{PyDictRef, PyStr},
99
function::IntoPyObject,
10-
ItemProtocol, PyResult, VirtualMachine,
10+
PyResult, VirtualMachine,
1111
};
1212
use system_configuration::core_foundation::{
1313
array::CFArray,

stdlib/src/ssl.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ mod _ssl {
3939
stdlib::os::PyPathLike,
4040
types::Constructor,
4141
utils::{Either, ToCString},
42-
ItemProtocol, PyObjectRef, PyObjectWeak, PyRef, PyResult, PyValue, VirtualMachine,
42+
PyObjectRef, PyObjectWeak, PyRef, PyResult, PyValue, VirtualMachine,
4343
},
4444
};
4545
use crossbeam_utils::atomic::AtomicCell;

vm/src/builtins/function/jitfunc.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ use crate::{
22
builtins::{float, int, pybool, PyBaseExceptionRef, PyDictRef, PyFunction, PyStrRef},
33
bytecode::CodeFlags,
44
function::{FuncArgs, IntoPyObject},
5-
IdProtocol, ItemProtocol, PyObject, PyObjectRef, PyResult, TryFromObject, TypeProtocol,
6-
VirtualMachine,
5+
IdProtocol, PyObject, PyObjectRef, PyResult, TryFromObject, TypeProtocol, VirtualMachine,
76
};
87
use num_traits::ToPrimitive;
98
use rustpython_jit::{AbiValue, Args, CompiledCode, JitArgumentError, JitType};

vm/src/stdlib/nt.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ pub(crate) mod module {
2525
use std::io;
2626
use std::{env, fs};
2727

28+
use crate::builtins::PyDictRef;
2829
#[cfg(target_env = "msvc")]
2930
use crate::builtins::PyListRef;
30-
use crate::{builtins::PyDictRef, ItemProtocol};
3131
use winapi::{um, vc::vcruntime::intptr_t};
3232

3333
#[pyattr]

vm/src/stdlib/posix_compat.rs

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ pub(crate) mod module {
4545
#[cfg(target_os = "wasi")]
4646
#[pyattr]
4747
fn environ(vm: &VirtualMachine) -> crate::builtins::PyDictRef {
48-
use crate::ItemProtocol;
4948
use ffi_ext::OsStringExt;
5049

5150
let environ = vm.ctx.new_dict();

vm/src/stdlib/winapi.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ mod _winapi {
88
function::{IntoPyException, OptionalArg},
99
protocol::PyMapping,
1010
stdlib::os::errno_err,
11-
ItemProtocol, PyObjectRef, PyResult, PySequence, TryFromObject, VirtualMachine,
11+
PyObjectRef, PyResult, PySequence, TryFromObject, VirtualMachine,
1212
};
1313
use std::ptr::{null, null_mut};
1414
use winapi::shared::winerror;

wasm/lib/src/convert.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ use rustpython_vm::{
77
compile::{CompileError, CompileErrorType},
88
exceptions,
99
function::{ArgBytesLike, FuncArgs},
10-
py_serde, ItemProtocol, PyObjectRef, PyResult, PyValue, TryFromBorrowedObject, TypeProtocol,
11-
VirtualMachine,
10+
py_serde, PyObjectRef, PyResult, PyValue, TryFromBorrowedObject, TypeProtocol, VirtualMachine,
1211
};
1312
use wasm_bindgen::{closure::Closure, prelude::*, JsCast};
1413

0 commit comments

Comments
 (0)