Skip to content

Commit 7770c76

Browse files
committed
Upgrade to pyo3 0.24
1 parent 928884f commit 7770c76

File tree

4 files changed

+34
-46
lines changed

4 files changed

+34
-46
lines changed

Cargo.lock

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ crate-type = ["cdylib"]
1010

1111
[dependencies]
1212
gamedig = { version = "0.6.1", features = ["serde", "tls"] }
13-
pyo3 = "0.22.5"
14-
serde-pyobject = "0.4.0"
13+
pyo3 = "0.24.2"
14+
serde-pyobject = "0.6.1"

src/lib.rs

Lines changed: 17 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,56 +6,44 @@ use pyo3::prelude::*;
66

77
#[pymodule]
88
fn gamedig(m: &Bound<'_, PyModule>) -> PyResult<()> {
9-
m.add("GameDigError", m.py().get_type_bound::<GameDigError>())?;
9+
m.add("GameDigError", m.py().get_type::<GameDigError>())?;
1010
m.add(
1111
"PacketOverflowError",
12-
m.py().get_type_bound::<PacketOverflowError>(),
12+
m.py().get_type::<PacketOverflowError>(),
1313
)?;
1414
m.add(
1515
"PacketUnderflowError",
16-
m.py().get_type_bound::<PacketUnderflowError>(),
17-
)?;
18-
m.add("PacketBadError", m.py().get_type_bound::<PacketBadError>())?;
19-
m.add(
20-
"PacketSendError",
21-
m.py().get_type_bound::<PacketSendError>(),
16+
m.py().get_type::<PacketUnderflowError>(),
2217
)?;
18+
m.add("PacketBadError", m.py().get_type::<PacketBadError>())?;
19+
m.add("PacketSendError", m.py().get_type::<PacketSendError>())?;
2320
m.add(
2421
"PacketReceiveError",
25-
m.py().get_type_bound::<PacketReceiveError>(),
22+
m.py().get_type::<PacketReceiveError>(),
2623
)?;
2724
m.add(
2825
"DigDecompressError",
29-
m.py().get_type_bound::<DigDecompressError>(),
26+
m.py().get_type::<DigDecompressError>(),
3027
)?;
3128
m.add(
3229
"DigSocketConnectError",
33-
m.py().get_type_bound::<DigSocketConnectError>(),
34-
)?;
35-
m.add(
36-
"SocketBindError",
37-
m.py().get_type_bound::<SocketBindError>(),
30+
m.py().get_type::<DigSocketConnectError>(),
3831
)?;
39-
m.add(
40-
"InvalidInputError",
41-
m.py().get_type_bound::<InvalidInputError>(),
42-
)?;
43-
m.add("BadGameError", m.py().get_type_bound::<BadGameError>())?;
44-
m.add("AutoQueryError", m.py().get_type_bound::<AutoQueryError>())?;
32+
m.add("SocketBindError", m.py().get_type::<SocketBindError>())?;
33+
m.add("InvalidInputError", m.py().get_type::<InvalidInputError>())?;
34+
m.add("BadGameError", m.py().get_type::<BadGameError>())?;
35+
m.add("AutoQueryError", m.py().get_type::<AutoQueryError>())?;
4536
m.add(
4637
"ProtocolFormatError",
47-
m.py().get_type_bound::<ProtocolFormatError>(),
38+
m.py().get_type::<ProtocolFormatError>(),
4839
)?;
4940
m.add(
5041
"UnknownEnumCastError",
51-
m.py().get_type_bound::<UnknownEnumCastError>(),
52-
)?;
53-
m.add("JsonParseError", m.py().get_type_bound::<JsonParseError>())?;
54-
m.add("TypeParseError", m.py().get_type_bound::<TypeParseError>())?;
55-
m.add(
56-
"HostLookupError",
57-
m.py().get_type_bound::<HostLookupError>(),
42+
m.py().get_type::<UnknownEnumCastError>(),
5843
)?;
44+
m.add("JsonParseError", m.py().get_type::<JsonParseError>())?;
45+
m.add("TypeParseError", m.py().get_type::<TypeParseError>())?;
46+
m.add("HostLookupError", m.py().get_type::<HostLookupError>())?;
5947
m.add_function(wrap_pyfunction!(crate::query::query, m)?)?;
6048
Ok(())
6149
}

src/query.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ pub fn query(
6767
Ok(response) => {
6868
let response_json = response.as_json();
6969
let py_response = to_pyobject(py, &response_json).unwrap();
70-
Ok(py_response.into_py(py))
70+
Ok(py_response.into())
7171
}
7272
}
7373
}

0 commit comments

Comments
 (0)