Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Add error messages for unsupported macro features on compilation #3993

Closed
wants to merge 2 commits into from
Closed

[WIP] Add error messages for unsupported macro features on compilation #3993

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a39f8c
First implementation
cojmeister Mar 23, 2024
5bb7425
Merge branch 'PyO3:main' into add-error-messages-for-unsupported-macr…
cojmeister Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions pyo3-macros-backend/src/pyclass.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
use std::borrow::Cow;

use crate::attributes::kw::frozen;
use crate::attributes::{
self, kw, take_pyo3_options, CrateAttribute, ExtendsAttribute, FreelistAttribute,
ModuleAttribute, NameAttribute, NameLitStr, RenameAllAttribute,
};
use crate::attributes::{self, kw, take_pyo3_options, CrateAttribute, ExtendsAttribute, FreelistAttribute, ModuleAttribute, NameAttribute, NameLitStr, RenameAllAttribute, get_pyo3_options};
use crate::deprecations::Deprecations;
use crate::konst::{ConstAttributes, ConstSpec};
use crate::method::{FnArg, FnSpec};
Expand All @@ -13,7 +10,7 @@ use crate::pymethod::{
impl_py_getter_def, impl_py_setter_def, MethodAndMethodDef, MethodAndSlotDef, PropertyType,
SlotDef, __INT__, __REPR__, __RICHCMP__,
};
use crate::utils::Ctx;
use crate::utils::{Ctx, is_abi3};
use crate::utils::{self, apply_renaming_rule, PythonDoc};
use crate::PyFunctionOptions;
use proc_macro2::{Ident, Span, TokenStream};
Expand All @@ -22,6 +19,13 @@ use syn::ext::IdentExt;
use syn::parse::{Parse, ParseStream};
use syn::punctuated::Punctuated;
use syn::{parse_quote, spanned::Spanned, Result, Token};
use pyo3_build_config::PythonVersion;


const PY_3_9: PythonVersion = PythonVersion {
major: 3,
minor: 9,
};

/// If the class is derived from a Rust `struct` or `enum`.
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
Expand Down Expand Up @@ -162,6 +166,8 @@ impl PyClassPyO3Options {
};
}

let python_version = pyo3_build_config::get().version;

match option {
PyClassPyO3Option::Crate(krate) => set_option!(krate),
PyClassPyO3Option::Dict(dict) => set_option!(dict),
Expand All @@ -177,7 +183,13 @@ impl PyClassPyO3Options {
PyClassPyO3Option::SetAll(set_all) => set_option!(set_all),
PyClassPyO3Option::Subclass(subclass) => set_option!(subclass),
PyClassPyO3Option::Unsendable(unsendable) => set_option!(unsendable),
PyClassPyO3Option::Weakref(weakref) => set_option!(weakref),
PyClassPyO3Option::Weakref(weakref) => {
if is_abi3() && python_version >= PY_3_9 {
set_option!(weakref);
} else {
return Err(syn::Error::new((weakref.span()), "`weakref` not supported until python 3.9 or graeter",));
}
Comment on lines +187 to +191
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if is_abi3() && python_version >= PY_3_9 {
set_option!(weakref);
} else {
return Err(syn::Error::new((weakref.span()), "`weakref` not supported until python 3.9 or graeter",));
}
if python_version >= PY_3_9 || !is_abi3() {
set_option!(weakref);
} else {
return Err(syn::Error::new((weakref.span()), "`weakref` not supported with `abi3` until python 3.9 or graeter",));
}

},
}
Ok(())
}
Expand Down
Loading