Skip to content

Commit a48340d

Browse files
OddCoincidenceOddCoincidence
authored
Merge pull request RustPython#651 from RustPython/make_module_not_mk_module
Rename mk_module to make_module.
2 parents cf659b8 + 2449c12 commit a48340d

21 files changed

+38
-38
lines changed

‎vm/src/stdlib/ast.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ fn ast_parse(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
621621
Ok(ast_node)
622622
}
623623

624-
pub fn mk_module(ctx: &PyContext) -> PyObjectRef {
624+
pub fn make_module(ctx: &PyContext) -> PyObjectRef {
625625
py_module!(ctx, "ast", {
626626
"parse" => ctx.new_rustfunc(ast_parse),
627627
"Module" => py_class!(ctx, "_ast.Module", ctx.object(), {}),

‎vm/src/stdlib/dis.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fn dis_disassemble(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
2222
Ok(vm.get_none())
2323
}
2424

25-
pub fn mk_module(ctx: &PyContext) -> PyObjectRef {
25+
pub fn make_module(ctx: &PyContext) -> PyObjectRef {
2626
py_module!(ctx, "dis", {
2727
"dis" => ctx.new_rustfunc(dis_dis),
2828
"disassemble" => ctx.new_rustfunc(dis_disassemble)

‎vm/src/stdlib/io.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ pub fn io_open(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
365365
}
366366
}
367367

368-
pub fn mk_module(ctx: &PyContext) -> PyObjectRef {
368+
pub fn make_module(ctx: &PyContext) -> PyObjectRef {
369369
//IOBase the abstract base class of the IO Module
370370
let io_base = py_class!(ctx, "IOBase", ctx.object(), {
371371
"__enter__" => ctx.new_rustfunc(io_base_cm_enter),

‎vm/src/stdlib/json.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ fn json_loads(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
228228
})
229229
}
230230

231-
pub fn mk_module(ctx: &PyContext) -> PyObjectRef {
231+
pub fn make_module(ctx: &PyContext) -> PyObjectRef {
232232
// TODO: Make this a proper type with a constructor
233233
let json_decode_error = create_type(
234234
"JSONDecodeError",

‎vm/src/stdlib/keyword.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fn keyword_iskeyword(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
1717
Ok(value)
1818
}
1919

20-
pub fn mk_module(ctx: &PyContext) -> PyObjectRef {
20+
pub fn make_module(ctx: &PyContext) -> PyObjectRef {
2121
let keyword_kwlist = ctx.new_list(
2222
lexer::get_keywords()
2323
.keys()

‎vm/src/stdlib/math.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ fn math_lgamma(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
171171
}
172172
}
173173

174-
pub fn mk_module(ctx: &PyContext) -> PyObjectRef {
174+
pub fn make_module(ctx: &PyContext) -> PyObjectRef {
175175
py_module!(ctx, "math", {
176176
// Number theory functions:
177177
"fabs" => ctx.new_rustfunc(math_fabs),

‎vm/src/stdlib/mod.rs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,28 +28,28 @@ pub fn get_module_inits() -> HashMap<String, StdlibInitFunc> {
2828
let mut modules = HashMap::new();
2929
modules.insert(
3030
"ast".to_string(),
31-
Box::new(ast::mk_module) as StdlibInitFunc,
31+
Box::new(ast::make_module) as StdlibInitFunc,
3232
);
33-
modules.insert("dis".to_string(), Box::new(dis::mk_module));
34-
modules.insert("json".to_string(), Box::new(json::mk_module));
35-
modules.insert("keyword".to_string(), Box::new(keyword::mk_module));
36-
modules.insert("math".to_string(), Box::new(math::mk_module));
37-
modules.insert("platform".to_string(), Box::new(platform::mk_module));
38-
modules.insert("re".to_string(), Box::new(re::mk_module));
39-
modules.insert("random".to_string(), Box::new(random::mk_module));
40-
modules.insert("string".to_string(), Box::new(string::mk_module));
41-
modules.insert("struct".to_string(), Box::new(pystruct::mk_module));
42-
modules.insert("time".to_string(), Box::new(time_module::mk_module));
43-
modules.insert("tokenize".to_string(), Box::new(tokenize::mk_module));
44-
modules.insert("types".to_string(), Box::new(types::mk_module));
45-
modules.insert("_weakref".to_string(), Box::new(weakref::mk_module));
33+
modules.insert("dis".to_string(), Box::new(dis::make_module));
34+
modules.insert("json".to_string(), Box::new(json::make_module));
35+
modules.insert("keyword".to_string(), Box::new(keyword::make_module));
36+
modules.insert("math".to_string(), Box::new(math::make_module));
37+
modules.insert("platform".to_string(), Box::new(platform::make_module));
38+
modules.insert("re".to_string(), Box::new(re::make_module));
39+
modules.insert("random".to_string(), Box::new(random::make_module));
40+
modules.insert("string".to_string(), Box::new(string::make_module));
41+
modules.insert("struct".to_string(), Box::new(pystruct::make_module));
42+
modules.insert("time".to_string(), Box::new(time_module::make_module));
43+
modules.insert("tokenize".to_string(), Box::new(tokenize::make_module));
44+
modules.insert("types".to_string(), Box::new(types::make_module));
45+
modules.insert("_weakref".to_string(), Box::new(weakref::make_module));
4646

4747
// disable some modules on WASM
4848
#[cfg(not(target_arch = "wasm32"))]
4949
{
50-
modules.insert("io".to_string(), Box::new(io::mk_module));
51-
modules.insert("os".to_string(), Box::new(os::mk_module));
52-
modules.insert("socket".to_string(), Box::new(socket::mk_module));
50+
modules.insert("io".to_string(), Box::new(io::make_module));
51+
modules.insert("os".to_string(), Box::new(os::make_module));
52+
modules.insert("socket".to_string(), Box::new(socket::make_module));
5353
}
5454

5555
modules

‎vm/src/stdlib/os.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ fn os_error(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
118118
Err(vm.new_os_error(msg))
119119
}
120120

121-
pub fn mk_module(ctx: &PyContext) -> PyObjectRef {
121+
pub fn make_module(ctx: &PyContext) -> PyObjectRef {
122122
let py_mod = py_module!(ctx, "os", {
123123
"open" => ctx.new_rustfunc(os_open),
124124
"close" => ctx.new_rustfunc(os_close),

‎vm/src/stdlib/platform.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ extern crate rustc_version_runtime;
33
use crate::pyobject::{PyContext, PyFuncArgs, PyObjectRef, PyResult};
44
use crate::VirtualMachine;
55

6-
pub fn mk_module(ctx: &PyContext) -> PyObjectRef {
6+
pub fn make_module(ctx: &PyContext) -> PyObjectRef {
77
py_module!(ctx, "platform", {
88
"python_compiler" => ctx.new_rustfunc(platform_python_compiler),
99
"python_implementation" => ctx.new_rustfunc(platform_python_implementation),

‎vm/src/stdlib/pystruct.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ fn struct_unpack(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
296296
Ok(vm.ctx.new_tuple(items))
297297
}
298298

299-
pub fn mk_module(ctx: &PyContext) -> PyObjectRef {
299+
pub fn make_module(ctx: &PyContext) -> PyObjectRef {
300300
py_module!(ctx, "struct", {
301301
"pack" => ctx.new_rustfunc(struct_pack),
302302
"unpack" => ctx.new_rustfunc(struct_unpack)

‎vm/src/stdlib/random.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::pyobject::{PyContext, PyFuncArgs, PyObjectRef, PyResult, TypeProtocol
77
use crate::stdlib::random::rand::distributions::{Distribution, Normal};
88
use crate::VirtualMachine;
99

10-
pub fn mk_module(ctx: &PyContext) -> PyObjectRef {
10+
pub fn make_module(ctx: &PyContext) -> PyObjectRef {
1111
py_module!(ctx, "random", {
1212
"guass" => ctx.new_rustfunc(random_gauss),
1313
"normalvariate" => ctx.new_rustfunc(random_normalvariate),

‎vm/src/stdlib/re.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use crate::pyobject::{
1717
use crate::VirtualMachine;
1818

1919
/// Create the python `re` module with all its members.
20-
pub fn mk_module(ctx: &PyContext) -> PyObjectRef {
20+
pub fn make_module(ctx: &PyContext) -> PyObjectRef {
2121
let match_type = py_class!(ctx, "Match", ctx.object(), {
2222
"start" => ctx.new_rustfunc(match_start),
2323
"end" => ctx.new_rustfunc(match_end)

‎vm/src/stdlib/socket.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ fn get_addr_tuple(vm: &mut VirtualMachine, addr: SocketAddr) -> PyResult {
420420
Ok(vm.ctx.new_tuple(vec![ip, port]))
421421
}
422422

423-
pub fn mk_module(ctx: &PyContext) -> PyObjectRef {
423+
pub fn make_module(ctx: &PyContext) -> PyObjectRef {
424424
let socket = py_class!(ctx, "socket", ctx.object(), {
425425
"__new__" => ctx.new_rustfunc(socket_new),
426426
"connect" => ctx.new_rustfunc(socket_connect),

‎vm/src/stdlib/string.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
use crate::pyobject::{PyContext, PyObjectRef};
77

8-
pub fn mk_module(ctx: &PyContext) -> PyObjectRef {
8+
pub fn make_module(ctx: &PyContext) -> PyObjectRef {
99
let ascii_lowercase = "abcdefghijklmnopqrstuvwxyz".to_string();
1010
let ascii_uppercase = "ABCDEFGHIJKLMNOPQRSTUVWXYZ".to_string();
1111
let ascii_letters = format!("{}{}", ascii_lowercase, ascii_uppercase);

‎vm/src/stdlib/time_module.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ fn time_time(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
3030
Ok(value)
3131
}
3232

33-
pub fn mk_module(ctx: &PyContext) -> PyObjectRef {
33+
pub fn make_module(ctx: &PyContext) -> PyObjectRef {
3434
py_module!(ctx, "time", {
3535
"sleep" => ctx.new_rustfunc(time_sleep),
3636
"time" => ctx.new_rustfunc(time_time)

‎vm/src/stdlib/tokenize.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ fn tokenize_tokenize(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
2525

2626
// TODO: create main function when called with -m
2727

28-
pub fn mk_module(ctx: &PyContext) -> PyObjectRef {
28+
pub fn make_module(ctx: &PyContext) -> PyObjectRef {
2929
py_module!(ctx, "tokenize", {
3030
"tokenize" => ctx.new_rustfunc(tokenize_tokenize)
3131
})

‎vm/src/stdlib/types.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ fn types_new_class(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
3030
objtype::new(vm.ctx.type_type(), &name, bases, PyAttributes::new())
3131
}
3232

33-
pub fn mk_module(ctx: &PyContext) -> PyObjectRef {
33+
pub fn make_module(ctx: &PyContext) -> PyObjectRef {
3434
py_module!(ctx, "types", {
3535
"new_class" => ctx.new_rustfunc(types_new_class),
3636
"FunctionType" => ctx.function_type(),

‎vm/src/stdlib/weakref.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
88
use super::super::pyobject::{PyContext, PyObjectRef};
99

10-
pub fn mk_module(ctx: &PyContext) -> PyObjectRef {
10+
pub fn make_module(ctx: &PyContext) -> PyObjectRef {
1111
py_module!(ctx, "_weakref", {
1212
"ref" => ctx.weakref_type()
1313
})

‎vm/src/sysmodule.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ fn sys_getsizeof(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
5454
Ok(vm.ctx.new_int(size))
5555
}
5656

57-
pub fn mk_module(ctx: &PyContext) -> PyObjectRef {
57+
pub fn make_module(ctx: &PyContext) -> PyObjectRef {
5858
let path_list = match env::var_os("PYTHONPATH") {
5959
Some(paths) => env::split_paths(&paths)
6060
.map(|path| {

‎vm/src/vm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ impl VirtualMachine {
5757

5858
// Hard-core modules:
5959
let builtins = builtins::make_module(&ctx);
60-
let sysmod = sysmodule::mk_module(&ctx);
60+
let sysmod = sysmodule::make_module(&ctx);
6161

6262
// Add builtins as builtins module:
6363
let modules = sysmod.get_attr("modules").unwrap();

‎wasm/lib/src/browser_module.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ fn browser_prompt(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
310310

311311
const BROWSER_NAME: &str = "browser";
312312

313-
pub fn mk_module(ctx: &PyContext) -> PyObjectRef {
313+
pub fn make_module(ctx: &PyContext) -> PyObjectRef {
314314
let promise = py_class!(ctx, "Promise", ctx.object(), {
315315
"then" => ctx.new_rustfunc(promise_then),
316316
"catch" => ctx.new_rustfunc(promise_catch)
@@ -329,5 +329,5 @@ pub fn mk_module(ctx: &PyContext) -> PyObjectRef {
329329

330330
pub fn setup_browser_module(vm: &mut VirtualMachine) {
331331
vm.stdlib_inits
332-
.insert(BROWSER_NAME.to_string(), Box::new(mk_module));
332+
.insert(BROWSER_NAME.to_string(), Box::new(make_module));
333333
}

0 commit comments

Comments
 (0)