Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Carry over where clauses defined in Config to Call and Hook #12388

Merged
merged 1 commit into from
Sep 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion frame/support/procedural/src/pallet/expand/call.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {

(span, where_clause, methods, docs)
},
None => (def.item.span(), None, Vec::new(), Vec::new()),
None => (def.item.span(), def.config.where_clause.clone(), Vec::new(), Vec::new()),
};
let frame_support = &def.frame_support;
let frame_system = &def.frame_system;
Expand Down
2 changes: 1 addition & 1 deletion frame/support/procedural/src/pallet/expand/hooks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
let has_runtime_upgrade = hooks.has_runtime_upgrade;
(where_clause, span, has_runtime_upgrade)
},
None => (None, def.pallet_struct.attr_span, false),
None => (def.config.where_clause.clone(), def.pallet_struct.attr_span, false),
};

let frame_support = &def.frame_support;
Expand Down