Respect [tool.maturin] settings of pyproject.toml

Author: messense

src/build_options.rs

@@ -5,6 +5,7 @@ use crate::python_interpreter::InterpreterKind;
 use crate::BuildContext;
 use crate::CargoToml;
 use crate::Metadata21;
+use crate::PyProjectToml;
 use crate::PythonInterpreter;
 use crate::Target;
 use anyhow::{bail, format_err, Context, Result};
@@ -130,6 +131,11 @@ impl BuildOptions {
 
         let cargo_toml = CargoToml::from_path(&manifest_file)?;
         let manifest_dir = manifest_file.parent().unwrap();
+        let pyproject: Option<PyProjectToml> = if manifest_dir.join("pyproject.toml").is_file() {
+            Some(PyProjectToml::new(manifest_dir).context("pyproject.toml is invalid")?)
+        } else {
+            None
+        };
         let metadata21 = Metadata21::from_cargo_toml(&cargo_toml, &manifest_dir)
             .context("Failed to parse Cargo.toml into python metadata")?;
         let extra_metadata = cargo_toml.remaining_core_metadata();
@@ -183,7 +189,12 @@ impl BuildOptions {
             }
         };
 
-        let bridge = find_bridge(&cargo_metadata, self.bindings.as_deref())?;
+        let bridge = find_bridge(
+            &cargo_metadata,
+            self.bindings
+                .as_deref()
+                .or_else(|| pyproject.as_ref().and_then(|x| x.bindings())),
+        )?;
 
         if bridge != BridgeModel::Bin && module_name.contains('-') {
             bail!(

src/pyproject_toml.rs

@@ -16,6 +16,7 @@ pub struct Tool {
 #[serde(rename_all = "kebab-case")]
 pub struct ToolMaturin {
     sdist_include: Option<Vec<String>>,
+    bindings: Option<String>,
 }
 
 /// A pyproject.toml as specified in PEP 517
@@ -57,11 +58,16 @@ impl PyProjectToml {
         Ok(pyproject)
     }
 
-    /// Returns the value of `[maturin.sdist-include]` in pyproject.toml
+    /// Returns the value of `[tool.maturin.sdist-include]` in pyproject.toml
     pub fn sdist_include(&self) -> Option<&Vec<String>> {
         self.tool.as_ref()?.maturin.as_ref()?.sdist_include.as_ref()
     }
 
+    /// Returns the value of `[tool.maturin.bindings]` in pyproject.toml
+    pub fn bindings(&self) -> Option<&str> {
+        self.tool.as_ref()?.maturin.as_ref()?.bindings.as_deref()
+    }
+
     /// Having a pyproject.toml without a version constraint is a bad idea
     /// because at some point we'll have to do breaking changes and then source
     /// distributions would break