Merge pull request #276 from WorksApplications/feature/update-pyo3-v022

Update pyo3 to v0.22
WorksApplications · Nov 19, 2024 · ea794e3 · ea794e3
2 parents e158aeb + 387a582
commit ea794e3
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 75 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/python/Cargo.toml b/python/Cargo.toml
@@ -15,7 +15,7 @@ name = "sudachipy"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = { version = "0.21", features = ["extension-module"] }
+pyo3 = { version = "0.22", features = ["extension-module"] }
 scopeguard = "1" # Apache 2.0/MIT
 thread_local = "1.1" # Apache 2.0/MIT
 

diff --git a/python/src/build.rs b/python/src/build.rs
@@ -74,7 +74,10 @@ fn create_file(p: &Path) -> std::io::Result<File> {
 /// :type output: pathlib.Path | str
 /// :type description: str
 #[pyfunction]
-#[pyo3(text_signature = "(matrix, lex, output, description=None) -> list[tuple[str, int, float]]")]
+#[pyo3(
+    signature = (matrix, lex, output, description=None),
+    text_signature = "(matrix, lex, output, description=None) -> list[tuple[str, int, float]]",
+)]
 fn build_system_dic<'py>(
     py: Python<'py>,
     matrix: &Bound<'py, PyAny>,
@@ -120,7 +123,10 @@ fn build_system_dic<'py>(
 /// :type output: pathlib.Path | str
 /// :type description: str
 #[pyfunction]
-#[pyo3(text_signature = "(system, lex, output, description=None) -> list[tuple[str, int, float]]")]
+#[pyo3(
+    signature = (system, lex, output, description=None),
+    text_signature = "(system, lex, output, description=None) -> list[tuple[str, int, float]]",
+)]
 fn build_user_dic<'py>(
     py: Python<'py>,
     system: &Bound<'py, PyAny>,

diff --git a/python/src/dictionary.rs b/python/src/dictionary.rs
@@ -371,7 +371,10 @@ impl PyDictionary {
     ///
     /// :type surface: str
     /// :type out: MorphemeList | None
-    #[pyo3(text_signature = "(self, /, surface, out=None) -> MorphemeList")]
+    #[pyo3(
+        signature = (surface, out=None),
+        text_signature = "(self, /, surface, out=None) -> MorphemeList",
+    )]
     fn lookup<'py>(
         &'py self,
         py: Python<'py>,

diff --git a/python/src/morpheme.rs b/python/src/morpheme.rs
@@ -219,7 +219,7 @@ impl PyMorphemeIter {
         }
 
         let morpheme = PyMorpheme {
-            list: self.list.clone(),
+            list: self.list.clone_ref(py),
             index: self.index,
         };
 
@@ -364,7 +364,10 @@ impl PyMorpheme {
     /// :type mode: SplitMode | None
     /// :type out: MorphemeList | None
     /// :type add_single: bool
-    #[pyo3(text_signature = "(self, /, mode, out=None, add_single=False) -> MorphemeList")]
+    #[pyo3(
+        signature = (mode, out=None, add_single=false),
+        text_signature = "(self, /, mode, out=None, add_single=False) -> MorphemeList",
+    )]
     fn split<'py>(
         &'py self,
         py: Python<'py>,

diff --git a/python/src/tokenizer.rs b/python/src/tokenizer.rs
@@ -40,7 +40,7 @@ use crate::morpheme::{PyMorphemeListWrapper, PyProjector};
 ///     If None, returns SplitMode.C.
 ///
 /// :type mode: str | None
-#[pyclass(module = "sudachipy.tokenizer", name = "SplitMode", frozen)]
+#[pyclass(module = "sudachipy.tokenizer", name = "SplitMode", eq, eq_int, frozen)]
 #[derive(Clone, PartialEq, Eq, Copy, Debug)]
 #[repr(u8)]
 pub enum PySplitMode {
@@ -79,8 +79,8 @@ impl PySplitMode {
     /// :type mode: str | None
     #[new]
     #[pyo3(
-        text_signature="(mode=None) -> SplitMode",
-        signature=(mode=None)
+        signature = (mode=None),
+        text_signature = "(mode=None) -> SplitMode"
     )]
     fn new(mode: Option<&str>) -> PyResult<PySplitMode> {
         let mode = match mode {