| 1 |
Description: Fix cargo_metadata API compatibility in multiple files |
| 2 |
Add .as_str() calls when comparing PackageName and FeatureName with string literals. |
| 3 |
Convert PackageName to String when needed using .to_string(). |
| 4 |
This adapts to cargo_metadata 0.23 API changes. |
| 5 |
Author: Jelmer Vernooij <[email protected]> |
| 6 |
Forwarded: not-needed |
| 7 |
Last-Update: 2025-11-05 |
| 8 |
Index: maturin/src/build_options.rs |
| 9 |
=================================================================== |
| 10 |
--- maturin.orig/src/build_options.rs |
| 11 |
+++ maturin/src/build_options.rs |
| 12 |
@@ -950,7 +950,7 @@ fn filter_cargo_targets( |
| 13 |
&& target |
| 14 |
.required_features |
| 15 |
.iter() |
| 16 |
- .all(|f| resolved_features.contains(f)) |
| 17 |
+ .all(|f| resolved_features.iter().any(|rf| rf.as_str() == f.as_str())) |
| 18 |
} |
| 19 |
} |
| 20 |
_ => target.crate_types.contains(&CrateType::CDyLib), |
| 21 |
@@ -1015,7 +1015,7 @@ fn has_abi3(deps: &HashMap<&str, &Node>) |
| 22 |
if let Some(pyo3_crate) = deps.get(lib) { |
| 23 |
// Find the minimal abi3 python version. If there is none, abi3 hasn't been selected |
| 24 |
// This parser abi3-py{major}{minor} and returns the minimal (major, minor) tuple |
| 25 |
- let abi3_selected = pyo3_crate.features.iter().any(|x| x == "abi3"); |
| 26 |
+ let abi3_selected = pyo3_crate.features.iter().any(|x| x.as_str() == "abi3"); |
| 27 |
|
| 28 |
let min_abi3_version = pyo3_crate |
| 29 |
.features |
| 30 |
@@ -1060,7 +1060,7 @@ fn is_generating_import_lib(cargo_metada |
| 31 |
let generate_import_lib = pyo3_crate |
| 32 |
.features |
| 33 |
.iter() |
| 34 |
- .any(|x| x == "generate-import-lib" || x == "generate-abi3-import-lib"); |
| 35 |
+ .any(|x| x.as_str() == "generate-import-lib" || x.as_str() == "generate-abi3-import-lib"); |
| 36 |
return Ok(generate_import_lib); |
| 37 |
} |
| 38 |
_ => continue, |
| 39 |
@@ -1161,7 +1161,7 @@ pub fn find_bridge(cargo_metadata: &Meta |
| 40 |
.iter() |
| 41 |
.filter_map(|pkg| { |
| 42 |
let name = &pkg.name; |
| 43 |
- if name == "pyo3" || name == "pyo3-ffi" || name == "cpython" || name == "uniffi" { |
| 44 |
+ if name.as_str() == "pyo3" || name.as_str() == "pyo3-ffi" || name.as_str() == "cpython" || name.as_str() == "uniffi" { |
| 45 |
Some((name.as_ref(), pkg)) |
| 46 |
} else { |
| 47 |
None |
| 48 |
@@ -1226,7 +1226,7 @@ pub fn find_bridge(cargo_metadata: &Meta |
| 49 |
if !bridge.is_bin() && bridge.is_pyo3_crate(lib) { |
| 50 |
let lib_name = lib.as_str(); |
| 51 |
let pyo3_node = deps[lib_name]; |
| 52 |
- if !pyo3_node.features.contains(&"extension-module".to_string()) { |
| 53 |
+ if !pyo3_node.features.iter().any(|f| f.as_str() == "extension-module") { |
| 54 |
let version = cargo_metadata[&pyo3_node.id].version.to_string(); |
| 55 |
eprintln!( |
| 56 |
"⚠️ Warning: You're building a library without activating {lib}'s \ |
| 57 |
Index: maturin/src/compile.rs |
| 58 |
=================================================================== |
| 59 |
--- maturin.orig/src/compile.rs |
| 60 |
+++ maturin/src/compile.rs |
| 61 |
@@ -687,7 +687,7 @@ fn pyo3_version(cargo_metadata: &cargo_m |
| 62 |
.iter() |
| 63 |
.filter_map(|pkg| { |
| 64 |
let name = &pkg.name; |
| 65 |
- if name == "pyo3" || name == "pyo3-ffi" { |
| 66 |
+ if name.as_str() == "pyo3" || name.as_str() == "pyo3-ffi" { |
| 67 |
Some((name.as_ref(), pkg)) |
| 68 |
} else { |
| 69 |
None |
| 70 |
Index: maturin/src/metadata.rs |
| 71 |
=================================================================== |
| 72 |
--- maturin.orig/src/metadata.rs |
| 73 |
+++ maturin/src/metadata.rs |
| 74 |
@@ -478,7 +478,7 @@ impl Metadata24 { |
| 75 |
} |
| 76 |
} |
| 77 |
}; |
| 78 |
- let name = package.name.clone(); |
| 79 |
+ let name = package.name.to_string(); |
| 80 |
let mut project_url = IndexMap::new(); |
| 81 |
if let Some(repository) = package.repository.as_ref() { |
| 82 |
project_url.insert("Source Code".to_string(), repository.clone()); |