feat: update pyo3 (#10)

Cargo.toml

@@ -1,15 +1,15 @@
 [package]
 name = "epyxid"
 edition = "2021"
-version = "0.3.0"
+version = "0.3.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]
 name = "epyxid"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = { version = "0.21.2", features = ["extension-module"] }
+pyo3 = { version = "0.22.6", features = ["extension-module"] }
 xid = "1.1.1"
 
 [profile.release]

pyproject.toml

@@ -5,7 +5,7 @@ requires-python = ">=3.8"
 authors = [
   {name = "Aleksandr Shpak", email = "[email protected]"},
 ]
-version = "0.3.0"
+version = "0.3.1"
 readme = "README.md"
 license = { file = "LICENSE.txt" }
 keywords = [

src/lib.rs

@@ -1,6 +1,8 @@
 extern crate core;
 
-use pyo3::prelude::{pymodule, wrap_pyfunction, Bound, PyModule, PyResult, Python};
+use pyo3::prelude::{
+    pymodule, wrap_pyfunction, Bound, PyModule, PyModuleMethods, PyResult, Python,
+};
 
 use crate::errors::XIDError;
 use crate::utils::{xid_create, xid_from_bytes, xid_from_str};

src/utils.rs

@@ -1,8 +1,6 @@
 use std::str::FromStr;
 
-use pyo3::prelude::PyBytesMethods;
-use pyo3::types::PyBytes;
-use pyo3::{pyfunction, Bound, PyResult};
+use pyo3::{pyfunction, PyResult};
 use xid::{Id, ParseIdError};
 
 use crate::errors::XIDError;
@@ -22,8 +20,8 @@ pub fn xid_from_str(s: &str) -> PyResult<XID> {
 }
 
 #[pyfunction]
-pub fn xid_from_bytes(b: Bound<PyBytes>) -> PyResult<XID> {
-    match id_from_bytes(b.as_bytes()) {
+pub fn xid_from_bytes(b: Vec<u8>) -> PyResult<XID> {
+    match id_from_bytes(&b) {
         Ok(value) => Ok(XID(value)),
         Err(error) => Err(XIDError::new_err(error.to_string())),
     }

src/wrapper.rs

@@ -1,17 +1,16 @@
-use std::hash::{DefaultHasher, Hash, Hasher};
-
 use crate::utils::{xid_create, xid_from_bytes, xid_from_str};
+use std::hash::{DefaultHasher, Hash, Hasher};
 
-use pyo3::types::{PyBytes, PyDateTime, PyString};
+use pyo3::types::{PyBytes, PyDateTime};
 use pyo3::{pyclass, pymethods, Bound, FromPyObject, PyResult, Python};
 use xid::Id;
 
 #[derive(FromPyObject)]
-enum XIDReprTypes<'a> {
+enum XIDReprTypes {
     #[pyo3(transparent, annotation = "str")]
-    String(&'a PyString),
+    String(String),
     #[pyo3(transparent, annotation = "bytes")]
-    Bytes(&'a PyBytes),
+    Bytes(Vec<u8>),
 }
 
 #[pyclass]
@@ -20,14 +19,13 @@ pub struct XID(pub Id);
 #[pymethods]
 impl XID {
     #[new]
-    fn new<'p>(py: Python<'p>, data: Option<XIDReprTypes>) -> PyResult<XID> {
+    #[pyo3(signature = (data=None))]
+    fn py_new(data: Option<XIDReprTypes>) -> PyResult<XID> {
         match data {
             None => xid_create(),
             Some(repr_value) => match repr_value {
-                XIDReprTypes::String(value) => xid_from_str(value.to_str().unwrap()),
-                XIDReprTypes::Bytes(value) => {
-                    xid_from_bytes(PyBytes::new_bound(py, value.as_bytes()))
-                }
+                XIDReprTypes::String(value) => xid_from_str(value.as_str()),
+                XIDReprTypes::Bytes(value) => xid_from_bytes(value),
             },
         }
     }