Skip to content

Commit

Permalink
Format
Browse files Browse the repository at this point in the history
  • Loading branch information
filmor committed Jan 8, 2024
1 parent 1aedf74 commit f13c7ad
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 11 deletions.
4 changes: 2 additions & 2 deletions rustler/src/serde/de.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ impl<'de, 'a: 'de> de::Deserializer<'de> for Deserializer<'a> {
try_parse_number!(self.term, i64, visitor, visit_i64);

Err(Error::ExpectedNumber)
},
}
TermType::Float => {
try_parse_number!(self.term, f64, visitor, visit_f64);

Err(Error::ExpectedNumber)
},
}
// char
// string
// byte array
Expand Down
3 changes: 1 addition & 2 deletions rustler/src/serde/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ impl From<Error> for NifError {
}
}

impl std::error::Error for Error {
}
impl std::error::Error for Error {}

impl ser::Error for Error {
fn custom<T: Display>(msg: T) -> Error {
Expand Down
2 changes: 1 addition & 1 deletion rustler/src/serde/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pub use de::{from_term, Deserializer};
pub use error::Error;
pub use ser::{to_term, Serializer};

use crate::{Term, Encoder, Env, Decoder, NifResult};
use crate::{Decoder, Encoder, Env, NifResult, Term};

/* impl<T: ?Sized> crate::Encoder for T where T: serde::Serialize {
fn encode<'a>(&self, env: crate::Env<'a>) -> crate::Term<'a> {
Expand Down
2 changes: 1 addition & 1 deletion rustler/src/serde/util.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::serde::{atoms, Error};
use crate::{types::tuple, Binary, Decoder, Env, Term, Encoder};
use crate::{types::tuple, Binary, Decoder, Encoder, Env, Term};

/// Converts an `&str` to either an existing atom or an Elixir bitstring.
pub fn str_to_term<'a>(env: &Env<'a>, string: &str) -> Result<Term<'a>, Error> {
Expand Down
4 changes: 2 additions & 2 deletions rustler_tests/native/rustler_serde_test/src/json.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use rustler::{Env, Error as NifError, NifResult, Term, Binary};
use serde_bytes::Bytes;
use rustler::serde::{to_term, Deserializer, Serializer};
use rustler::{Binary, Env, Error as NifError, NifResult, Term};
use serde_bytes::Bytes;
use serde_transcode::transcode;

#[nif]
Expand Down
2 changes: 1 addition & 1 deletion rustler_tests/native/rustler_serde_test/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ mod test;
mod types;

use crate::types::Animal;
use rustler::{types::tuple, Encoder, Env, NifResult, Term};
use rustler::serde::{atoms, from_term, to_term, Deserializer, Error, Serializer};
use rustler::{types::tuple, Encoder, Env, NifResult, Term};

init! {
"Elixir.SerdeRustlerTests",
Expand Down
9 changes: 7 additions & 2 deletions rustler_tests/native/rustler_serde_test/src/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,20 @@ use crate::{
UnitVariant,
},
};
use rustler::serde::{atoms, from_term, to_term};
use rustler::{Encoder, Env, NifResult, Term};
use serde::{Deserialize, Serialize};
use serde_bytes::Bytes;
use rustler::serde::{atoms, from_term, to_term};
use std::{collections::HashMap, fmt::Debug};

/// Serializes or deserializes a known Elixir term to/from a known Rust value, asserts that the resulting is equivalent to known term/value.
#[nif]
pub fn test<'a>(env: Env<'a>, test_type: &str, test_name: &str, expected_term: Term<'a>) -> NifResult<Term<'a>> {
pub fn test<'a>(
env: Env<'a>,
test_type: &str,
test_name: &str,
expected_term: Term<'a>,
) -> NifResult<Term<'a>> {
macro_rules! run_test {
($actual:expr) => {
run_test(env, test_type, $actual, expected_term)
Expand Down

0 comments on commit f13c7ad

Please sign in to comment.