fmt

Author: newcomertv

pyo3-macros-backend/src/pyclass.rs

@@ -1109,9 +1109,10 @@ fn impl_complex_enum_tuple_variant_len(
         }
     };
 
-    let mut len_method_impl : syn ::ImplItemFn = syn::parse2(len_method_impl).unwrap();
+    let mut len_method_impl: syn::ImplItemFn = syn::parse2(len_method_impl).unwrap();
 
-    let variant_len = crate::pymethod::impl_py_slot_def(&variant_cls_type, ctx, &mut len_method_impl.sig)?;
+    let variant_len =
+        crate::pymethod::impl_py_slot_def(&variant_cls_type, ctx, &mut len_method_impl.sig)?;
 
     Ok((variant_len, len_method_impl))
 }
@@ -1138,23 +1139,23 @@ fn impl_complex_enum_tuple_variant_getitem(
         })
         .collect();
 
-    let matcher = 
-        quote! {
-            let py = slf.py();
-            match idx {
-                #( #match_arms, )*
-                _ => Err(pyo3::exceptions::PyIndexError::new_err("tuple index out of range")),
-            }
-        };
+    let matcher = quote! {
+        let py = slf.py();
+        match idx {
+            #( #match_arms, )*
+            _ => Err(pyo3::exceptions::PyIndexError::new_err("tuple index out of range")),
+        }
+    };
 
     let get_item_method_impl = quote! {
         fn __getitem__(slf: #pyo3_path::PyRef<Self>, idx: usize) -> #pyo3_path::PyResult< #pyo3_path::PyObject> {
             #matcher
         }
     };
 
-    let mut get_item_method_impl : syn ::ImplItemFn = syn::parse2(get_item_method_impl).unwrap();
-    let variant_getitem = crate::pymethod::impl_py_slot_def(&variant_cls_type, ctx, &mut get_item_method_impl.sig)?;
+    let mut get_item_method_impl: syn::ImplItemFn = syn::parse2(get_item_method_impl).unwrap();
+    let variant_getitem =
+        crate::pymethod::impl_py_slot_def(&variant_cls_type, ctx, &mut get_item_method_impl.sig)?;
 
     Ok((variant_getitem, get_item_method_impl))
 }
@@ -1187,20 +1188,13 @@ fn impl_complex_enum_tuple_variant_cls(
 
     let num_fields = variant.fields.len();
 
-    let (variant_len, len_method_impl) = impl_complex_enum_tuple_variant_len(
-        ctx,
-        &variant_cls_type,
-        num_fields,
-    )?;
+    let (variant_len, len_method_impl) =
+        impl_complex_enum_tuple_variant_len(ctx, &variant_cls_type, num_fields)?;
 
     slots.push(variant_len);
 
-    let (variant_getitem, getitem_method_impl) = impl_complex_enum_tuple_variant_getitem(
-        ctx,
-        &variant_cls,
-        &variant_cls_type,
-        num_fields,
-    )?;
+    let (variant_getitem, getitem_method_impl) =
+        impl_complex_enum_tuple_variant_getitem(ctx, &variant_cls, &variant_cls_type, num_fields)?;
 
     slots.push(variant_getitem);
 
@@ -1415,12 +1409,10 @@ fn complex_enum_tuple_variant_new<'a>(
         let _attrs =
             crate::pyfunction::PyFunctionArgPyO3Attributes::from_attrs(&mut no_pyo3_attrs)?;
 
-        let mut args = vec![
-            FnArg::Py(PyArg {
-                name: &arg_py_ident,
-                ty: &arg_py_type,
-            }),
-        ];
+        let mut args = vec![FnArg::Py(PyArg {
+            name: &arg_py_ident,
+            ty: &arg_py_type,
+        })];
 
         for (i, field) in variant.fields.iter().enumerate() {
             // TODO : Tracking issue for Cow in FnArg : #4156

pyo3-macros-backend/src/pymethod.rs

@@ -735,13 +735,11 @@ fn impl_call_getter(
     Ok(fncall)
 }
 
-
 pub fn impl_py_slot_def(
     cls: &syn::Type,
     ctx: &Ctx,
-    signature: &mut syn::Signature
+    signature: &mut syn::Signature,
 ) -> Result<MethodAndSlotDef> {
-
     let spec = FnSpec::parse(
         signature,
         &mut Vec::new(),
@@ -755,13 +753,13 @@ pub fn impl_py_slot_def(
         PyMethodKind::Proto(proto_kind) => {
             ensure_no_forbidden_protocol_attributes(&proto_kind, &spec, &method_name)?;
             match proto_kind {
-                PyMethodProtoKind::Slot(slot_def) => {
-                    slot_def
+                PyMethodProtoKind::Slot(slot_def) => slot_def,
+                _ => {
+                    bail_spanned!(signature.span() => "Only slot methods are supported in #[pyslot]")
                 }
-                _ => bail_spanned!(signature.span() => "Only slot methods are supported in #[pyslot]"),
             }
-    },
-    _ => bail_spanned!(signature.span() => "Only slot methods are supported in #[pyslot]"),
+        }
+        _ => bail_spanned!(signature.span() => "Only slot methods are supported in #[pyslot]"),
     };
 
     Ok(slot.generate_type_slot(&cls, &spec, &method_name, ctx)?)

pytests/src/enums.rs

@@ -88,7 +88,7 @@ pub enum MixedComplexEnum {
 #[pyfunction]
 pub fn do_mixed_complex_stuff(thing: &MixedComplexEnum) -> MixedComplexEnum {
     match thing {
-        MixedComplexEnum::Nothing {} => MixedComplexEnum::Empty (),
-        MixedComplexEnum::Empty() => MixedComplexEnum::Nothing{},
+        MixedComplexEnum::Nothing {} => MixedComplexEnum::Empty(),
+        MixedComplexEnum::Empty() => MixedComplexEnum::Nothing {},
     }
 }