Skip to content

Commit f7f4e0d

Browse files
Auto-format: cargo fmt --all
1 parent 294d609 commit f7f4e0d

File tree

2 files changed

+18
-31
lines changed

2 files changed

+18
-31
lines changed

crates/vm/src/import.rs

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -362,16 +362,10 @@ pub fn import_module_level(
362362
if level == 0 {
363363
let sys_modules = vm.sys_module.get_attr("modules", vm)?;
364364
return sys_modules.get_item(name, vm).map_err(|_| {
365-
vm.new_import_error(
366-
format!("No module named '{}'", name),
367-
name.to_owned(),
368-
)
365+
vm.new_import_error(format!("No module named '{}'", name), name.to_owned())
369366
});
370367
}
371-
return Err(vm.new_import_error(
372-
format!("No module named '{}'", name),
373-
name.to_owned(),
374-
));
368+
return Err(vm.new_import_error(format!("No module named '{}'", name), name.to_owned()));
375369
}
376370
};
377371

@@ -380,9 +374,7 @@ pub fn import_module_level(
380374
// When globals is not provided (Rust None), raise KeyError
381375
// matching resolve_name() where globals==NULL
382376
if globals.is_none() {
383-
return Err(vm.new_key_error(
384-
vm.ctx.new_str("'__name__' not in globals").into(),
385-
));
377+
return Err(vm.new_key_error(vm.ctx.new_str("'__name__' not in globals").into()));
386378
}
387379
let globals_ref = globals.as_ref().unwrap();
388380
// When globals is Python None, treat like empty mapping
@@ -464,9 +456,7 @@ pub fn import_module_level(
464456
// For relative imports (level > 0), raise KeyError
465457
let to_return_obj: PyObjectRef = vm
466458
.ctx
467-
.new_str(format!(
468-
"'{to_return}' not in sys.modules as expected"
469-
))
459+
.new_str(format!("'{to_return}' not in sys.modules as expected"))
470460
.into();
471461
Err(vm.new_key_error(to_return_obj))
472462
}
@@ -513,9 +503,10 @@ fn calc_package(globals: Option<&PyObjectRef>, vm: &VirtualMachine) -> PyResult<
513503
if let Some(ref pkg) = package
514504
&& !vm.is_none(pkg)
515505
{
516-
let pkg_str: PyStrRef = pkg.clone().downcast().map_err(|_| {
517-
vm.new_type_error("package must be a string".to_owned())
518-
})?;
506+
let pkg_str: PyStrRef = pkg
507+
.clone()
508+
.downcast()
509+
.map_err(|_| vm.new_type_error("package must be a string".to_owned()))?;
519510
// Warn if __package__ != __spec__.parent
520511
if let Some(ref spec) = spec
521512
&& !vm.is_none(spec)
@@ -554,14 +545,16 @@ fn calc_package(globals: Option<&PyObjectRef>, vm: &VirtualMachine) -> PyResult<
554545
&& let Ok(parent) = spec.get_attr("parent", vm)
555546
&& !vm.is_none(&parent)
556547
{
557-
let parent_str: PyStrRef = parent.downcast().map_err(|_| {
558-
vm.new_type_error("package set to non-string".to_owned())
559-
})?;
548+
let parent_str: PyStrRef = parent
549+
.downcast()
550+
.map_err(|_| vm.new_type_error("package set to non-string".to_owned()))?;
560551
return Ok(parent_str.as_str().to_owned());
561552
}
562553

563554
// Fall back to __name__ and __path__
564-
let warn = vm.import("_warnings", 0).and_then(|w| w.get_attr("warn", vm));
555+
let warn = vm
556+
.import("_warnings", 0)
557+
.and_then(|w| w.get_attr("warn", vm));
565558
if let Ok(warn_fn) = warn {
566559
let _ = warn_fn.call(
567560
(
@@ -578,9 +571,9 @@ fn calc_package(globals: Option<&PyObjectRef>, vm: &VirtualMachine) -> PyResult<
578571
vm.ctx.new_str(""),
579572
)
580573
})?;
581-
let mod_name_str: PyStrRef = mod_name.downcast().map_err(|_| {
582-
vm.new_type_error("__name__ must be a string".to_owned())
583-
})?;
574+
let mod_name_str: PyStrRef = mod_name
575+
.downcast()
576+
.map_err(|_| vm.new_type_error("__name__ must be a string".to_owned()))?;
584577
let mut package = mod_name_str.as_str().to_owned();
585578
// If not a package (no __path__), strip last component.
586579
// Uses rpartition('.')[0] semantics: returns empty string when no dot.

crates/vm/src/stdlib/builtins.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,13 +1008,7 @@ mod builtins {
10081008

10091009
#[pyfunction]
10101010
fn __import__(args: ImportArgs, vm: &VirtualMachine) -> PyResult {
1011-
crate::import::import_module_level(
1012-
&args.name,
1013-
args.globals,
1014-
args.fromlist,
1015-
args.level,
1016-
vm,
1017-
)
1011+
crate::import::import_module_level(&args.name, args.globals, args.fromlist, args.level, vm)
10181012
}
10191013

10201014
#[pyfunction]

0 commit comments

Comments
 (0)