fmt

FuelLabs · Oct 4, 2024 · 9864851 · 9864851
1 parent 7adf696
commit 9864851
Show file tree

Hide file tree

Showing 51 changed files with 69 additions and 98 deletions.
diff --git a/sway-ast/src/intrinsics.rs b/sway-ast/src/intrinsics.rs
@@ -1,4 +1,4 @@
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use std::fmt;
 
 #[derive(Eq, PartialEq, Debug, Clone, Hash, Serialize, Deserialize)]

diff --git a/sway-ast/src/priv_prelude.rs b/sway-ast/src/priv_prelude.rs
@@ -35,7 +35,7 @@ pub use {
     },
     extension_trait::extension_trait,
     num_bigint::BigUint,
-    serde::{Serialize, Deserialize},
+    serde::{Deserialize, Serialize},
     sway_types::{
         ast::{Delimiter, PunctKind},
         Ident, Span, Spanned,

diff --git a/sway-core/src/decl_engine/id.rs b/sway-core/src/decl_engine/id.rs
@@ -2,12 +2,12 @@ use crate::{
     decl_engine::*,
     engine_threading::*,
     language::ty::{
-        TyEnumDecl, TyFunctionDecl, TyImplSelfOrTrait, TyStructDecl, TyTraitDecl, TyTraitFn,
-        TyTypeAliasDecl, TyDeclParsedType, TyTraitType,
+        TyDeclParsedType, TyEnumDecl, TyFunctionDecl, TyImplSelfOrTrait, TyStructDecl, TyTraitDecl,
+        TyTraitFn, TyTraitType, TyTypeAliasDecl,
     },
     type_system::*,
 };
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use std::{
     collections::hash_map::DefaultHasher,
     fmt,
@@ -16,7 +16,6 @@ use std::{
 };
 use sway_types::{Named, Spanned};
 
-
 pub type DeclIdIndexType = usize;
 
 /// An ID used to refer to an item in the [DeclEngine](super::decl_engine::DeclEngine)

diff --git a/sway-core/src/decl_engine/interface_decl_id.rs b/sway-core/src/decl_engine/interface_decl_id.rs
@@ -1,3 +1,4 @@
+use super::{parsed_engine::ParsedDeclEngineGet, parsed_id::ParsedDeclId};
 use crate::{
     decl_engine::*,
     engine_threading::{EqWithEngines, PartialEqWithEngines, PartialEqWithEnginesContext},
@@ -6,8 +7,7 @@ use crate::{
         ty,
     },
 };
-use super::{parsed_engine::ParsedDeclEngineGet, parsed_id::ParsedDeclId};
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Eq, PartialEq, Hash, Clone)]
 pub enum ParsedInterfaceDeclId {

diff --git a/sway-core/src/decl_engine/parsed_id.rs b/sway-core/src/decl_engine/parsed_id.rs
@@ -1,13 +1,12 @@
-use crate::engine_threading::{EqWithEngines, PartialEqWithEngines, PartialEqWithEnginesContext};
 use super::DeclUniqueId;
-use serde::{Serialize, Deserialize};
+use crate::engine_threading::{EqWithEngines, PartialEqWithEngines, PartialEqWithEnginesContext};
+use serde::{Deserialize, Serialize};
 use std::{
     hash::{DefaultHasher, Hasher},
     marker::PhantomData,
     {fmt, hash::Hash},
 };
 
-
 pub type ParsedDeclIdIndexType = usize;
 
 /// An ID used to refer to an item in the [ParsedDeclEngine](super::decl_engine::ParsedDeclEngine)

diff --git a/sway-core/src/decl_engine/ref.rs b/sway-core/src/decl_engine/ref.rs
@@ -30,12 +30,11 @@ use crate::{
     semantic_analysis::TypeCheckContext,
     type_system::*,
 };
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use std::hash::{Hash, Hasher};
 use sway_error::handler::{ErrorEmitted, Handler};
 use sway_types::{Ident, Named, Span, Spanned};
 
-
 pub type DeclRefFunction = DeclRef<DeclId<TyFunctionDecl>>;
 pub type DeclRefTrait = DeclRef<DeclId<TyTraitDecl>>;
 pub type DeclRefTraitFn = DeclRef<DeclId<TyTraitFn>>;

diff --git a/sway-core/src/language/asm.rs b/sway-core/src/language/asm.rs
@@ -1,4 +1,4 @@
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use std::hash::{Hash, Hasher};
 use sway_types::{BaseIdent, Ident, Span};
 

diff --git a/sway-core/src/language/call_path.rs b/sway-core/src/language/call_path.rs
@@ -6,7 +6,7 @@ use crate::{
     parsed::QualifiedPathType,
     Engines, Ident, Namespace,
 };
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use std::{
     cmp::Ordering,
     fmt,

diff --git a/sway-core/src/language/lazy_op.rs b/sway-core/src/language/lazy_op.rs
@@ -1,4 +1,4 @@
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub enum LazyOp {

diff --git a/sway-core/src/language/literal.rs b/sway-core/src/language/literal.rs
@@ -1,5 +1,5 @@
 use crate::{type_system::*, Engines};
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use std::{
     fmt,
     hash::{Hash, Hasher},
@@ -8,8 +8,6 @@ use std::{
 use sway_error::error::CompileError;
 use sway_types::{integer_bits::IntegerBits, span, u256::U256};
 
-
-
 #[derive(Debug, Clone, Eq, Serialize, Deserialize)]
 pub enum Literal {
     U8(u8),

diff --git a/sway-core/src/language/parsed/declaration/trait.rs b/sway-core/src/language/parsed/declaration/trait.rs
@@ -1,12 +1,12 @@
+use super::{ConstantDeclaration, FunctionDeclaration, FunctionParameter};
 use crate::{
     decl_engine::{parsed_id::ParsedDeclId, DeclRefTrait},
     engine_threading::*,
     language::*,
     transform,
     type_system::*,
 };
-use super::{ConstantDeclaration, FunctionDeclaration, FunctionParameter};
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use std::hash::{Hash, Hasher};
 use sway_error::handler::ErrorEmitted;
 use sway_types::{ident::Ident, span::Span, Named, Spanned};

diff --git a/sway-core/src/language/parsed/expression/mod.rs b/sway-core/src/language/parsed/expression/mod.rs
@@ -8,7 +8,7 @@ use crate::{
     type_system::TypeBinding,
     Engines, TypeArgument, TypeId,
 };
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use std::{cmp::Ordering, fmt, hash::Hasher};
 use sway_error::handler::ErrorEmitted;
 use sway_types::{ident::Ident, Span, Spanned};

diff --git a/sway-core/src/language/parsed/use_statement.rs b/sway-core/src/language/parsed/use_statement.rs
@@ -1,5 +1,5 @@
 use crate::{language::Visibility, parsed::Span};
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use sway_types::ident::Ident;
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]

diff --git a/sway-core/src/language/purity.rs b/sway-core/src/language/purity.rs
@@ -1,4 +1,4 @@
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 /// The purity of a function is related to its access of contract storage. If a function accesses
 /// or could potentially access contract storage, it is [Purity::Impure]. If a function does not utilize any

diff --git a/sway-core/src/language/ty/ast_node.rs b/sway-core/src/language/ty/ast_node.rs
@@ -10,15 +10,14 @@ use crate::{
     type_system::*,
     types::*,
 };
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use std::{
     fmt::{self, Debug},
     hash::{Hash, Hasher},
 };
 use sway_error::handler::{ErrorEmitted, Handler};
 use sway_types::{Ident, Span};
 
-
 pub trait GetDeclIdent {
     fn get_decl_ident(&self, engines: &Engines) -> Option<Ident>;
 }

diff --git a/sway-core/src/language/ty/code_block.rs b/sway-core/src/language/ty/code_block.rs
@@ -2,7 +2,7 @@ use crate::{
     decl_engine::*, engine_threading::*, language::ty::*, semantic_analysis::TypeCheckContext,
     type_system::*,
 };
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use std::hash::Hasher;
 use sway_error::handler::{ErrorEmitted, Handler};
 use sway_types::Span;

diff --git a/sway-core/src/language/ty/declaration/abi.rs b/sway-core/src/language/ty/declaration/abi.rs
@@ -1,15 +1,14 @@
+use super::{TyDeclParsedType, TyTraitInterfaceItem, TyTraitItem};
 use crate::{
     engine_threading::*,
     language::parsed::{self, AbiDeclaration},
     transform,
     type_system::*,
 };
-use super::{TyDeclParsedType, TyTraitInterfaceItem, TyTraitItem};
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use std::hash::{Hash, Hasher};
 use sway_types::{Ident, Named, Span, Spanned};
 
-
 /// A [TyAbiDecl] contains the type-checked version of the parse tree's
 /// `AbiDeclaration`.
 #[derive(Clone, Debug, Serialize, Deserialize)]

diff --git a/sway-core/src/language/ty/declaration/configurable.rs b/sway-core/src/language/ty/declaration/configurable.rs
@@ -7,7 +7,7 @@ use crate::{
     transform,
     type_system::*,
 };
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use std::{
     fmt,
     hash::{Hash, Hasher},

diff --git a/sway-core/src/language/ty/declaration/constant.rs b/sway-core/src/language/ty/declaration/constant.rs
@@ -7,7 +7,7 @@ use crate::{
     transform,
     type_system::*,
 };
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use std::{
     fmt,
     hash::{Hash, Hasher},

diff --git a/sway-core/src/language/ty/declaration/declaration.rs b/sway-core/src/language/ty/declaration/declaration.rs
@@ -5,7 +5,7 @@ use crate::{
     type_system::*,
     types::*,
 };
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use std::{
     fmt,
     hash::{Hash, Hasher},
@@ -17,8 +17,6 @@ use sway_error::{
 };
 use sway_types::{Ident, Named, Span, Spanned};
 
-
-
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub enum TyDecl {
     VariableDecl(Box<TyVariableDecl>),

diff --git a/sway-core/src/language/ty/declaration/enum.rs b/sway-core/src/language/ty/declaration/enum.rs
@@ -1,12 +1,12 @@
 use crate::{
     engine_threading::*,
     has_changes,
-    language::{parsed::EnumDeclaration, CallPath, Visibility, ty::TyDeclParsedType},
+    language::{parsed::EnumDeclaration, ty::TyDeclParsedType, CallPath, Visibility},
     semantic_analysis::type_check_context::MonomorphizeHelper,
     transform,
     type_system::*,
 };
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use std::{
     cmp::Ordering,
     hash::{Hash, Hasher},
@@ -17,7 +17,6 @@ use sway_error::{
 };
 use sway_types::{Ident, Named, Span, Spanned};
 
-
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct TyEnumDecl {
     pub call_path: CallPath,

diff --git a/sway-core/src/language/ty/declaration/function.rs b/sway-core/src/language/ty/declaration/function.rs
@@ -1,20 +1,20 @@
 use crate::{
+    decl_engine::*,
+    engine_threading::*,
     has_changes,
+    language::{parsed, ty::*, Inline, Purity, Visibility},
     language::{
         parsed::{FunctionDeclaration, FunctionDeclarationKind},
         CallPath,
     },
     semantic_analysis::type_check_context::MonomorphizeHelper,
-    transform::AttributeKind,
-    decl_engine::*,
-    engine_threading::*,
-    language::{parsed, ty::*, Inline, Purity, Visibility},
     semantic_analysis::TypeCheckContext,
     transform,
+    transform::AttributeKind,
     type_system::*,
     types::*,
 };
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
 use std::{
     fmt,

diff --git a/sway-core/src/language/ty/declaration/impl_trait.rs b/sway-core/src/language/ty/declaration/impl_trait.rs
@@ -1,16 +1,15 @@
+use super::{TyDeclParsedType, TyTraitItem};
 use crate::{
     decl_engine::DeclRefMixedInterface,
     engine_threading::*,
     has_changes,
     language::{parsed::ImplSelfOrTrait, CallPath},
     type_system::*,
 };
-use super::{TyDeclParsedType, TyTraitItem};
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use std::hash::{Hash, Hasher};
 use sway_types::{Ident, Named, Span, Spanned};
 
-
 pub type TyImplItem = TyTraitItem;
 
 // impl <A, B, C> Trait<Arg, Arg> for Type<Arg, Arg>

diff --git a/sway-core/src/language/ty/declaration/storage.rs b/sway-core/src/language/ty/declaration/storage.rs
@@ -5,15 +5,14 @@ use crate::{
     type_system::*,
     Namespace,
 };
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use std::hash::{Hash, Hasher};
 use sway_error::{
     error::{CompileError, StructFieldUsageContext},
     handler::{ErrorEmitted, Handler},
 };
 use sway_types::{Ident, Named, Span, Spanned};
 
-
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct TyStorageDecl {
     pub fields: Vec<TyStorageField>,

diff --git a/sway-core/src/language/ty/declaration/struct.rs b/sway-core/src/language/ty/declaration/struct.rs
@@ -2,20 +2,19 @@ use crate::{
     engine_threading::*,
     error::module_can_be_changed,
     has_changes,
-    language::{parsed::StructDeclaration, CallPath, Visibility, ty::TyDeclParsedType},
+    language::{parsed::StructDeclaration, ty::TyDeclParsedType, CallPath, Visibility},
     semantic_analysis::type_check_context::MonomorphizeHelper,
     transform,
     type_system::*,
     Namespace,
 };
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use std::{
     cmp::Ordering,
     hash::{Hash, Hasher},
 };
 use sway_types::{Ident, Named, Span, Spanned};
 
-
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct TyStructDecl {
     pub call_path: CallPath,

diff --git a/sway-core/src/language/ty/declaration/trait.rs b/sway-core/src/language/ty/declaration/trait.rs
@@ -7,8 +7,8 @@ use crate::{
     has_changes,
     language::{
         parsed::{self, TraitDeclaration},
-        CallPath, Visibility,
         ty::{TyDecl, TyDeclParsedType},
+        CallPath, Visibility,
     },
     semantic_analysis::{
         type_check_context::MonomorphizeHelper, TypeCheckAnalysis, TypeCheckAnalysisContext,
@@ -17,15 +17,14 @@ use crate::{
     transform,
     type_system::*,
 };
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use std::{
     fmt,
     hash::{Hash, Hasher},
 };
 use sway_error::handler::{ErrorEmitted, Handler};
 use sway_types::{Ident, Named, Span, Spanned};
 
-
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct TyTraitDecl {
     pub name: Ident,

diff --git a/sway-core/src/language/ty/declaration/trait_type.rs b/sway-core/src/language/ty/declaration/trait_type.rs
@@ -1,16 +1,14 @@
 use crate::{
-    language::ty::TyDeclParsedType,
-    engine_threading::*, has_changes, language::parsed::TraitTypeDeclaration, transform,
-    type_system::*,
+    engine_threading::*, has_changes, language::parsed::TraitTypeDeclaration,
+    language::ty::TyDeclParsedType, transform, type_system::*,
 };
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use std::{
     fmt,
     hash::{Hash, Hasher},
 };
 use sway_types::{Ident, Named, Span, Spanned};
 
-
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct TyTraitType {
     pub name: Ident,