aboutsummaryrefslogtreecommitdiff
path: root/macros/src
diff options
context:
space:
mode:
authorGravatar Jonas Schievink <jonasschievink@gmail.com> 2017-09-06 19:06:43 +0200
committerGravatar Jonas Schievink <jonasschievink@gmail.com> 2017-09-06 19:06:43 +0200
commit57ed0963ff3f64754935913943e6c7b20591a905 (patch)
tree006e862de2ccdb992d88093d455a9ed96b8726d4 /macros/src
parentc8bdb7329f860697602f98983917aaf84d8741d4 (diff)
downloadrtic-57ed0963ff3f64754935913943e6c7b20591a905.tar.gz
rtic-57ed0963ff3f64754935913943e6c7b20591a905.tar.zst
rtic-57ed0963ff3f64754935913943e6c7b20591a905.zip
Use `untagged_option` crate
Diffstat (limited to 'macros/src')
-rw-r--r--macros/src/trans.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/macros/src/trans.rs b/macros/src/trans.rs
index ef23aa5f..0ab6f53f 100644
--- a/macros/src/trans.rs
+++ b/macros/src/trans.rs
@@ -233,7 +233,7 @@ fn init(app: &App, main: &mut Vec<Tokens>, root: &mut Vec<Tokens>) {
});
late_resources.push(quote! {
- #_name = #krate::LateResource { init: _late_resources.#name };
+ #_name = #krate::UntaggedOption { some: _late_resources.#name };
});
}
@@ -344,7 +344,7 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
},
None => quote! {
// Resource initialized in `init`
- static mut #_name: #krate::LateResource<#ty> = #krate::LateResource { uninit: () };
+ static mut #_name: #krate::UntaggedOption<#ty> = #krate::UntaggedOption { none: () };
},
});
}
@@ -587,7 +587,7 @@ fn tasks(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
}
} else {
quote! {
- #name: ::#krate::Static::ref_mut(&mut ::#_name.init),
+ #name: ::#krate::Static::ref_mut(::#_name.as_mut()),
}
});
} else {