Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

upgrade to macro_magic 0.5.0 #1832

Merged
merged 4 commits into from
Oct 10, 2023
Merged

upgrade to macro_magic 0.5.0 #1832

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99d1cd5
upgrade to macro_magic 0.4.3
sam0x17 Oct 10, 2023
855cf3e
fix typo
sam0x17 Oct 10, 2023
fb55dea
use macro_magic 0.5.0 instead of 0.4.3 since 0.4.3 yanked
sam0x17 Oct 10, 2023
4fa1478
Merge remote-tracking branch 'origin/master' into sam-update-macro-ma…
sam0x17 Oct 10, 2023
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
16 changes: 8 additions & 8 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion substrate/frame/support/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ sp-weights = { path = "../../primitives/weights", default-features = false}
sp-debug-derive = { path = "../../primitives/debug-derive", default-features = false}
sp-metadata-ir = { path = "../../primitives/metadata-ir", default-features = false}
tt-call = "1.0.8"
macro_magic = "0.4.2"
macro_magic = "0.5.0"
frame-support-procedural = { path = "procedural", default-features = false}
paste = "1.0"
sp-state-machine = { path = "../../primitives/state-machine", default-features = false, optional = true}
Expand Down
2 changes: 1 addition & 1 deletion substrate/frame/support/procedural/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ quote = "1.0.28"
syn = { version = "2.0.38", features = ["full"] }
frame-support-procedural-tools = { path = "tools" }
proc-macro-warning = { version = "0.4.2", default-features = false }
macro_magic = { version = "0.4.2", features = ["proc_support"] }
macro_magic = { version = "0.5.0", features = ["proc_support"] }
expander = "2.0.0"
sp-core-hashing = { path = "../../../primitives/core/hashing" }

Expand Down
9 changes: 7 additions & 2 deletions substrate/frame/support/procedural/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,7 +864,12 @@ pub fn register_default_impl(attrs: TokenStream, tokens: TokenStream) -> TokenSt
let item_impl = syn::parse_macro_input!(tokens as ItemImpl);

// internally wrap macro_magic's `#[export_tokens]` macro
match macro_magic::mm_core::export_tokens_internal(attrs, item_impl.to_token_stream(), true) {
match macro_magic::mm_core::export_tokens_internal(
sam0x17 marked this conversation as resolved.
Show resolved Hide resolved
attrs,
item_impl.to_token_stream(),
true,
true,
) {
Ok(tokens) => tokens.into(),
Err(err) => err.to_compile_error().into(),
}
Expand Down Expand Up @@ -1565,7 +1570,7 @@ pub fn pallet_section(attr: TokenStream, tokens: TokenStream) -> TokenStream {
let _mod = parse_macro_input!(tokens_clone as ItemMod);

// use macro_magic's export_tokens as the internal implementation otherwise
match macro_magic::mm_core::export_tokens_internal(attr, tokens, false) {
match macro_magic::mm_core::export_tokens_internal(attr, tokens, false, true) {
Ok(tokens) => tokens.into(),
Err(err) => err.to_compile_error().into(),
}
Expand Down