Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Fmt
  • Loading branch information
ascjones committed Aug 10, 2020
commit 51494ad72bee38ebb22e4b54285e239fdd1be8f8
2 changes: 1 addition & 1 deletion src/registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ use crate::{
meta_type::MetaType,
Type,
};
use scale::{Encode, Decode};
use scale::{Decode, Encode};
use serde::{Deserialize, Serialize};

/// Compacts the implementor using a registry.
Expand Down
4 changes: 2 additions & 2 deletions src/ty/composite.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ use crate::{
Field, IntoCompact, Registry,
};
use derive_more::From;
use scale::{Encode, Decode};
use serde::{Serialize, Deserialize, de::DeserializeOwned};
use scale::{Decode, Encode};
use serde::{de::DeserializeOwned, Deserialize, Serialize};

/// A composite type, consisting of either named (struct) or unnamed (tuple
/// struct) fields
Expand Down
2 changes: 1 addition & 1 deletion src/ty/fields.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use crate::{
IntoCompact, MetaType, Registry, TypeInfo,
};
use scale::{Decode, Encode};
use serde::{Serialize, Deserialize, de::DeserializeOwned};
use serde::{de::DeserializeOwned, Deserialize, Serialize};

/// A field of a struct like data type.
///
Expand Down
2 changes: 1 addition & 1 deletion src/ty/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use crate::{
};
use derive_more::From;
use scale::{Decode, Encode};
use serde::{Serialize, Deserialize, de::DeserializeOwned};
use serde::{de::DeserializeOwned, Deserialize, Serialize};

mod composite;
mod fields;
Expand Down
11 changes: 8 additions & 3 deletions src/ty/path.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.

use crate::{IntoCompact, form::{CompactForm, Form, MetaForm}, tm_std::*, utils::is_rust_identifier, Registry};
use crate::{
form::{CompactForm, Form, MetaForm},
tm_std::*,
utils::is_rust_identifier,
IntoCompact, Registry,
};
use scale::{Decode, Encode};
use serde::{Serialize, Deserialize, de::DeserializeOwned};
use serde::{de::DeserializeOwned, Deserialize, Serialize};

/// Represents the path of a type definition.
///
Expand Down Expand Up @@ -103,7 +108,7 @@ impl Path {

impl<T> Path<T>
where
T: Form
T: Form,
{
/// Returns `true` if the path is empty
pub fn is_empty(&self) -> bool {
Expand Down
4 changes: 2 additions & 2 deletions src/ty/variant.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ use crate::{
Field, IntoCompact, Registry,
};
use derive_more::From;
use scale::{Encode, Decode};
use serde::{Serialize, Deserialize, de::DeserializeOwned};
use scale::{Decode, Encode};
use serde::{de::DeserializeOwned, Deserialize, Serialize};

/// A Enum type (consisting of variants).
///
Expand Down
10 changes: 4 additions & 6 deletions test_suite/tests/codec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,21 @@ extern crate alloc;
use alloc::{vec, vec::Vec};

use pretty_assertions::{assert_eq, assert_ne};
use scale::{Encode, Decode};
use scale_info::{form::CompactForm, MetaType, IntoCompact as _, Registry, RegistryReadOnly, TypeInfo};
use scale::{Decode, Encode};
use scale_info::{form::CompactForm, IntoCompact as _, MetaType, Registry, RegistryReadOnly, TypeInfo};

#[derive(TypeInfo)]
struct A<T> {
a: bool,
b: Result<char, u32>,
c: T
c: T,
}

#[derive(TypeInfo)]
enum B {
A,
B(A<bool>),
C {
d: [u8; 32]
}
C { d: [u8; 32] },
}

#[test]
Expand Down