Fix compilation oopsies

Signed-off-by: Heinz N. Gies <heinz@licenser.net>

Author: Licenser

src/lib.rs

@@ -226,7 +226,9 @@ pub fn to_tape(s: &mut [u8]) -> Result<Tape> {
 /// Will return `Err` if `s` is invalid JSON.
 #[cfg_attr(not(feature = "no-inline"), inline)]
 pub fn to_tape_with_buffers<'de>(s: &'de mut [u8], buffers: &mut Buffers) -> Result<Tape<'de>> {
-    Deserializer::from_slice_with_buffers(s, buffers).map(Deserializer::into_tape)
+    Deserializer::from_slice_with_buffers(s, buffers)
+        .into_result()
+        .map(Deserializer::into_tape)
 }
 
 /// Fills a already existing tape from the input for later consumption
@@ -236,7 +238,7 @@ pub fn to_tape_with_buffers<'de>(s: &'de mut [u8], buffers: &mut Buffers) -> Res
 #[cfg_attr(not(feature = "no-inline"), inline)]
 pub fn fill_tape<'de>(s: &'de mut [u8], buffers: &mut Buffers, tape: &mut Tape<'de>) -> Result<()> {
     tape.0.clear();
-    Deserializer::fill_tape(s, buffers, &mut tape.0)
+    Deserializer::fill_tape(s, buffers, &mut tape.0).into_result()
 }
 
 pub(crate) trait Stage1Parse {

src/serde.rs

@@ -13,6 +13,7 @@ pub use self::se::*;
 pub use self::value::*;
 use crate::{BorrowedValue, OwnedValue};
 use crate::{Buffers, Deserializer, Error, ErrorType, Node, Result};
+use iex::Outcome;
 use serde::de::DeserializeOwned;
 use serde_ext::Deserialize;
 use std::fmt;
@@ -74,7 +75,7 @@ pub fn from_slice_with_buffers<'a, T>(s: &'a mut [u8], buffers: &mut Buffers) ->
 where
     T: Deserialize<'a>,
 {
-    let mut deserializer = Deserializer::from_slice_with_buffers(s, buffers)?;
+    let mut deserializer = Deserializer::from_slice_with_buffers(s, buffers).into_result()?;
     T::deserialize(&mut deserializer)
 }
 
@@ -125,7 +126,8 @@ pub unsafe fn from_str_with_buffers<'a, T>(s: &'a mut str, buffers: &mut Buffers
 where
     T: Deserialize<'a>,
 {
-    let mut deserializer = Deserializer::from_slice_with_buffers(s.as_bytes_mut(), buffers)?;
+    let mut deserializer =
+        Deserializer::from_slice_with_buffers(s.as_bytes_mut(), buffers).into_result()?;
 
     T::deserialize(&mut deserializer)
 }
@@ -168,7 +170,8 @@ where
     if let Err(e) = rdr.read_to_end(&mut data) {
         return Err(Error::generic(ErrorType::Io(e)));
     };
-    let mut deserializer = Deserializer::from_slice_with_buffers(&mut data, buffers)?;
+    let mut deserializer =
+        Deserializer::from_slice_with_buffers(&mut data, buffers).into_result()?;
     T::deserialize(&mut deserializer)
 }
 

src/value.rs

@@ -70,6 +70,7 @@ pub use self::owned::{
 };
 use crate::{Buffers, Deserializer, Result};
 use halfbrown::HashMap;
+use iex::Outcome;
 use std::hash::Hash;
 use std::marker::PhantomData;
 use tape::Node;
@@ -119,7 +120,7 @@ where
     Value: ValueBuilder<'de> + From<Vec<Value>> + From<HashMap<Key, Value, ObjectHasher>> + 'de,
     Key: Hash + Eq + From<&'de str>,
 {
-    match Deserializer::from_slice_with_buffers(s, buffers) {
+    match Deserializer::from_slice_with_buffers(s, buffers).into_result() {
         Ok(de) => Ok(ValueDeserializer::from_deserializer(de).parse()),
         Err(e) => Err(e),
     }

src/value/borrowed.rs

@@ -29,6 +29,7 @@ use crate::{cow::Cow, safer_unchecked::GetSaferUnchecked as _};
 use crate::{prelude::*, Buffers};
 use crate::{Deserializer, Node, Result};
 use halfbrown::HashMap;
+use iex::Outcome;
 use std::fmt;
 use std::ops::{Index, IndexMut};
 
@@ -66,7 +67,7 @@ pub fn to_value_with_buffers<'value>(
     s: &'value mut [u8],
     buffers: &mut Buffers,
 ) -> Result<Value<'value>> {
-    match Deserializer::from_slice_with_buffers(s, buffers) {
+    match Deserializer::from_slice_with_buffers(s, buffers).into_result() {
         Ok(de) => Ok(BorrowDeserializer::from_deserializer(de).parse()),
         Err(e) => Err(e),
     }

src/value/owned.rs

@@ -27,6 +27,7 @@ use super::ObjectHasher;
 use crate::{prelude::*, Buffers};
 use crate::{Deserializer, Node, Result};
 use halfbrown::HashMap;
+use iex::Outcome;
 use std::fmt;
 use std::ops::{Index, IndexMut};
 
@@ -61,7 +62,7 @@ pub fn to_value(s: &mut [u8]) -> Result<Value> {
 ///
 /// Will return `Err` if `s` is invalid JSON.
 pub fn to_value_with_buffers(s: &mut [u8], buffers: &mut Buffers) -> Result<Value> {
-    match Deserializer::from_slice_with_buffers(s, buffers) {
+    match Deserializer::from_slice_with_buffers(s, buffers).into_result() {
         Ok(de) => Ok(OwnedDeserializer::from_deserializer(de).parse()),
         Err(e) => Err(e),
     }