Skip to content

Make simd idiomatic #479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Ygg01 wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Make simd idiomatic #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23c2ca4
Remove stry! macro and replace with try operator `?`
Ygg01 Sep 3, 2026
e332b7b
Run cargo fmt
Ygg01 Sep 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/macros.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1264,16 +1264,16 @@ pub(crate) use static_cast_u64;
/// FROM serde-json
/// We only use our own error type; no need for From conversions provided by the
/// standard library's try! macro. This reduces lines of LLVM IR by 4%.
macro_rules! stry {
($e:expr_2021) => {
match $e {
::std::result::Result::Ok(val) => val,
::std::result::Result::Err(err) => return ::std::result::Result::Err(err),
}
};
}
#[allow(unused_imports)]
pub(crate) use stry;
// macro_rules! stry {
// ($e:expr_2021) => {
// match $e {
// ::std::result::Result::Ok(val) => val,
// ::std::result::Result::Err(err) => return ::std::result::Result::Err(err),
// }
// };
// }
// #[allow(unused_imports)]
// pub(crate) use stry;

#[cfg(test)]
mod test {
Expand Down
40 changes: 19 additions & 21 deletions src/serde.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ mod value;
pub use self::se::*;
pub use self::value::*;
use crate::{BorrowedValue, OwnedValue};
use crate::{Buffers, Deserializer, Error, ErrorType, Node, Result, macros::stry};
use crate::{Buffers, Deserializer, Error, ErrorType, Node, Result};
use serde::de::DeserializeOwned;
use serde_ext::Deserialize;
use std::fmt;
Expand Down Expand Up @@ -57,7 +57,7 @@ pub fn from_slice<'a, T>(s: &'a mut [u8]) -> Result<T>
where
T: Deserialize<'a>,
{
let mut deserializer = stry!(Deserializer::from_slice(s));
let mut deserializer = Deserializer::from_slice(s)?;
T::deserialize(&mut deserializer)
}

Expand All @@ -74,7 +74,7 @@ pub fn from_slice_with_buffers<'a, T>(s: &'a mut [u8], buffers: &mut Buffers) ->
where
T: Deserialize<'a>,
{
let mut deserializer = stry!(Deserializer::from_slice_with_buffers(s, buffers));
let mut deserializer = Deserializer::from_slice_with_buffers(s, buffers)?;
T::deserialize(&mut deserializer)
}

Expand All @@ -98,7 +98,7 @@ pub unsafe fn from_str<'a, T>(s: &'a mut str) -> Result<T>
where
T: Deserialize<'a>,
{
let mut deserializer = stry!(Deserializer::from_slice(unsafe { s.as_bytes_mut() }));
let mut deserializer = Deserializer::from_slice(unsafe { s.as_bytes_mut() })?;

T::deserialize(&mut deserializer)
}
Expand All @@ -125,10 +125,8 @@ pub unsafe fn from_str_with_buffers<'a, T>(s: &'a mut str, buffers: &mut Buffers
where
T: Deserialize<'a>,
{
let mut deserializer = stry!(Deserializer::from_slice_with_buffers(
unsafe { s.as_bytes_mut() },
buffers
));
let mut deserializer =
Deserializer::from_slice_with_buffers(unsafe { s.as_bytes_mut() }, buffers)?;

T::deserialize(&mut deserializer)
}
Expand Down Expand Up @@ -156,7 +154,7 @@ where
if let Err(e) = rdr.read_to_end(&mut data) {
return Err(Error::generic(ErrorType::Io(e)));
}
let mut deserializer = stry!(Deserializer::from_slice(&mut data));
let mut deserializer = Deserializer::from_slice(&mut data)?;
T::deserialize(&mut deserializer)
}

Expand All @@ -178,7 +176,7 @@ where
if let Err(e) = rdr.read_to_end(&mut data) {
return Err(Error::generic(ErrorType::Io(e)));
}
let mut deserializer = stry!(Deserializer::from_slice_with_buffers(&mut data, buffers));
let mut deserializer = Deserializer::from_slice_with_buffers(&mut data, buffers)?;
T::deserialize(&mut deserializer)
}

Expand Down Expand Up @@ -218,7 +216,7 @@ impl<'de> Deserializer<'de> {
#[cfg_attr(not(feature = "no-inline"), inline)]
#[allow(clippy::cast_sign_loss)]
fn parse_u8(&mut self) -> Result<u8> {
match stry!(self.next()) {
match self.next()? {
Node::Static(s) => s
.as_u8()
.ok_or_else(|| Self::error(ErrorType::ExpectedUnsigned)),
Expand All @@ -229,7 +227,7 @@ impl<'de> Deserializer<'de> {
#[cfg_attr(not(feature = "no-inline"), inline)]
#[allow(clippy::cast_sign_loss)]
fn parse_u16(&mut self) -> Result<u16> {
let next = stry!(self.next());
let next = self.next()?;
match next {
Node::Static(s) => s
.as_u16()
Expand All @@ -241,7 +239,7 @@ impl<'de> Deserializer<'de> {
#[cfg_attr(not(feature = "no-inline"), inline)]
#[allow(clippy::cast_sign_loss)]
fn parse_u32(&mut self) -> Result<u32> {
match stry!(self.next()) {
match self.next()? {
Node::Static(s) => s
.as_u32()
.ok_or_else(|| Self::error(ErrorType::ExpectedUnsigned)),
Expand All @@ -252,7 +250,7 @@ impl<'de> Deserializer<'de> {
#[cfg_attr(not(feature = "no-inline"), inline)]
#[allow(clippy::cast_sign_loss)]
fn parse_u64(&mut self) -> Result<u64> {
match stry!(self.next()) {
match self.next()? {
Node::Static(s) => s
.as_u64()
.ok_or_else(|| Self::error(ErrorType::ExpectedUnsigned)),
Expand All @@ -263,7 +261,7 @@ impl<'de> Deserializer<'de> {
#[cfg_attr(not(feature = "no-inline"), inline)]
#[allow(clippy::cast_sign_loss)]
fn parse_u128(&mut self) -> Result<u128> {
match stry!(self.next()) {
match self.next()? {
Node::Static(s) => s
.as_u128()
.ok_or_else(|| Self::error(ErrorType::ExpectedUnsigned)),
Expand All @@ -274,7 +272,7 @@ impl<'de> Deserializer<'de> {
#[cfg_attr(not(feature = "no-inline"), inline)]
#[allow(clippy::cast_sign_loss)]
fn parse_i8(&mut self) -> Result<i8> {
match stry!(self.next()) {
match self.next()? {
Node::Static(s) => s
.as_i8()
.ok_or_else(|| Self::error(ErrorType::ExpectedSigned)),
Expand All @@ -285,7 +283,7 @@ impl<'de> Deserializer<'de> {
#[cfg_attr(not(feature = "no-inline"), inline)]
#[allow(clippy::cast_sign_loss)]
fn parse_i16(&mut self) -> Result<i16> {
match stry!(self.next()) {
match self.next()? {
Node::Static(s) => s
.as_i16()
.ok_or_else(|| Self::error(ErrorType::ExpectedSigned)),
Expand All @@ -296,7 +294,7 @@ impl<'de> Deserializer<'de> {
#[cfg_attr(not(feature = "no-inline"), inline)]
#[allow(clippy::cast_sign_loss)]
fn parse_i32(&mut self) -> Result<i32> {
match stry!(self.next()) {
match self.next()? {
Node::Static(s) => s
.as_i32()
.ok_or_else(|| Self::error(ErrorType::ExpectedSigned)),
Expand All @@ -307,7 +305,7 @@ impl<'de> Deserializer<'de> {
#[cfg_attr(not(feature = "no-inline"), inline)]
#[allow(clippy::cast_sign_loss)]
fn parse_i64(&mut self) -> Result<i64> {
match stry!(self.next()) {
match self.next()? {
Node::Static(s) => s
.as_i64()
.ok_or_else(|| Self::error(ErrorType::ExpectedSigned)),
Expand All @@ -318,7 +316,7 @@ impl<'de> Deserializer<'de> {
#[cfg_attr(not(feature = "no-inline"), inline)]
#[allow(clippy::cast_sign_loss)]
fn parse_i128(&mut self) -> Result<i128> {
match stry!(self.next()) {
match self.next()? {
Node::Static(s) => s
.as_i128()
.ok_or_else(|| Self::error(ErrorType::ExpectedSigned)),
Expand All @@ -329,7 +327,7 @@ impl<'de> Deserializer<'de> {
#[cfg_attr(not(feature = "no-inline"), inline)]
#[allow(clippy::cast_possible_wrap, clippy::cast_precision_loss)]
fn parse_double(&mut self) -> Result<f64> {
match stry!(self.next()) {
match self.next()? {
#[allow(clippy::useless_conversion)] // .into() required by ordered-float
Node::Static(StaticNode::F64(n)) => Ok(n.into()),
Node::Static(StaticNode::I64(n)) => Ok(n as f64),
Expand Down
42 changes: 21 additions & 21 deletions src/serde/de.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::serde_ext::de::IntoDeserializer;
use crate::{Deserializer, Error, ErrorType, Node, Result, StaticNode, macros::stry};
use crate::{Deserializer, Error, ErrorType, Node, Result, StaticNode};
use serde_ext::de::{self, DeserializeSeed, MapAccess, SeqAccess, Visitor};
use serde_ext::forward_to_deserialize_any;
use std::str;
Expand All @@ -18,7 +18,7 @@ where
where
V: Visitor<'de>,
{
match stry!(self.next()) {
match self.next()? {
Node::String(s) => visitor.visit_borrowed_str(s),
Node::Static(StaticNode::Null) => visitor.visit_unit(),
Node::Static(StaticNode::Bool(b)) => visitor.visit_bool(b),
Expand Down Expand Up @@ -54,7 +54,7 @@ where
where
V: Visitor<'de>,
{
match stry!(self.next()) {
match self.next()? {
Node::Static(StaticNode::Bool(b)) => visitor.visit_bool(b),
_c => Err(Deserializer::error(ErrorType::ExpectedBoolean)),
}
Expand Down Expand Up @@ -94,7 +94,7 @@ where
where
V: Visitor<'de>,
{
visitor.visit_i8(stry!(self.parse_i8()))
visitor.visit_i8(self.parse_i8()?)
}

#[cfg_attr(not(feature = "no-inline"), inline)]
Expand All @@ -103,7 +103,7 @@ where
where
V: Visitor<'de>,
{
visitor.visit_i16(stry!(self.parse_i16()))
visitor.visit_i16(self.parse_i16()?)
}

#[cfg_attr(not(feature = "no-inline"), inline)]
Expand All @@ -112,23 +112,23 @@ where
where
V: Visitor<'de>,
{
visitor.visit_i32(stry!(self.parse_i32()))
visitor.visit_i32(self.parse_i32()?)
}

#[cfg_attr(not(feature = "no-inline"), inline)]
fn deserialize_i64<V>(self, visitor: V) -> Result<V::Value>
where
V: Visitor<'de>,
{
visitor.visit_i64(stry!(self.parse_i64()))
visitor.visit_i64(self.parse_i64()?)
}

#[cfg_attr(not(feature = "no-inline"), inline)]
fn deserialize_i128<V>(self, visitor: V) -> Result<V::Value>
where
V: Visitor<'de>,
{
visitor.visit_i128(stry!(self.parse_i128()))
visitor.visit_i128(self.parse_i128()?)
}

#[cfg_attr(not(feature = "no-inline"), inline)]
Expand All @@ -137,7 +137,7 @@ where
where
V: Visitor<'de>,
{
visitor.visit_u8(stry!(self.parse_u8()))
visitor.visit_u8(self.parse_u8()?)
}

#[cfg_attr(not(feature = "no-inline"), inline)]
Expand All @@ -146,7 +146,7 @@ where
where
V: Visitor<'de>,
{
visitor.visit_u16(stry!(self.parse_u16()))
visitor.visit_u16(self.parse_u16()?)
}

#[cfg_attr(not(feature = "no-inline"), inline)]
Expand All @@ -155,23 +155,23 @@ where
where
V: Visitor<'de>,
{
visitor.visit_u32(stry!(self.parse_u32()))
visitor.visit_u32(self.parse_u32()?)
}

#[cfg_attr(not(feature = "no-inline"), inline)]
fn deserialize_u64<V>(self, visitor: V) -> Result<V::Value>
where
V: Visitor<'de>,
{
visitor.visit_u64(stry!(self.parse_u64()))
visitor.visit_u64(self.parse_u64()?)
}

#[cfg_attr(not(feature = "no-inline"), inline)]
fn deserialize_u128<V>(self, visitor: V) -> Result<V::Value>
where
V: Visitor<'de>,
{
visitor.visit_u128(stry!(self.parse_u128()))
visitor.visit_u128(self.parse_u128()?)
}

#[cfg_attr(not(feature = "no-inline"), inline)]
Expand All @@ -180,7 +180,7 @@ where
where
V: Visitor<'de>,
{
let v: f64 = stry!(self.parse_double());
let v: f64 = self.parse_double()?;
visitor.visit_f32(v as f32)
}

Expand All @@ -189,7 +189,7 @@ where
where
V: Visitor<'de>,
{
visitor.visit_f64(stry!(self.parse_double()))
visitor.visit_f64(self.parse_double()?)
}

// An absent optional is represented as the JSON `null` and a present
Expand All @@ -206,7 +206,7 @@ where
where
V: Visitor<'de>,
{
if stry!(self.peek()) == Node::Static(StaticNode::Null) {
if self.peek()? == Node::Static(StaticNode::Null) {
self.skip();
visitor.visit_unit()
} else {
Expand All @@ -220,7 +220,7 @@ where
where
V: Visitor<'de>,
{
if stry!(self.next()) != Node::Static(StaticNode::Null) {
if self.next()? != Node::Static(StaticNode::Null) {
return Err(Deserializer::error(ErrorType::ExpectedNull));
}
visitor.visit_unit()
Expand Down Expand Up @@ -372,7 +372,7 @@ impl<'de> de::EnumAccess<'de> for VariantAccess<'_, 'de> {
where
V: de::DeserializeSeed<'de>,
{
let val = stry!(seed.deserialize(&mut *self.de));
let val = seed.deserialize(&mut *self.de)?;
Ok((val, self))
}
}
Expand Down Expand Up @@ -491,12 +491,12 @@ macro_rules! deserialize_integer_key {
where
V: de::Visitor<'de>,
{
visitor.$visit(stry!(match stry!(self.de.next()) {
visitor.$visit(match self.de.next()? {
Node::String(s) => s
.parse::<$type>()
.map_err(|_| Deserializer::error(ErrorType::InvalidNumber)),
_ => Err(Deserializer::error(ErrorType::ExpectedString)),
}))
}?)
}
};
}
Expand All @@ -509,7 +509,7 @@ impl<'de> de::Deserializer<'de> for MapKey<'de, '_> {
where
V: de::Visitor<'de>,
{
match stry!(self.de.next()) {
match self.de.next()? {
Node::String(s) => visitor.visit_borrowed_str(s),
_ => Err(Deserializer::error(ErrorType::ExpectedString)),
}
Expand Down
4 changes: 2 additions & 2 deletions src/serde/se/pp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::{Error, ErrorType, macros::stry};
use crate::{Error, ErrorType};
use serde_ext::ser;
use std::io::Write;
use std::str;
Expand Down Expand Up @@ -87,7 +87,7 @@ where
9 => self.get_writer().write_all(b" "),
_ => {
for _ in 0..(self.dent * 2) {
stry!(self.get_writer().write_all(b" "));
self.get_writer().write_all(b" ")?;
}
Ok(())
}
Expand Down
Loading