Skip to content

Commit 19ba7d7

Browse files
committed
chore: format
1 parent 4471c6c commit 19ba7d7

2 files changed

Lines changed: 21 additions & 29 deletions

File tree

src/conversion.rs

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
use crate::error::Error as SqlxError;
12
#[cfg(feature = "lazy-row")]
23
use crate::lazy_row::{LazyRow, LazyRowJson};
3-
use crate::error::Error as SqlxError;
44
use ext_php_rs::boxed::ZBox;
55
use ext_php_rs::convert::IntoZval;
66
use ext_php_rs::ffi::zend_array;
@@ -50,11 +50,11 @@ pub trait Conversion: Row {
5050
}
5151

5252
if !column_name.is_empty() && column_name != "?column?" {
53-
array.insert(column.name(), value).map_err(|err| {
54-
SqlxError::Conversion {
53+
array
54+
.insert(column.name(), value)
55+
.map_err(|err| SqlxError::Conversion {
5556
message: format!("{err:?}"),
56-
}
57-
})?;
57+
})?;
5858
} else {
5959
array
6060
.insert(i64::try_from(column.ordinal())?, value)
@@ -80,22 +80,18 @@ pub trait Conversion: Row {
8080
});
8181
}
8282
// No lazy JSON and array mode requested - return plain array
83-
return array
84-
.into_zval(false)
85-
.map_err(|err| SqlxError::Conversion {
86-
message: format!("{err:?}"),
87-
});
83+
return array.into_zval(false).map_err(|err| SqlxError::Conversion {
84+
message: format!("{err:?}"),
85+
});
8886
}
8987

9088
// Without lazy-row feature: return array or stdClass based on mode
9189
#[cfg(not(feature = "lazy-row"))]
9290
{
9391
if associative_arrays {
94-
array
95-
.into_zval(false)
96-
.map_err(|err| SqlxError::Conversion {
97-
message: format!("{err:?}"),
98-
})
92+
array.into_zval(false).map_err(|err| SqlxError::Conversion {
93+
message: format!("{err:?}"),
94+
})
9995
} else {
10096
// Convert array to stdClass
10197
let object = array.iter().try_fold(
@@ -165,18 +161,16 @@ pub(crate) fn json_into_zval(
165161
message: format!("String conversion: {err:?}"),
166162
})
167163
}
168-
serde_json::Value::Number(number) => {
169-
if let Some(i) = number.as_i64() {
170-
i.into_zval(false)
171-
} else if let Some(f) = number.as_f64() {
172-
f.into_zval(false)
173-
} else {
174-
number.to_string().into_zval(false)
175-
}
176-
.map_err(|err| SqlxError::Conversion {
177-
message: format!("Number conversion: {err:?}"),
178-
})
164+
serde_json::Value::Number(number) => if let Some(i) = number.as_i64() {
165+
i.into_zval(false)
166+
} else if let Some(f) = number.as_f64() {
167+
f.into_zval(false)
168+
} else {
169+
number.to_string().into_zval(false)
179170
}
171+
.map_err(|err| SqlxError::Conversion {
172+
message: format!("Number conversion: {err:?}"),
173+
}),
180174
serde_json::Value::Bool(bool) => {
181175
bool.into_zval(false).map_err(|err| SqlxError::Conversion {
182176
message: format!("Bool conversion: {err:?}"),

src/lazy_row.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,9 +312,7 @@ impl LazyRowJson {
312312
/// # Errors
313313
///
314314
/// Propagates JSON parsing exceptions.
315-
pub(crate) fn decode_json(
316-
self_: &ZendClassObject<LazyRowJson>,
317-
) -> crate::error::Result<Zval> {
315+
pub(crate) fn decode_json(self_: &ZendClassObject<LazyRowJson>) -> crate::error::Result<Zval> {
318316
#[cfg(feature = "simd-json")]
319317
return json_into_zval(
320318
simd_json::from_slice::<serde_json::Value>(self_.raw.borrow_mut().as_mut_slice())?,

0 commit comments

Comments
 (0)