chore: clean ups (#150)

* chore: clean ups

* chore: rename exported prelude to 'private'

* refactor: eip712 domain macro

* test: update fixtures

* docs

README.md

@@ -1,6 +1,7 @@
 # Alloy
 
 Core libraries at the root of the Rust Ethereum ecosystem.
+
 Alloy is a rewrite of ethers-rs from the ground up, with exciting new features,
 high performance & excellent docs.
 Ethers-rs will continue to be maintained until we have feature-parity in Alloy.

crates/rlp-derive/src/de.rs

@@ -1,9 +1,8 @@
+use crate::utils::{attributes_include, field_ident, is_optional, parse_struct, EMPTY_STRING_CODE};
 use proc_macro2::TokenStream;
 use quote::quote;
 use syn::{Error, Result};
 
-use crate::utils::{attributes_include, field_ident, is_optional, parse_struct, EMPTY_STRING_CODE};
-
 pub(crate) fn impl_decodable(ast: &syn::DeriveInput) -> Result<TokenStream> {
     let body = parse_struct(ast, "RlpDecodable")?;
 

crates/rlp-derive/src/en.rs

@@ -1,11 +1,9 @@
-use std::iter::Peekable;
-
+use crate::utils::{attributes_include, field_ident, is_optional, parse_struct, EMPTY_STRING_CODE};
 use proc_macro2::TokenStream;
 use quote::quote;
+use std::iter::Peekable;
 use syn::{Error, Result};
 
-use crate::utils::{attributes_include, field_ident, is_optional, parse_struct, EMPTY_STRING_CODE};
-
 pub(crate) fn impl_encodable(ast: &syn::DeriveInput) -> Result<TokenStream> {
     let body = parse_struct(ast, "RlpEncodable")?;
 

crates/sol-macro/src/expand/event.rs

@@ -1,8 +1,7 @@
 //! [`ItemEvent`] expansion.
 
-use crate::expand::r#type::expand_event_tokenize_func;
-
 use super::{anon_name, expand_tuple_types, expand_type, ExpCtxt};
+use crate::expand::r#type::expand_event_tokenize_func;
 use ast::{EventParameter, ItemEvent, SolIdent};
 use proc_macro2::TokenStream;
 use quote::{quote, quote_spanned};
@@ -120,8 +119,8 @@ pub(super) fn expand(cx: &ExpCtxt<'_>, event: &ItemEvent) -> Result<TokenStream>
                 type TopicList = (#(#topic_list,)*);
 
                 const SIGNATURE: &'static str = #signature;
-                const SIGNATURE_HASH: ::alloy_sol_types::B256 =
-                    ::alloy_sol_types::Word::new(#selector);
+                const SIGNATURE_HASH: ::alloy_sol_types::private::B256 =
+                    ::alloy_sol_types::private::B256::new(#selector);
 
                 const ANONYMOUS: bool = #anonymous;
 

crates/sol-macro/src/expand/struct.rs

@@ -92,7 +92,7 @@ pub(super) fn expand(_cx: &ExpCtxt<'_>, s: &ItemStruct) -> Result<TokenStream> {
 
         #[allow(non_camel_case_types, non_snake_case, clippy::style)]
         const _: () = {
-            use ::alloy_sol_types::no_std_prelude::*;
+            use ::alloy_sol_types::private::*;
 
             #convert
 
@@ -155,7 +155,7 @@ pub(super) fn expand(_cx: &ExpCtxt<'_>, s: &ItemStruct) -> Result<TokenStream> {
                     let mut out = Vec::new();
                     <Self as ::alloy_sol_types::EventTopic>::encode_topic_preimage(rust, &mut out);
                     ::alloy_sol_types::token::WordToken(
-                        ::alloy_sol_types::keccak256(out)
+                        ::alloy_sol_types::private::keccak256(out)
                     )
                 }
             }

crates/sol-macro/src/expand/type.rs

@@ -1,8 +1,7 @@
 //! [`Type`] expansion.
 
-use crate::expand::generate_name;
-
 use super::ExpCtxt;
+use crate::expand::generate_name;
 use ast::{EventParameter, Item, Parameters, Type, TypeArray, VariableDeclaration};
 use proc_macro2::{Literal, TokenStream};
 use quote::{quote, quote_spanned, ToTokens};

crates/sol-types/src/coder/decoder.rs

@@ -8,7 +8,8 @@
 // except according to those terms.
 //
 
-use crate::{encode, no_std_prelude::*, token::TokenSeq, util, Error, Result, TokenType, Word};
+use crate::{encode, token::TokenSeq, util, Error, Result, TokenType, Word};
+use alloc::borrow::Cow;
 use core::{fmt, slice::SliceIndex};
 
 /// The [`Decoder`] wraps a byte slice with necessary info to progressively
@@ -243,13 +244,11 @@ pub fn decode_params<'de, T: TokenSeq<'de>>(data: &'de [u8], validate: bool) ->
 
 #[cfg(test)]
 mod tests {
+    use crate::{sol_data, util::pad_u32, SolType};
+    use alloc::string::ToString;
     use alloy_primitives::{Address, B256, U256};
     use hex_literal::hex;
 
-    #[cfg(not(feature = "std"))]
-    use crate::no_std_prelude::*;
-    use crate::{sol_data, util::pad_u32, SolType};
-
     #[test]
     fn decode_static_tuple_of_addresses_and_uints() {
         type MyTy = (sol_data::Address, sol_data::Address, sol_data::Uint<256>);

crates/sol-types/src/coder/encoder.rs

@@ -8,11 +8,11 @@
 // except according to those terms.
 
 use crate::{
-    no_std_prelude::*,
     token::TokenSeq,
     util::{pad_u32, words_for},
     TokenType, Word,
 };
+use alloc::vec::Vec;
 use core::mem;
 
 /// An ABI encoder.
@@ -171,13 +171,11 @@ pub fn encode_params<'a, T: TokenSeq<'a>>(token: &T) -> Vec<u8> {
 
 #[cfg(test)]
 mod tests {
+    use crate::{sol_data, SolType};
+    use alloc::{borrow::ToOwned, string::ToString};
     use alloy_primitives::{Address, U256};
     use hex_literal::hex;
 
-    #[cfg(not(feature = "std"))]
-    use crate::no_std_prelude::*;
-    use crate::{sol_data, SolType};
-
     #[test]
     fn encode_address() {
         let address = Address::from([0x11u8; 20]);

crates/sol-types/src/coder/token.rs

@@ -16,7 +16,8 @@
 //! - Tuples (T, U, V, ...)
 //! - Dynamic-length byte arrays `u8[]`
 
-use crate::{no_std_prelude::*, Decoder, Encoder, Result, Word};
+use crate::{Decoder, Encoder, Result, Word};
+use alloc::vec::Vec;
 use alloy_primitives::{Address, FixedBytes, I256, U256};
 use core::fmt;