Fix compilation issues with pyo3 v0.6

Author: Martin Larralde

example_tomlgen/hello/english/lib.rs

@@ -1,16 +1,18 @@
+#[macro_use]
 extern crate pyo3;
 
 use pyo3::prelude::*;
 
-/// Module documentation string
-#[pymodinit]
-fn english(_py: Python, m: &PyModule) -> PyResult<()> {
+#[pyfunction]
+fn hello(_py: Python) -> PyResult<()> {
+    println!("Hello, world!");
+    Ok(())
+}
 
-    #[pyfn(m, "hello")]
-    fn hello(_py: Python) -> PyResult<()> {
-        println!("Hello, world!");
-        Ok(())
-    }
 
+#[pymodule]
+/// Module documentation string
+fn english(_py: Python, m: &PyModule) -> PyResult<()> {
+    m.add_wrapped(wrap_function!(hello))?;
     Ok(())
 }

example_tomlgen/hello/french/lib.rs

@@ -1,16 +1,18 @@
+#[macro_use]
 extern crate pyo3;
 
 use pyo3::prelude::*;
 
-/// Module documentation string
-#[pymodinit]
-fn french(_py: Python, m: &PyModule) -> PyResult<()> {
+#[pyfunction]
+fn hello(_py: Python) -> PyResult<()> {
+    println!("Bonjour, monde!");
+    Ok(())
+}
 
-    #[pyfn(m, "hello")]
-    fn hello(_py: Python) -> PyResult<()> {
-        println!("Bonjour, monde!");
-        Ok(())
-    }
 
+#[pymodule]
+/// Module documentation string
+fn french(_py: Python, m: &PyModule) -> PyResult<()> {
+    m.add_wrapped(wrap_function!(hello))?;
     Ok(())
 }

example_tomlgen/setup.cfg

@@ -10,7 +10,7 @@ zip_safe = false
 create_workspace = true
 
 [tomlgen_rust.dependencies]
-pyo3 = { version = "0.5.0-alpha.3", features = ["extension-module"] }
+pyo3 = { version = "0.6.0-alpha", features = ["extension-module"] }
 
 [tomlgen_rust.dependencies.hello-english]
 english-lint = "*"

html-py-ever/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["konstin <[email protected]>"]
 
 [dependencies]
 kuchiki = "0.7.2"
-pyo3 = {git = "https://github.com/PyO3/pyo3", features = ["extension-module"]}
+pyo3 = { version = "0.6.0-alpha", features = ["extension-module"]}
 tendril = "0.4.0"
 
 [lib]

html-py-ever/src/lib.rs

@@ -55,10 +55,10 @@ fn parse_text(text: &str) -> PyResult<Document> {
     Ok(document)
 }
 
-#[pymodinit]
+#[pymodule]
 fn html_py_ever(_py: Python, m: &PyModule) -> PyResult<()> {
-    m.add_function(wrap_function!(parse_file))?;
-    m.add_function(wrap_function!(parse_text))?;
+    m.add_wrapped(wrap_function!(parse_file))?;
+    m.add_wrapped(wrap_function!(parse_text))?;
     m.add_class::<Document>()?;
 
     Ok(())