@@ -361,9 +361,7 @@ pub fn import_module_level(
361361 // When globals is not provided (Rust None), raise KeyError
362362 // matching resolve_name() where globals==NULL
363363 if globals. is_none ( ) {
364- return Err ( vm. new_key_error (
365- vm. ctx . new_str ( "'__name__' not in globals" ) . into ( ) ,
366- ) ) ;
364+ return Err ( vm. new_key_error ( vm. ctx . new_str ( "'__name__' not in globals" ) . into ( ) ) ) ;
367365 }
368366 let globals_ref = globals. as_ref ( ) . unwrap ( ) ;
369367 // When globals is Python None, treat like empty mapping
@@ -445,9 +443,7 @@ pub fn import_module_level(
445443 // For relative imports (level > 0), raise KeyError
446444 let to_return_obj: PyObjectRef = vm
447445 . ctx
448- . new_str ( format ! (
449- "'{to_return}' not in sys.modules as expected"
450- ) )
446+ . new_str ( format ! ( "'{to_return}' not in sys.modules as expected" ) )
451447 . into ( ) ;
452448 Err ( vm. new_key_error ( to_return_obj) )
453449 }
@@ -494,9 +490,10 @@ fn calc_package(globals: Option<&PyObjectRef>, vm: &VirtualMachine) -> PyResult<
494490 if let Some ( ref pkg) = package
495491 && !vm. is_none ( pkg)
496492 {
497- let pkg_str: PyStrRef = pkg. clone ( ) . downcast ( ) . map_err ( |_| {
498- vm. new_type_error ( "package must be a string" . to_owned ( ) )
499- } ) ?;
493+ let pkg_str: PyStrRef = pkg
494+ . clone ( )
495+ . downcast ( )
496+ . map_err ( |_| vm. new_type_error ( "package must be a string" . to_owned ( ) ) ) ?;
500497 // Warn if __package__ != __spec__.parent
501498 if let Some ( ref spec) = spec
502499 && !vm. is_none ( spec)
@@ -535,14 +532,16 @@ fn calc_package(globals: Option<&PyObjectRef>, vm: &VirtualMachine) -> PyResult<
535532 && let Ok ( parent) = spec. get_attr ( "parent" , vm)
536533 && !vm. is_none ( & parent)
537534 {
538- let parent_str: PyStrRef = parent. downcast ( ) . map_err ( |_| {
539- vm . new_type_error ( "package set to non-string" . to_owned ( ) )
540- } ) ?;
535+ let parent_str: PyStrRef = parent
536+ . downcast ( )
537+ . map_err ( |_| vm . new_type_error ( "package set to non-string" . to_owned ( ) ) ) ?;
541538 return Ok ( parent_str. as_str ( ) . to_owned ( ) ) ;
542539 }
543540
544541 // Fall back to __name__ and __path__
545- let warn = vm. import ( "_warnings" , 0 ) . and_then ( |w| w. get_attr ( "warn" , vm) ) ;
542+ let warn = vm
543+ . import ( "_warnings" , 0 )
544+ . and_then ( |w| w. get_attr ( "warn" , vm) ) ;
546545 if let Ok ( warn_fn) = warn {
547546 let _ = warn_fn. call (
548547 (
@@ -559,9 +558,9 @@ fn calc_package(globals: Option<&PyObjectRef>, vm: &VirtualMachine) -> PyResult<
559558 vm. ctx . new_str ( "" ) ,
560559 )
561560 } ) ?;
562- let mod_name_str: PyStrRef = mod_name. downcast ( ) . map_err ( |_| {
563- vm . new_type_error ( "__name__ must be a string" . to_owned ( ) )
564- } ) ?;
561+ let mod_name_str: PyStrRef = mod_name
562+ . downcast ( )
563+ . map_err ( |_| vm . new_type_error ( "__name__ must be a string" . to_owned ( ) ) ) ?;
565564 let mut package = mod_name_str. as_str ( ) . to_owned ( ) ;
566565 // If not a package (no __path__), strip last component.
567566 // Uses rpartition('.')[0] semantics: returns empty string when no dot.
0 commit comments