Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-09 22:49:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix windows compile

Browse Source
This commit is contained in:
Kangzhi Shi
2021-11-27 15:02:41 +02:00
parent fdd82fac78
commit e93f98c52e
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
vm/src/stdlib/winapi.rs
View File

@@ -5,8 +5,7 @@ pub(crate) use _winapi::make_module;
mod _winapi {
use crate::{
builtins::{PyListRef, PyStrRef},
function::{IntoPyException, OptionalArg},
protocol::PyMapping,
function::{ArgMapping, IntoPyException, OptionalArg},
stdlib::os::errno_err,
PyObjectRef, PyResult, PySequence, TryFromObject, VirtualMachine,
};
@@ -145,7 +144,7 @@ mod _winapi {
#[pyarg(positional)]
creation_flags: u32,
#[pyarg(positional)]
env_mapping: Option<PyMapping>,
env_mapping: Option<ArgMapping>,
#[pyarg(positional)]
current_dir: Option<PyStrRef>,
#[pyarg(positional)]
@@ -245,9 +244,9 @@ mod _winapi {
))
}
fn getenvironment(env: PyMapping, vm: &VirtualMachine) -> PyResult<Vec<u16>> {
let keys = env.keys(vm)?;
let values = env.values(vm)?;
fn getenvironment(env: ArgMapping, vm: &VirtualMachine) -> PyResult<Vec<u16>> {
let keys = env.mapping().keys(vm)?;
let values = env.mapping().values(vm)?;
let keys = PyListRef::try_from_object(vm, keys)?.borrow_vec().to_vec();
let values = PyListRef::try_from_object(vm, values)?
@@ -294,7 +293,7 @@ mod _winapi {
}
fn getattributelist(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<Option<AttrList>> {
<Option<PyMapping>>::try_from_object(vm, obj)?
<Option<ArgMapping>>::try_from_object(vm, obj)?
.map(|mapping| {
let handlelist = mapping
.as_ref()