File tree Expand file tree Collapse file tree 1 file changed +3
-5
lines changed
Expand file tree Collapse file tree 1 file changed +3
-5
lines changed Original file line number Diff line number Diff line change @@ -1324,7 +1324,6 @@ fn calculate_meta_class(
13241324 Ok ( winner)
13251325}
13261326
1327-
13281327fn solid_base ( typ : & PyTypeRef , vm : & VirtualMachine ) -> PyTypeRef {
13291328 let base = if let Some ( base) = & typ. base {
13301329 solid_base ( base, vm)
@@ -1341,7 +1340,6 @@ fn solid_base(typ: &PyTypeRef, vm: &VirtualMachine) -> PyTypeRef {
13411340}
13421341
13431342fn best_base ( bases : & [ PyTypeRef ] , vm : & VirtualMachine ) -> PyResult < PyTypeRef > {
1344-
13451343 let mut base: Option < PyTypeRef > = None ;
13461344 let mut winner: Option < PyTypeRef > = None ;
13471345
@@ -1368,9 +1366,9 @@ fn best_base(bases: &[PyTypeRef], vm: &VirtualMachine) -> PyResult<PyTypeRef> {
13681366 winner = Some ( candidate. clone ( ) ) ;
13691367 base = Some ( base_i. clone ( ) ) ;
13701368 } else {
1371- return Err ( vm . new_type_error (
1372- "multiple bases have instance layout conflict" . to_string ( ) ,
1373- ) ) ;
1369+ return Err (
1370+ vm . new_type_error ( "multiple bases have instance layout conflict" . to_string ( ) )
1371+ ) ;
13741372 }
13751373 }
13761374
You can’t perform that action at this time.
0 commit comments