diff options
| author |  bors[bot] <bors[bot]@users.noreply.github.com>
| 2018-09-06 14:25:05 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com>
| 2018-09-06 14:25:05 +0000 |
| commit | 338d00c1b301446bb558873695df980142c69b9e (patch) | |
| tree | aef38f623c0f75f8921d9936b5b83f43dbde5239 /cortex-m-rt/macros/src | |
| parent | 7854e96f69f98570504c701ae860175efc7a25d9 (diff) | |
| parent | 5fd25ff084daf914207193d15a7ade53cff7411e (diff) | |
| download | cortex-m-338d00c1b301446bb558873695df980142c69b9e.tar.gz cortex-m-338d00c1b301446bb558873695df980142c69b9e.tar.zst cortex-m-338d00c1b301446bb558873695df980142c69b9e.zip | |
Merge #103
103: v0.6.0 r=therealprof a=japaric
this also adds compile-fail soundness tests and patches a soundness issue in
`#[entry]`
commit required to release a new (minor) version
r? @rust-embedded/cortex-m (anyone)
Co-authored-by: Jorge Aparicio <jorge@japaric.io>
Diffstat (limited to 'cortex-m-rt/macros/src')
| -rw-r--r-- | cortex-m-rt/macros/src/lib.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cortex-m-rt/macros/src/lib.rs b/cortex-m-rt/macros/src/lib.rs index bd34b04..3435756 100644 --- a/cortex-m-rt/macros/src/lib.rs +++ b/cortex-m-rt/macros/src/lib.rs @@ -99,7 +99,7 @@ pub fn entry(args: TokenStream, input: TokenStream) -> TokenStream { // XXX should we blacklist other attributes? let attrs = f.attrs; - let ident = f.ident; + let hash = random_ident(); let (statics, stmts) = extract_static_muts(f.block.stmts); let vars = statics @@ -123,11 +123,9 @@ pub fn entry(args: TokenStream, input: TokenStream) -> TokenStream { }).collect::<Vec<_>>(); quote!( - // TODO(forbid) see tests/compile-fail/entry-hidden.rs - // #[forbid(dead_code)] #[export_name = "main"] #(#attrs)* - pub fn #ident() -> ! { + pub fn #hash() -> ! { #(#vars)* #(#stmts)* |