diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-11-09 08:59:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-09 08:59:36 +0000 |
| commit | ae034aec14bf44e83e2720c81b98031d38992133 (patch) | |
| tree | bf1c83bdc512696a67c14f9a6746b49c0aba0e6b /macros | |
| parent | 7155b55ac8ff4e5f8860bd6f81c39d31756af633 (diff) | |
| parent | 0492d98916fb05f0ce0906b42bf7f2ee292f4b18 (diff) | |
Merge #550
550: Release 0.6.0-rc.3 due to breaking change in rtic-syntax naming of shared and local r=korken89 a=AfoHT
`rtic-syntax` got the old multicore concept of `Locations` removed, see https://github.com/rtic-rs/rtic-syntax/pull/61
This updates `cortex-m-rtic` to match this
Co-authored-by: Henrik Tjäder <henrik@grepit.se>
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/Cargo.toml | 4 | ||||
| -rw-r--r-- | macros/src/codegen/post_init.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/macros/Cargo.toml b/macros/Cargo.toml index 986e22b..de335bc 100644 --- a/macros/Cargo.toml +++ b/macros/Cargo.toml @@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0" name = "cortex-m-rtic-macros" readme = "../README.md" repository = "https://github.com/rtic-rs/cortex-m-rtic" -version = "0.6.0-rc.2" +version = "0.6.0-rc.3" [lib] proc-macro = true @@ -22,4 +22,4 @@ proc-macro2 = "1" proc-macro-error = "1" quote = "1" syn = "1" -rtic-syntax = "0.5.0-rc.1" +rtic-syntax = "0.5.0-rc.2" diff --git a/macros/src/codegen/post_init.rs b/macros/src/codegen/post_init.rs index 07fbd03..8bd3a7d 100644 --- a/macros/src/codegen/post_init.rs +++ b/macros/src/codegen/post_init.rs @@ -14,7 +14,7 @@ pub fn codegen(app: &App, analysis: &Analysis) -> Vec<TokenStream2> { let mangled_name = util::static_shared_resource_ident(name); // If it's live let cfgs = res.cfgs.clone(); - if analysis.shared_resource_locations.get(name).is_some() { + if analysis.shared_resources.get(name).is_some() { stmts.push(quote!( // We include the cfgs #(#cfgs)* @@ -31,7 +31,7 @@ pub fn codegen(app: &App, analysis: &Analysis) -> Vec<TokenStream2> { let mangled_name = util::static_local_resource_ident(name); // If it's live let cfgs = res.cfgs.clone(); - if analysis.local_resource_locations.get(name).is_some() { + if analysis.local_resources.get(name).is_some() { stmts.push(quote!( // We include the cfgs #(#cfgs)* |