mirror of
https://github.com/rtic-rs/rtic.git
synced 2024-11-25 21:19:35 +01:00
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
This commit is contained in:
commit
0a0e0e2b38
5 changed files with 11 additions and 11 deletions
|
@ -32,8 +32,8 @@ app! {
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
fn init(p: init::Peripherals) -> init::LateResourceValues {
|
fn init(p: init::Peripherals) -> init::LateResources {
|
||||||
init::LateResourceValues {
|
init::LateResources {
|
||||||
GPIOA: p.device.GPIOA,
|
GPIOA: p.device.GPIOA,
|
||||||
SPI1: p.device.SPI1,
|
SPI1: p.device.SPI1,
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,7 +55,7 @@ app! {
|
||||||
}
|
}
|
||||||
|
|
||||||
// The signature of `init` is now required to have a specific return type.
|
// 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
|
// `init::Resources` does not contain `IP_ADDRESS`, since it is not yet
|
||||||
// initialized.
|
// initialized.
|
||||||
//_r.IP_ADDRESS; // doesn't compile
|
//_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...
|
// ...obtain value for IP_ADDRESS from EEPROM/DHCP...
|
||||||
let ip_address = 0x7f000001;
|
let ip_address = 0x7f000001;
|
||||||
|
|
||||||
init::LateResourceValues {
|
init::LateResources {
|
||||||
// This struct will contain fields for all resources with omitted
|
// This struct will contain fields for all resources with omitted
|
||||||
// initializers.
|
// initializers.
|
||||||
IP_ADDRESS: ip_address,
|
IP_ADDRESS: ip_address,
|
||||||
|
|
|
@ -234,17 +234,17 @@ fn init(app: &App, main: &mut Vec<Tokens>, root: &mut Vec<Tokens>) {
|
||||||
root.push(quote! {
|
root.push(quote! {
|
||||||
#[allow(non_camel_case_types)]
|
#[allow(non_camel_case_types)]
|
||||||
#[allow(non_snake_case)]
|
#[allow(non_snake_case)]
|
||||||
pub struct _initLateResourceValues {
|
pub struct _initLateResources {
|
||||||
#(#fields)*
|
#(#fields)*
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
mod_items.push(quote! {
|
mod_items.push(quote! {
|
||||||
pub use ::_initLateResourceValues as LateResourceValues;
|
pub use ::_initLateResources as LateResources;
|
||||||
});
|
});
|
||||||
|
|
||||||
// `init` must return the initialized resources
|
// `init` must return the initialized resources
|
||||||
ret = Some(quote!( -> ::init::LateResourceValues));
|
ret = Some(quote!( -> ::init::LateResources));
|
||||||
}
|
}
|
||||||
|
|
||||||
root.push(quote! {
|
root.push(quote! {
|
||||||
|
|
|
@ -57,7 +57,7 @@
|
||||||
//! }
|
//! }
|
||||||
//!
|
//!
|
||||||
//! // The signature of `init` is now required to have a specific return type.
|
//! // 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
|
//! // `init::Resources` does not contain `IP_ADDRESS`, since it is not yet
|
||||||
//! // initialized.
|
//! // initialized.
|
||||||
//! //_r.IP_ADDRESS; // doesn't compile
|
//! //_r.IP_ADDRESS; // doesn't compile
|
||||||
|
@ -65,7 +65,7 @@
|
||||||
//! // ...obtain value for IP_ADDRESS from EEPROM/DHCP...
|
//! // ...obtain value for IP_ADDRESS from EEPROM/DHCP...
|
||||||
//! let ip_address = 0x7f000001;
|
//! let ip_address = 0x7f000001;
|
||||||
//!
|
//!
|
||||||
//! init::LateResourceValues {
|
//! init::LateResources {
|
||||||
//! // This struct will contain fields for all resources with omitted
|
//! // This struct will contain fields for all resources with omitted
|
||||||
//! // initializers.
|
//! // initializers.
|
||||||
//! IP_ADDRESS: ip_address,
|
//! IP_ADDRESS: ip_address,
|
||||||
|
|
|
@ -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:
|
// Try to use a resource that's not yet initialized:
|
||||||
r.LATE;
|
r.LATE;
|
||||||
//~^ error: no field `LATE`
|
//~^ error: no field `LATE`
|
||||||
|
|
||||||
init::LateResourceValues {
|
init::LateResources {
|
||||||
LATE: 0,
|
LATE: 0,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue