Skip to content

Commit e2ee933

Browse files
cthulahoopscthulahoops
authored
Merge pull request RustPython#514 from RustPython/joey/crate-imports
Replace most relative imports with 2018-style crate imports
2 parents dc3a44f + df76ffe commit e2ee933

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+245
-265
lines changed

‎parser/src/parser.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use std::iter;
22

3-
use super::ast;
4-
use super::error::ParseError;
5-
use super::lexer;
6-
use super::python;
7-
use super::token;
3+
use crate::ast;
4+
use crate::error::ParseError;
5+
use crate::lexer;
6+
use crate::python;
7+
use crate::token;
88

99
/*
1010
* Parse python code.

‎src/main.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ use rustpython_vm::{
1919
util, VirtualMachine,
2020
};
2121
use rustyline::{error::ReadlineError, Editor};
22-
use std::{
23-
error::Error,
24-
path::{Path, PathBuf},
25-
};
22+
use std::path::{Path, PathBuf};
2623

2724
fn main() {
2825
env_logger::init();

‎vm/src/builtins.rs

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,23 @@
44
55
// use std::ops::Deref;
66
use std::char;
7-
use std::error::Error;
87
use std::io::{self, Write};
98

10-
use super::compile;
11-
use super::obj::objbool;
12-
use super::obj::objdict;
13-
use super::obj::objint;
14-
use super::obj::objiter;
15-
use super::obj::objstr;
16-
use super::obj::objtype;
9+
use crate::compile;
10+
use crate::obj::objbool;
11+
use crate::obj::objdict;
12+
use crate::obj::objint;
13+
use crate::obj::objiter;
14+
use crate::obj::objstr;
15+
use crate::obj::objtype;
1716

18-
use super::pyobject::{
17+
use crate::pyobject::{
1918
AttributeProtocol, IdProtocol, PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyObjectRef,
2019
PyResult, Scope, TypeProtocol,
2120
};
22-
use super::stdlib::io::io_open;
21+
use crate::stdlib::io::io_open;
2322

24-
use super::vm::VirtualMachine;
23+
use crate::vm::VirtualMachine;
2524
use num_traits::{Signed, ToPrimitive};
2625

2726
fn get_locals(vm: &mut VirtualMachine) -> PyObjectRef {

‎vm/src/compile.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
//! https://github.com/python/cpython/blob/master/Python/compile.c
66
//! https://github.com/micropython/micropython/blob/master/py/compile.c
77
8-
use super::bytecode::{self, CallType, CodeObject, Instruction};
9-
use super::error::CompileError;
10-
use super::pyobject::{PyObject, PyObjectPayload, PyObjectRef};
8+
use crate::bytecode::{self, CallType, CodeObject, Instruction};
9+
use crate::error::CompileError;
10+
use crate::pyobject::{PyObject, PyObjectPayload, PyObjectRef};
1111
use num_complex::Complex64;
1212
use rustpython_parser::{ast, parser};
1313

@@ -1401,10 +1401,10 @@ impl Compiler {
14011401

14021402
#[cfg(test)]
14031403
mod tests {
1404-
use super::bytecode::CodeObject;
1405-
use super::bytecode::Constant::*;
1406-
use super::bytecode::Instruction::*;
14071404
use super::Compiler;
1405+
use crate::bytecode::CodeObject;
1406+
use crate::bytecode::Constant::*;
1407+
use crate::bytecode::Instruction::*;
14081408
use rustpython_parser::parser;
14091409
fn compile_exec(source: &str) -> CodeObject {
14101410
let mut compiler = Compiler::new();

‎vm/src/dictdatatype.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use super::obj::objbool;
2-
use super::obj::objint;
3-
use super::pyobject::{IdProtocol, PyObjectRef, PyResult};
4-
use super::vm::VirtualMachine;
1+
use crate::obj::objbool;
2+
use crate::obj::objint;
3+
use crate::pyobject::{IdProtocol, PyObjectRef, PyResult};
4+
use crate::vm::VirtualMachine;
55
use num_traits::ToPrimitive;
66
/// Ordered dictionary implementation.
77
/// Inspired by: https://morepypy.blogspot.com/2015/01/faster-more-memory-efficient-and-more.html

‎vm/src/eval.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ extern crate rustpython_parser;
22

33
use std::error::Error;
44

5-
use super::compile;
6-
use super::pyobject::{PyObjectRef, PyResult};
7-
use super::vm::VirtualMachine;
5+
use crate::compile;
6+
use crate::pyobject::{PyObjectRef, PyResult};
7+
use crate::vm::VirtualMachine;
88

99
pub fn eval(
1010
vm: &mut VirtualMachine,

‎vm/src/exceptions.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
use super::obj::objsequence;
2-
use super::obj::objstr;
3-
use super::obj::objtype;
4-
use super::pyobject::{
1+
use crate::obj::objsequence;
2+
use crate::obj::objstr;
3+
use crate::obj::objtype;
4+
use crate::pyobject::{
55
create_type, AttributeProtocol, PyContext, PyFuncArgs, PyObjectRef, PyResult, TypeProtocol,
66
};
7-
use super::vm::VirtualMachine;
7+
use crate::vm::VirtualMachine;
88

99
fn exception_init(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
1010
let zelf = args.args[0].clone();

‎vm/src/frame.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ use std::fmt;
55
use std::mem;
66
use std::path::PathBuf;
77

8-
use super::builtins;
9-
use super::bytecode;
10-
use super::import::{import, import_module};
11-
use super::obj::objbool;
12-
use super::obj::objcode;
13-
use super::obj::objdict;
14-
use super::obj::objiter;
15-
use super::obj::objlist;
16-
use super::obj::objstr;
17-
use super::obj::objtype;
18-
use super::pyobject::{
8+
use crate::builtins;
9+
use crate::bytecode;
10+
use crate::import::{import, import_module};
11+
use crate::obj::objbool;
12+
use crate::obj::objcode;
13+
use crate::obj::objdict;
14+
use crate::obj::objiter;
15+
use crate::obj::objlist;
16+
use crate::obj::objstr;
17+
use crate::obj::objtype;
18+
use crate::pyobject::{
1919
DictProtocol, IdProtocol, ParentProtocol, PyFuncArgs, PyObject, PyObjectPayload, PyObjectRef,
2020
PyResult, TypeProtocol,
2121
};
22-
use super::vm::VirtualMachine;
22+
use crate::vm::VirtualMachine;
2323
use num_bigint::BigInt;
2424

2525
#[derive(Clone, Debug)]

‎vm/src/import.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
use std::error::Error;
66
use std::path::PathBuf;
77

8-
use super::compile;
9-
use super::pyobject::{AttributeProtocol, DictProtocol, PyResult};
10-
use super::util;
11-
use super::vm::VirtualMachine;
8+
use crate::compile;
129
use crate::obj::{objsequence, objstr};
10+
use crate::pyobject::{AttributeProtocol, DictProtocol, PyResult};
11+
use crate::util;
12+
use crate::vm::VirtualMachine;
1313

1414
fn import_uncached_module(
1515
vm: &mut VirtualMachine,

‎vm/src/obj/objbool.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
use super::super::pyobject::{
1+
use super::objtype;
2+
use crate::pyobject::{
23
PyContext, PyFuncArgs, PyObjectPayload, PyObjectRef, PyResult, TypeProtocol,
34
};
4-
use super::super::vm::VirtualMachine;
5-
use super::objtype;
5+
use crate::vm::VirtualMachine;
66
use num_traits::Zero;
77

88
pub fn boolval(vm: &mut VirtualMachine, obj: PyObjectRef) -> Result<bool, PyObjectRef> {

‎vm/src/obj/objbytearray.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
//! Implementation of the python bytearray object.
22
3-
use super::super::pyobject::{
4-
PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyResult, TypeProtocol,
5-
};
3+
use crate::pyobject::{PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyResult, TypeProtocol};
64

75
use super::objint;
86

9-
use super::super::vm::VirtualMachine;
107
use super::objbytes::get_mut_value;
118
use super::objbytes::get_value;
129
use super::objtype;
10+
use crate::vm::VirtualMachine;
1311
use num_traits::ToPrimitive;
1412

1513
// Binary data support

‎vm/src/obj/objbytes.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
use super::super::pyobject::{
2-
PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyObjectRef, PyResult, TypeProtocol,
3-
};
4-
use super::super::vm::VirtualMachine;
51
use super::objint;
62
use super::objtype;
3+
use crate::pyobject::{
4+
PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyObjectRef, PyResult, TypeProtocol,
5+
};
6+
use crate::vm::VirtualMachine;
77
use num_traits::ToPrimitive;
88
use std::cell::Ref;
99
use std::cell::RefMut;

‎vm/src/obj/objcode.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
33
*/
44

5-
use super::super::bytecode;
6-
use super::super::pyobject::{
5+
use super::objtype;
6+
use crate::bytecode;
7+
use crate::pyobject::{
78
IdProtocol, PyContext, PyFuncArgs, PyObjectPayload, PyObjectRef, PyResult, TypeProtocol,
89
};
9-
use super::super::vm::VirtualMachine;
10-
use super::objtype;
10+
use crate::vm::VirtualMachine;
1111

1212
pub fn init(context: &PyContext) {
1313
let code_type = &context.code_type;

‎vm/src/obj/objcomplex.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
use super::super::pyobject::{
2-
PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyObjectRef, PyResult, TypeProtocol,
3-
};
4-
use super::super::vm::VirtualMachine;
51
use super::objfloat;
62
use super::objint;
73
use super::objtype;
4+
use crate::pyobject::{
5+
PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyObjectRef, PyResult, TypeProtocol,
6+
};
7+
use crate::vm::VirtualMachine;
88
use num_complex::Complex64;
99
use num_traits::ToPrimitive;
1010

‎vm/src/obj/objdict.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
use super::super::pyobject::{
2-
PyAttributes, PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyObjectRef, PyResult,
3-
TypeProtocol,
4-
};
5-
use super::super::vm::{ReprGuard, VirtualMachine};
61
use super::objiter;
72
use super::objstr;
83
use super::objtype;
4+
use crate::pyobject::{
5+
PyAttributes, PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyObjectRef, PyResult,
6+
TypeProtocol,
7+
};
8+
use crate::vm::{ReprGuard, VirtualMachine};
99
use std::cell::{Ref, RefCell, RefMut};
1010
use std::collections::HashMap;
1111
use std::ops::{Deref, DerefMut};

‎vm/src/obj/objenumerate.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
use super::super::pyobject::{
2-
PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyResult, TypeProtocol,
3-
};
4-
use super::super::vm::VirtualMachine;
51
use super::objint;
62
use super::objiter;
73
use super::objtype; // Required for arg_check! to use isinstance
4+
use crate::pyobject::{PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyResult, TypeProtocol};
5+
use crate::vm::VirtualMachine;
86
use num_bigint::BigInt;
97
use num_traits::Zero;
108
use std::ops::AddAssign;

‎vm/src/obj/objfilter.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
use super::super::pyobject::{
2-
IdProtocol, PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyResult, TypeProtocol,
3-
};
4-
use super::super::vm::VirtualMachine;
51
use super::objbool;
62
use super::objiter;
7-
use super::objtype; // Required for arg_check! to use isinstance
3+
use super::objtype;
4+
use crate::pyobject::{
5+
IdProtocol, PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyResult, TypeProtocol,
6+
};
7+
use crate::vm::VirtualMachine; // Required for arg_check! to use isinstance
88

99
fn filter_new(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
1010
arg_check!(

‎vm/src/obj/objfloat.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
use super::super::pyobject::{
2-
PyContext, PyFuncArgs, PyObjectPayload, PyObjectRef, PyResult, TypeProtocol,
3-
};
4-
use super::super::vm::VirtualMachine;
51
use super::objbytes;
62
use super::objint;
73
use super::objstr;
84
use super::objtype;
5+
use crate::pyobject::{
6+
PyContext, PyFuncArgs, PyObjectPayload, PyObjectRef, PyResult, TypeProtocol,
7+
};
8+
use crate::vm::VirtualMachine;
99
use num_bigint::ToBigInt;
1010
use num_traits::ToPrimitive;
1111

‎vm/src/obj/objframe.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
33
*/
44

5-
use super::super::frame::Frame;
6-
use super::super::pyobject::{
5+
use super::objtype;
6+
use crate::frame::Frame;
7+
use crate::pyobject::{
78
PyContext, PyFuncArgs, PyObjectPayload, PyObjectRef, PyResult, TypeProtocol,
89
};
9-
use super::super::vm::VirtualMachine;
10-
use super::objtype;
10+
use crate::vm::VirtualMachine;
1111

1212
pub fn init(context: &PyContext) {
1313
let frame_type = &context.frame_type;

‎vm/src/obj/objfunction.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
use super::super::pyobject::{
1+
use super::objtype;
2+
use crate::pyobject::{
23
AttributeProtocol, IdProtocol, PyContext, PyFuncArgs, PyObjectPayload, PyResult, TypeProtocol,
34
};
4-
use super::super::vm::VirtualMachine;
5-
use super::objtype;
5+
use crate::vm::VirtualMachine;
66

77
pub fn init(context: &PyContext) {
88
let function_type = &context.function_type;

‎vm/src/obj/objgenerator.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
* The mythical generator.
33
*/
44

5-
use super::super::frame::{ExecutionResult, Frame};
6-
use super::super::pyobject::{
5+
use super::objtype;
6+
use crate::frame::{ExecutionResult, Frame};
7+
use crate::pyobject::{
78
PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyObjectRef, PyResult, TypeProtocol,
89
};
9-
use super::super::vm::VirtualMachine;
10-
use super::objtype;
10+
use crate::vm::VirtualMachine;
1111

1212
pub fn init(context: &PyContext) {
1313
let generator_type = &context.generator_type;

‎vm/src/obj/objint.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
use super::super::format::FormatSpec;
2-
use super::super::pyobject::{
3-
FromPyObjectRef, PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyObjectRef, PyResult,
4-
TypeProtocol,
5-
};
6-
use super::super::vm::VirtualMachine;
71
use super::objfloat;
82
use super::objstr;
93
use super::objtype;
4+
use crate::format::FormatSpec;
5+
use crate::pyobject::{
6+
FromPyObjectRef, PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyObjectRef, PyResult,
7+
TypeProtocol,
8+
};
9+
use crate::vm::VirtualMachine;
1010
use num_bigint::{BigInt, ToBigInt};
1111
use num_integer::Integer;
1212
use num_traits::{Pow, Signed, ToPrimitive, Zero};

‎vm/src/obj/objiter.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
* Various types to support iteration.
33
*/
44

5-
use super::super::pyobject::{
5+
use super::objbool;
6+
use crate::pyobject::{
67
PyContext, PyFuncArgs, PyObjectPayload, PyObjectRef, PyResult, TypeProtocol,
78
};
8-
use super::super::vm::VirtualMachine;
9-
use super::objbool;
9+
use crate::vm::VirtualMachine;
1010
// use super::objstr;
1111
use super::objtype; // Required for arg_check! to use isinstance
1212

0 commit comments

Comments
 (0)