From caa3c517fec8cc415d5f4a6d123a07621c41a2bc Mon Sep 17 00:00:00 2001 From: Andrew Hlynskyi Date: Wed, 2 Oct 2024 01:44:07 +0300 Subject: [PATCH] Small fixes (#4567) * Fix misprint in PyClassArgs::parse_struct_args method name * Fix non snake case complains for __pymethod_* * add CHANGELOG --------- Co-authored-by: David Hewitt --- newsfragments/4567.fixed.md | 1 + pyo3-macros-backend/src/pyclass.rs | 2 +- pyo3-macros-backend/src/pymethod.rs | 2 ++ pyo3-macros/src/lib.rs | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 newsfragments/4567.fixed.md diff --git a/newsfragments/4567.fixed.md b/newsfragments/4567.fixed.md new file mode 100644 index 00000000000..24507b81b41 --- /dev/null +++ b/newsfragments/4567.fixed.md @@ -0,0 +1 @@ +Fix compiler warning about non snake case method names inside `#[pymethods]` generated code. diff --git a/pyo3-macros-backend/src/pyclass.rs b/pyo3-macros-backend/src/pyclass.rs index 1da9cfa20ad..c9fe1956f66 100644 --- a/pyo3-macros-backend/src/pyclass.rs +++ b/pyo3-macros-backend/src/pyclass.rs @@ -48,7 +48,7 @@ impl PyClassArgs { }) } - pub fn parse_stuct_args(input: ParseStream<'_>) -> syn::Result { + pub fn parse_struct_args(input: ParseStream<'_>) -> syn::Result { Self::parse(input, PyClassKind::Struct) } diff --git a/pyo3-macros-backend/src/pymethod.rs b/pyo3-macros-backend/src/pymethod.rs index 567bd2f5ac8..e7e50145e04 100644 --- a/pyo3-macros-backend/src/pymethod.rs +++ b/pyo3-macros-backend/src/pymethod.rs @@ -1298,6 +1298,7 @@ impl SlotDef { let name = spec.name; let holders = holders.init_holders(ctx); let associated_method = quote! { + #[allow(non_snake_case)] unsafe fn #wrapper_ident( py: #pyo3_path::Python<'_>, _raw_slf: *mut #pyo3_path::ffi::PyObject, @@ -1421,6 +1422,7 @@ impl SlotFragmentDef { let holders = holders.init_holders(ctx); Ok(quote! { impl #cls { + #[allow(non_snake_case)] unsafe fn #wrapper_ident( py: #pyo3_path::Python, _raw_slf: *mut #pyo3_path::ffi::PyObject, diff --git a/pyo3-macros/src/lib.rs b/pyo3-macros/src/lib.rs index c4263a512d3..08b2af3cd6f 100644 --- a/pyo3-macros/src/lib.rs +++ b/pyo3-macros/src/lib.rs @@ -168,7 +168,7 @@ fn pyclass_impl( mut ast: syn::ItemStruct, methods_type: PyClassMethodsType, ) -> TokenStream { - let args = parse_macro_input!(attrs with PyClassArgs::parse_stuct_args); + let args = parse_macro_input!(attrs with PyClassArgs::parse_struct_args); let expanded = build_py_class(&mut ast, args, methods_type).unwrap_or_compile_error(); quote!(