From 57ed0963ff3f64754935913943e6c7b20591a905 Mon Sep 17 00:00:00 2001
From: Jonas Schievink <jonasschievink@gmail.com>
Date: Wed, 6 Sep 2017 19:06:43 +0200
Subject: Use `untagged_option` crate

---
 macros/src/trans.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'macros/src')

diff --git a/macros/src/trans.rs b/macros/src/trans.rs
index ef23aa5..0ab6f53 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 {
-- 
cgit v1.2.3