Skip to content

Commit

Permalink
cargo fmt --all
Browse files Browse the repository at this point in the history
  • Loading branch information
@sam0x17
sam0x17 committed Sep 19, 2024
1 parent 2a35d78 commit 3ffcdec
Show file tree
Hide file tree
Showing 6 changed files with 193 additions and 192 deletions.
38 changes: 22 additions & 16 deletions support/procedural-fork/src/construct_runtime/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,13 +388,16 @@ fn construct_runtime_final_expansion(

let features = pallets
.iter()
.filter(|&decl| (!decl.cfg_pattern.is_empty())).flat_map(|decl| decl.cfg_pattern.iter().flat_map(|attr| {
attr.predicates().filter_map(|pred| match pred {
Predicate::Feature(feat) => Some(feat),
Predicate::Test => Some("test"),
_ => None,
})
}))
.filter(|&decl| (!decl.cfg_pattern.is_empty()))
.flat_map(|decl| {
decl.cfg_pattern.iter().flat_map(|attr| {
attr.predicates().filter_map(|pred| match pred {
Predicate::Feature(feat) => Some(feat),
Predicate::Test => Some("test"),
_ => None,
})
})
})
.collect::<HashSet<_>>();

let hidden_crate_name = "construct_runtime";
Expand Down Expand Up @@ -434,15 +437,17 @@ fn construct_runtime_final_expansion(
let integrity_test = decl_integrity_test(&scrate);
let static_assertions = decl_static_assertions(&name, &pallets, &scrate);

let warning = where_section.map(|where_section| proc_macro_warning::Warning::new_deprecated("WhereSection")
.old("use a `where` clause in `construct_runtime`")
.new(
"use `frame_system::Config` to set the `Block` type and delete this clause.
let warning = where_section.map(|where_section| {
proc_macro_warning::Warning::new_deprecated("WhereSection")
.old("use a `where` clause in `construct_runtime`")
.new(
"use `frame_system::Config` to set the `Block` type and delete this clause.
It is planned to be removed in December 2023",
)
.help_links(&["https://github.com/paritytech/substrate/pull/14437"])
.span(where_section.span)
.build_or_panic());
)
.help_links(&["https://github.com/paritytech/substrate/pull/14437"])
.span(where_section.span)
.build_or_panic()
});

let res = quote!(
#warning
Expand Down Expand Up @@ -536,7 +541,8 @@ pub(crate) fn decl_all_pallets<'a>(

// Every feature set to the pallet names that should be included by this feature set.
let mut features_to_names = features
.iter().copied()
.iter()
.copied()
.powerset()
.map(|feat| (HashSet::from_iter(feat), Vec::new()))
.collect::<Vec<(HashSet<_>, Vec<_>)>>();
Expand Down
242 changes: 122 additions & 120 deletions support/procedural-fork/src/no_bound/default.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,132 +27,134 @@ pub fn derive_default_no_bound(input: proc_macro::TokenStream) -> proc_macro::To

let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();

let impl_ =
match input.data {
Data::Struct(struct_) => match struct_.fields {
Fields::Named(named) => {
let fields = named.named.iter().map(|field| &field.ident).map(|ident| {
quote_spanned! {ident.span() =>
#ident: ::core::default::Default::default()
}
});
let impl_ = match input.data {
Data::Struct(struct_) => match struct_.fields {
Fields::Named(named) => {
let fields = named.named.iter().map(|field| &field.ident).map(|ident| {
quote_spanned! {ident.span() =>
#ident: ::core::default::Default::default()
}
});

quote!(Self { #( #fields, )* })
}
Fields::Unnamed(unnamed) => {
let fields = unnamed.unnamed.iter().map(|field| {
quote_spanned! {field.span()=>
::core::default::Default::default()
}
});

quote!(Self( #( #fields, )* ))
}
Fields::Unit => {
quote!(Self)
}
},
Data::Enum(enum_) => {
if enum_.variants.is_empty() {
return syn::Error::new_spanned(name, "cannot derive Default for an empty enum")
.to_compile_error()
.into();
}

quote!(Self { #( #fields, )* })
}
Fields::Unnamed(unnamed) => {
let fields = unnamed.unnamed.iter().map(|field| {
quote_spanned! {field.span()=>
::core::default::Default::default()
// all #[default] attrs with the variant they're on; i.e. a var
let default_variants = enum_
.variants
.into_iter()
.filter(|variant| {
variant
.attrs
.iter()
.any(|attr| attr.path().is_ident("default"))
})
.collect::<Vec<_>>();

match &*default_variants {
[] => return syn::Error::new(
name.clone().span(),
"no default declared, make a variant default by placing `#[default]` above it",
)
.into_compile_error()
.into(),
// only one variant with the #[default] attribute set
[default_variant] => {
let variant_attrs = default_variant
.attrs
.iter()
.filter(|a| a.path().is_ident("default"))
.collect::<Vec<_>>();

// check that there is only one #[default] attribute on the variant
if let [first_attr, second_attr, additional_attrs @ ..] = &*variant_attrs {
let mut err =
syn::Error::new(Span::call_site(), "multiple `#[default]` attributes");

err.combine(syn::Error::new_spanned(
first_attr,
"`#[default]` used here",
));

err.extend([second_attr].into_iter().chain(additional_attrs).map(
|variant| {
syn::Error::new_spanned(variant, "`#[default]` used again here")
},
));

return err.into_compile_error().into();
}

let variant_ident = &default_variant.ident;

let fully_qualified_variant_path = quote!(Self::#variant_ident);

match &default_variant.fields {
Fields::Named(named) => {
let fields =
named.named.iter().map(|field| &field.ident).map(|ident| {
quote_spanned! {ident.span()=>
#ident: ::core::default::Default::default()
}
});

quote!(#fully_qualified_variant_path { #( #fields, )* })
}
});

quote!(Self( #( #fields, )* ))
}
Fields::Unit => {
quote!(Self)
}
},
Data::Enum(enum_) => {
if enum_.variants.is_empty() {
return syn::Error::new_spanned(name, "cannot derive Default for an empty enum")
.to_compile_error()
.into();
Fields::Unnamed(unnamed) => {
let fields = unnamed.unnamed.iter().map(|field| {
quote_spanned! {field.span()=>
::core::default::Default::default()
}
});

quote!(#fully_qualified_variant_path( #( #fields, )* ))
}
Fields::Unit => fully_qualified_variant_path,
}
}
[first, additional @ ..] => {
let mut err = syn::Error::new(Span::call_site(), "multiple declared defaults");

// all #[default] attrs with the variant they're on; i.e. a var
let default_variants = enum_
.variants
.into_iter()
.filter(|variant| {
variant
.attrs
err.combine(syn::Error::new_spanned(first, "first default"));

err.extend(
additional
.iter()
.any(|attr| attr.path().is_ident("default"))
})
.collect::<Vec<_>>();

match &*default_variants {
[] => return syn::Error::new(
name.clone().span(),
"no default declared, make a variant default by placing `#[default]` above it",
)
.into_compile_error()
.into(),
// only one variant with the #[default] attribute set
[default_variant] => {
let variant_attrs = default_variant
.attrs
.iter()
.filter(|a| a.path().is_ident("default"))
.collect::<Vec<_>>();

// check that there is only one #[default] attribute on the variant
if let [first_attr, second_attr, additional_attrs @ ..] = &*variant_attrs {
let mut err =
syn::Error::new(Span::call_site(), "multiple `#[default]` attributes");

err.combine(syn::Error::new_spanned(first_attr, "`#[default]` used here"));

err.extend([second_attr].into_iter().chain(additional_attrs).map(
|variant| {
syn::Error::new_spanned(variant, "`#[default]` used again here")
},
));

return err.into_compile_error().into()
}

let variant_ident = &default_variant.ident;

let fully_qualified_variant_path = quote!(Self::#variant_ident);

match &default_variant.fields {
Fields::Named(named) => {
let fields =
named.named.iter().map(|field| &field.ident).map(|ident| {
quote_spanned! {ident.span()=>
#ident: ::core::default::Default::default()
}
});

quote!(#fully_qualified_variant_path { #( #fields, )* })
},
Fields::Unnamed(unnamed) => {
let fields = unnamed.unnamed.iter().map(|field| {
quote_spanned! {field.span()=>
::core::default::Default::default()
}
});

quote!(#fully_qualified_variant_path( #( #fields, )* ))
},
Fields::Unit => fully_qualified_variant_path,
}
},
[first, additional @ ..] => {
let mut err = syn::Error::new(Span::call_site(), "multiple declared defaults");

err.combine(syn::Error::new_spanned(first, "first default"));

err.extend(
additional
.iter()
.map(|variant| syn::Error::new_spanned(variant, "additional default")),
);

return err.into_compile_error().into()
},
}
}
Data::Union(union_) => {
return syn::Error::new_spanned(
union_.union_token,
"Union type not supported by `derive(DefaultNoBound)`",
)
.to_compile_error()
.into()
.map(|variant| syn::Error::new_spanned(variant, "additional default")),
);

return err.into_compile_error().into();
}
}
};
}
Data::Union(union_) => {
return syn::Error::new_spanned(
union_.union_token,
"Union type not supported by `derive(DefaultNoBound)`",
)
.to_compile_error()
.into()
}
};

quote!(
const _: () = {
Expand Down
8 changes: 4 additions & 4 deletions support/procedural-fork/src/pallet/parse/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ impl Def {
"A `#[pallet::tasks_experimental]` attribute must be attached to your `Task` impl if the \
task enum has been omitted",
));
}
}
}
_ => (),
}
Expand Down Expand Up @@ -419,9 +419,9 @@ impl Def {
instances.extend_from_slice(&genesis_config.instances[..]);
}
if let Some(genesis_build) = &self.genesis_build {
if let Some(i) = genesis_build
.instances
.as_ref() { instances.extend_from_slice(i) }
if let Some(i) = genesis_build.instances.as_ref() {
instances.extend_from_slice(i)
}
}
if let Some(extra_constants) = &self.extra_constants {
instances.extend_from_slice(&extra_constants.instances[..]);
Expand Down
Loading

0 comments on commit 3ffcdec

Please sign in to comment.