Disable gil-refs feature

gufolabs · Nov 6, 2024 · 7b327a1 · 7b327a1
1 parent 039e8ce
commit 7b327a1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,7 +21,7 @@ digest = "0.10"
 enum_dispatch = "0.3"
 md-5 = "0.10"
 nom = "7.1"
-pyo3 = {version = "0.22", features = ["extension-module", "gil-refs"]}
+pyo3 = {version = "0.22", features = ["extension-module"]}
 rand = "0.8"
 sha1 = "0.10"
 socket2 = {version = "0.5", features = ["all"]}

diff --git a/src/snmp/op/getmany.rs b/src/snmp/op/getmany.rs
@@ -11,18 +11,18 @@ use crate::error::SnmpError;
 use crate::snmp::get::SnmpGet;
 use crate::snmp::msg::SnmpPdu;
 use crate::snmp::value::SnmpValue;
-use pyo3::{exceptions::PyRuntimeError, prelude::*, types::PyDict};
+use pyo3::{exceptions::PyRuntimeError, prelude::*, pybacked::PyBackedStr, types::PyDict};
 
 pub struct OpGetMany;
 
-impl<'a> PyOp<'a, Vec<&'a str>> for OpGetMany {
+impl<'a> PyOp<'a, Vec<PyBackedStr>> for OpGetMany {
     // obj is list[str]
-    fn from_python(obj: Vec<&'a str>, request_id: i64) -> PyResult<SnmpPdu<'a>> {
+    fn from_python(obj: Vec<PyBackedStr>, request_id: i64) -> PyResult<SnmpPdu<'a>> {
         Ok(SnmpPdu::GetRequest(SnmpGet {
             request_id,
             vars: obj
                 .into_iter()
-                .map(SnmpOid::try_from)
+                .map(|x| SnmpOid::try_from(x.as_ref()))
                 .collect::<Result<Vec<SnmpOid>, SnmpError>>()?,
         }))
     }

diff --git a/src/socket/v1.rs b/src/socket/v1.rs
@@ -17,7 +17,7 @@ use crate::{
         pdu::SnmpPdu,
     },
 };
-use pyo3::prelude::*;
+use pyo3::{prelude::*, pybacked::PyBackedStr};
 use socket2::Socket;
 use std::os::fd::AsRawFd;
 
@@ -66,11 +66,11 @@ impl SnmpV1ClientSocket {
     }
     // .get_many()
     // Prepare and send GET request with multiple oids and receive reply
-    fn get_many(&mut self, py: Python, oids: Vec<&str>) -> PyResult<PyObject> {
+    fn get_many(&mut self, py: Python, oids: Vec<PyBackedStr>) -> PyResult<PyObject> {
         Self::send_and_recv::<OpGetMany, _>(self, oids, None, py)
     }
     // Prepare and send GET request with multiple oids
-    fn send_get_many(&mut self, py: Python, oids: Vec<&str>) -> PyResult<()> {
+    fn send_get_many(&mut self, py: Python, oids: Vec<PyBackedStr>) -> PyResult<()> {
         Self::send_request::<OpGetMany, _>(self, oids, py)
     }
     fn recv_get_many(&mut self, py: Python) -> PyResult<PyObject> {

diff --git a/src/socket/v2c.rs b/src/socket/v2c.rs
@@ -17,7 +17,7 @@ use crate::{
         pdu::SnmpPdu,
     },
 };
-use pyo3::prelude::*;
+use pyo3::{prelude::*, pybacked::PyBackedStr};
 use socket2::Socket;
 use std::os::fd::AsRawFd;
 
@@ -65,11 +65,11 @@ impl SnmpV2cClientSocket {
     }
     // .get_many()
     // Prepare and send GET request with multiple oids and receive reply
-    fn get_many(&mut self, py: Python, oids: Vec<&str>) -> PyResult<PyObject> {
+    fn get_many(&mut self, py: Python, oids: Vec<PyBackedStr>) -> PyResult<PyObject> {
         Self::send_and_recv::<OpGetMany, _>(self, oids, None, py)
     }
     // Prepare and send GET request with multiple oids
-    fn send_get_many(&mut self, py: Python, oids: Vec<&str>) -> PyResult<()> {
+    fn send_get_many(&mut self, py: Python, oids: Vec<PyBackedStr>) -> PyResult<()> {
         Self::send_request::<OpGetMany, _>(self, oids, py)
     }
     fn recv_get_many(&mut self, py: Python) -> PyResult<PyObject> {

diff --git a/src/socket/v3.rs b/src/socket/v3.rs
@@ -17,8 +17,8 @@ use crate::{
     snmp::op::{GetIter, OpGet, OpGetBulk, OpGetMany, OpGetNext, OpRefresh},
     snmp::pdu::SnmpPdu,
 };
-use pyo3::prelude::*;
 use pyo3::types::PyBytes;
+use pyo3::{prelude::*, pybacked::PyBackedStr};
 use socket2::Socket;
 use std::os::fd::AsRawFd;
 
@@ -129,11 +129,11 @@ impl SnmpV3ClientSocket {
     }
     // .get_many()
     // Prepare and send GET request with multiple oids and receive reply
-    fn get_many(&mut self, py: Python, oids: Vec<&str>) -> PyResult<PyObject> {
+    fn get_many(&mut self, py: Python, oids: Vec<PyBackedStr>) -> PyResult<PyObject> {
         Self::send_and_recv::<OpGetMany, _>(self, oids, None, py)
     }
     // Prepare and send GET request with multiple oids
-    fn send_get_many(&mut self, py: Python, oids: Vec<&str>) -> PyResult<()> {
+    fn send_get_many(&mut self, py: Python, oids: Vec<PyBackedStr>) -> PyResult<()> {
         Self::send_request::<OpGetMany, _>(self, oids, py)
     }
     fn recv_get_many(&mut self, py: Python) -> PyResult<PyObject> {