Skip to content

Commit 227e08d

Browse files
ijlijl
committed
rustfmt
1 parent ceef6cb commit 227e08d

3 files changed

Lines changed: 45 additions & 41 deletions

File tree

‎src/decode.rs‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// SPDX-License-Identifier: (Apache-2.0 OR MIT)
22

3-
use std::fmt;
4-
use std::marker::PhantomData;
5-
use std::borrow::Cow;
6-
use smallvec::SmallVec;
73
use pyo3::prelude::*;
84
use pyo3::types::*;
95
use serde::de::{self, DeserializeSeed, Deserializer, MapAccess, SeqAccess, Visitor};
6+
use smallvec::SmallVec;
7+
use std::borrow::Cow;
8+
use std::fmt;
9+
use std::marker::PhantomData;
1010

1111
import_exception!(json, JSONDecodeError);
1212

@@ -32,14 +32,12 @@ struct JsonValue<'a> {
3232
}
3333

3434
impl<'a> JsonValue<'a> {
35-
3635
fn new(py: Python<'a>) -> JsonValue<'a> {
3736
JsonValue { py }
3837
}
3938
}
4039

4140
impl<'de, 'a> DeserializeSeed<'de> for JsonValue<'a> {
42-
4341
type Value = PyObject;
4442

4543
fn deserialize<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
@@ -51,7 +49,6 @@ impl<'de, 'a> DeserializeSeed<'de> for JsonValue<'a> {
5149
}
5250

5351
impl<'de, 'a> Visitor<'de> for JsonValue<'a> {
54-
5552
type Value = PyObject;
5653

5754
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
@@ -65,7 +62,6 @@ impl<'de, 'a> Visitor<'de> for JsonValue<'a> {
6562
fn visit_bool<E>(self, value: bool) -> Result<Self::Value, E>
6663
where
6764
E: de::Error,
68-
6965
{
7066
Ok(value.to_object(self.py))
7167
}

‎src/encode.rs‎

Lines changed: 35 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@ use serde::ser::{self, Serialize, SerializeMap, SerializeSeq, Serializer};
66

77
pub fn serialize(py: Python, obj: PyObject) -> PyResult<PyObject> {
88
let typerefs = TypeRefs::new(py);
9-
let s: Result<Vec<u8>, JsonError> = serde_json::to_vec(
10-
&SerializePyObject { py: py, refs: &typerefs, obj: obj.as_ref(py) }
11-
).map_err(|error| JsonError::InvalidConversion { error });
9+
let s: Result<Vec<u8>, JsonError> = serde_json::to_vec(&SerializePyObject {
10+
py: py,
11+
refs: &typerefs,
12+
obj: obj.as_ref(py),
13+
})
14+
.map_err(|error| JsonError::InvalidConversion { error });
1215
Ok(PyBytes::new(py, (s?).as_slice()).into())
1316
}
1417

@@ -17,7 +20,6 @@ pub enum JsonError {
1720
}
1821

1922
impl From<JsonError> for PyErr {
20-
2123
fn from(h: JsonError) -> PyErr {
2224
match h {
2325
JsonError::InvalidConversion { error } => {
@@ -41,7 +43,6 @@ pub struct TypeRefs {
4143
}
4244

4345
impl TypeRefs {
44-
4546
pub fn new(py: Python) -> TypeRefs {
4647
TypeRefs {
4748
str: PyUnicode::new(py, "python").as_ref(py).get_type_ptr(),
@@ -64,31 +65,34 @@ pub struct SerializePyObject<'p, 'a> {
6465
}
6566

6667
impl<'p, 'a> Serialize for SerializePyObject<'p, 'a> {
67-
6868
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
6969
where
7070
S: Serializer,
7171
{
7272
let obj_ptr = self.obj.get_type_ptr();
7373
if obj_ptr == self.refs.str {
74-
let val: &PyUnicode = self.obj.extract().unwrap();
75-
serializer.serialize_str(
76-
unsafe { std::str::from_utf8_unchecked(val.as_bytes()) }
77-
)
74+
let val: &PyUnicode = self.obj.extract().unwrap();
75+
serializer.serialize_str(unsafe { std::str::from_utf8_unchecked(val.as_bytes()) })
7876
} else if obj_ptr == self.refs.bytes {
7977
let val: &PyBytes = self.obj.extract().unwrap();
80-
serializer.serialize_str(
81-
unsafe { std::str::from_utf8_unchecked(val.as_bytes()) }
82-
)
78+
serializer.serialize_str(unsafe { std::str::from_utf8_unchecked(val.as_bytes()) })
8379
} else if obj_ptr == self.refs.dict {
8480
let val: &PyDict = self.obj.extract().unwrap();
8581
let len = val.len();
8682
if len != 0 {
8783
let mut map = serializer.serialize_map(Some(len))?;
8884
for (key, value) in val.iter() {
8985
map.serialize_entry(
90-
&SerializePyObject { py: self.py, refs: self.refs, obj: key },
91-
&SerializePyObject { py: self.py, refs: self.refs, obj: value },
86+
&SerializePyObject {
87+
py: self.py,
88+
refs: self.refs,
89+
obj: key,
90+
},
91+
&SerializePyObject {
92+
py: self.py,
93+
refs: self.refs,
94+
obj: value,
95+
},
9296
)?;
9397
}
9498
map.end()
@@ -101,8 +105,11 @@ impl<'p, 'a> Serialize for SerializePyObject<'p, 'a> {
101105
if len != 0 {
102106
let mut seq = serializer.serialize_seq(Some(len))?;
103107
for element in val {
104-
seq.serialize_element(
105-
&SerializePyObject { py: self.py, refs: self.refs, obj: element })?
108+
seq.serialize_element(&SerializePyObject {
109+
py: self.py,
110+
refs: self.refs,
111+
obj: element,
112+
})?
106113
}
107114
seq.end()
108115
} else {
@@ -114,24 +121,27 @@ impl<'p, 'a> Serialize for SerializePyObject<'p, 'a> {
114121
if len != 0 {
115122
let mut seq = serializer.serialize_seq(Some(len))?;
116123
for element in val {
117-
seq.serialize_element(
118-
&SerializePyObject { py: self.py, refs: self.refs, obj: element }
119-
)?
124+
seq.serialize_element(&SerializePyObject {
125+
py: self.py,
126+
refs: self.refs,
127+
obj: element,
128+
})?
120129
}
121130
seq.end()
122131
} else {
123132
serializer.serialize_seq(None).unwrap().end()
124133
}
125134
} else if obj_ptr == self.refs.bool {
126-
let val: &PyBool = self.obj.extract().unwrap();
127-
serializer.serialize_bool(val.is_true())
135+
let val: &PyBool = self.obj.extract().unwrap();
136+
serializer.serialize_bool(val.is_true())
128137
} else if obj_ptr == self.refs.int {
129138
if let Ok(val) = <i64 as FromPyObject>::extract(self.obj) {
130139
serializer.serialize_i64(val)
131140
} else {
132-
Err(ser::Error::custom(
133-
format_args!("Integer exceeds 64-bit max: {:?}", self.obj)
134-
))
141+
Err(ser::Error::custom(format_args!(
142+
"Integer exceeds 64-bit max: {:?}",
143+
self.obj
144+
)))
135145
}
136146
} else if obj_ptr == self.refs.float {
137147
let val: &PyFloat = self.obj.extract().unwrap();

‎src/lib.rs‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ extern crate smallvec;
1212
use pyo3::prelude::*;
1313
use pyo3::types::*;
1414

15-
mod encode;
1615
mod decode;
16+
mod encode;
1717

1818
#[pymodule]
1919
fn orjson(py: Python, m: &PyModule) -> PyResult<()> {
@@ -31,13 +31,11 @@ pub fn loads(py: Python, obj: PyObject) -> PyResult<PyObject> {
3131
decode::deserialize(py, val.as_bytes())
3232
} else if let Ok(val) = <PyBytes as PyTryFrom>::try_from(obj_ref) {
3333
decode::deserialize(py, val.as_bytes())
34-
}
35-
else {
36-
return Err(
37-
pyo3::exceptions::TypeError::py_err(
38-
format!("Input must be unicode or bytes, not: {}", obj_ref.get_type().name())
39-
)
40-
);
34+
} else {
35+
return Err(pyo3::exceptions::TypeError::py_err(format!(
36+
"Input must be unicode or bytes, not: {}",
37+
obj_ref.get_type().name()
38+
)));
4139
}
4240
}
4341

0 commit comments

Comments
 (0)