diff options
| author | homunkulus <homunkulus@gmx.com> | 2017-12-09 13:47:10 +0000 |
|---|---|---|
| committer | homunkulus <homunkulus@gmx.com> | 2017-12-09 13:47:10 +0000 |
| commit | 0a0e0e2b382d826ac7b423c91f39d2abf91a010f (patch) | |
| tree | 5b4e2a8c3319f73a2e74a0ea498067f72c560dc3 /examples | |
| parent | e78ca98c42a2af1ca9c04d176441b045cd5e8c65 (diff) | |
| parent | 512091e8a36a4e561500be81533516736ec49340 (diff) | |
Auto merge of #55 - japaric:late-resources, r=japaric
[RFC] rename LateResourceValues to LateResources
After writing `LateResourceValues` several times I now think it's too long to type. I'd like that
struct to be renamed to `LateResources`. I don't think there would be a loss in readability with the
rename because you can think of "late resources" as resources that "don't exist" until `init` ends
instead of as resources that are not initialized after `init` ends -- the second meaning maps better
to `LateResourceValues`.
This would be a breaking-change but we are moving to v0.3.0 due to #50 in any case.
cc jonas-schievink
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/generics.rs | 4 | ||||
| -rw-r--r-- | examples/late-resources.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/generics.rs b/examples/generics.rs index afcafa0..bc2fe7a 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, } diff --git a/examples/late-resources.rs b/examples/late-resources.rs index 337fbdf..69a0ce8 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, |