Merge pull request #750 from danjujan/main

Support pyo3 abi3-py310 feature
PyO3 · Dec 20, 2021 · 79f348f · 79f348f
2 parents 10ee1ff + bfaabf7
commit 79f348f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/build_options.rs b/src/build_options.rs
@@ -356,11 +356,11 @@ fn has_abi3(cargo_metadata: &Metadata) -> Result<Option<(u8, u8)>> {
             let min_abi3_version = pyo3_crate
                 .features
                 .iter()
-                .filter(|x| x.starts_with("abi3-py") && x.len() == "abi3-pyxx".len())
+                .filter(|x| x.starts_with("abi3-py") && x.len() >= "abi3-pyxx".len())
                 .map(|x| {
                     Ok((
                         (x.as_bytes()[7] as char).to_string().parse::<u8>()?,
-                        (x.as_bytes()[8] as char).to_string().parse::<u8>()?,
+                        x[8..].parse::<u8>()?,
                     ))
                 })
                 .collect::<Result<Vec<(u8, u8)>>>()