From 79e2b7dc2e891a39b45c4a82a8089697a957f81b Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Fri, 8 Dec 2017 13:31:46 +0100
Subject: [PATCH 1/2] rename LateResourceValues to LateResources

---
 examples/late-resources.rs        | 4 ++--
 macros/src/trans.rs               | 6 +++---
 src/examples/_5_late_resources.rs | 4 ++--
 tests/cfail/late-resource-init.rs | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/examples/late-resources.rs b/examples/late-resources.rs
index 337fbdfa7a..69a0ce8ae0 100644
--- a/examples/late-resources.rs
+++ b/examples/late-resources.rs
@@ -55,7 +55,7 @@ app! {
 }
 
 // The signature of `init` is now required to have a specific return type.
-fn init(_p: init::Peripherals, _r: init::Resources) -> init::LateResourceValues {
+fn init(_p: init::Peripherals, _r: init::Resources) -> init::LateResources {
     // `init::Resources` does not contain `IP_ADDRESS`, since it is not yet
     // initialized.
     //_r.IP_ADDRESS;     // doesn't compile
@@ -63,7 +63,7 @@ fn init(_p: init::Peripherals, _r: init::Resources) -> init::LateResourceValues
     // ...obtain value for IP_ADDRESS from EEPROM/DHCP...
     let ip_address = 0x7f000001;
 
-    init::LateResourceValues {
+    init::LateResources {
         // This struct will contain fields for all resources with omitted
         // initializers.
         IP_ADDRESS: ip_address,
diff --git a/macros/src/trans.rs b/macros/src/trans.rs
index bc69f24e95..96631d5d03 100644
--- a/macros/src/trans.rs
+++ b/macros/src/trans.rs
@@ -234,17 +234,17 @@ fn init(app: &App, main: &mut Vec<Tokens>, root: &mut Vec<Tokens>) {
         root.push(quote! {
             #[allow(non_camel_case_types)]
             #[allow(non_snake_case)]
-            pub struct _initLateResourceValues {
+            pub struct _initLateResources {
                 #(#fields)*
             }
         });
 
         mod_items.push(quote! {
-            pub use ::_initLateResourceValues as LateResourceValues;
+            pub use ::_initLateResources as LateResources;
         });
 
         // `init` must return the initialized resources
-        ret = Some(quote!( -> ::init::LateResourceValues));
+        ret = Some(quote!( -> ::init::LateResources));
     }
 
     root.push(quote! {
diff --git a/src/examples/_5_late_resources.rs b/src/examples/_5_late_resources.rs
index 8a5b6e169e..8df6716cba 100644
--- a/src/examples/_5_late_resources.rs
+++ b/src/examples/_5_late_resources.rs
@@ -57,7 +57,7 @@
 //! }
 //! 
 //! // The signature of `init` is now required to have a specific return type.
-//! fn init(_p: init::Peripherals, _r: init::Resources) -> init::LateResourceValues {
+//! fn init(_p: init::Peripherals, _r: init::Resources) -> init::LateResources {
 //!     // `init::Resources` does not contain `IP_ADDRESS`, since it is not yet
 //!     // initialized.
 //!     //_r.IP_ADDRESS;     // doesn't compile
@@ -65,7 +65,7 @@
 //!     // ...obtain value for IP_ADDRESS from EEPROM/DHCP...
 //!     let ip_address = 0x7f000001;
 //! 
-//!     init::LateResourceValues {
+//!     init::LateResources {
 //!         // This struct will contain fields for all resources with omitted
 //!         // initializers.
 //!         IP_ADDRESS: ip_address,
diff --git a/tests/cfail/late-resource-init.rs b/tests/cfail/late-resource-init.rs
index a997b5c232..cb37887f70 100644
--- a/tests/cfail/late-resource-init.rs
+++ b/tests/cfail/late-resource-init.rs
@@ -30,12 +30,12 @@ app! {
     },
 }
 
-fn init(_p: init::Peripherals, r: init::Resources) -> init::LateResourceValues {
+fn init(_p: init::Peripherals, r: init::Resources) -> init::LateResources {
     // Try to use a resource that's not yet initialized:
     r.LATE;
     //~^ error: no field `LATE`
 
-    init::LateResourceValues {
+    init::LateResources {
         LATE: 0,
     }
 }

From 512091e8a36a4e561500be81533516736ec49340 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Sat, 9 Dec 2017 14:45:59 +0100
Subject: [PATCH 2/2] fix the "generics" example

---
 examples/generics.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/generics.rs b/examples/generics.rs
index afcafa0a40..bc2fe7a81b 100644
--- a/examples/generics.rs
+++ b/examples/generics.rs
@@ -32,8 +32,8 @@ app! {
     },
 }
 
-fn init(p: init::Peripherals) -> init::LateResourceValues {
-    init::LateResourceValues {
+fn init(p: init::Peripherals) -> init::LateResources {
+    init::LateResources {
         GPIOA: p.device.GPIOA,
         SPI1: p.device.SPI1,
     }