Skip to content

Commit 180974a

Browse files
authored
Merge pull request #99 from LedgerHQ/y333_17122024/migration_to_updated_nightly
Y333 17122024/migration to updated nightly
2 parents b14b3a9 + 4a60095 commit 180974a

File tree

7 files changed

+19
-12
lines changed

7 files changed

+19
-12
lines changed

Cargo.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[package]
22
name = "app-boilerplate-rust"
3-
version = "1.6.2"
3+
version = "1.6.3"
44
authors = ["yhql", "agrojean-ledger"]
55
edition = "2021"
66

77
[dependencies]
8-
ledger_device_sdk = "1.18.4"
8+
ledger_device_sdk = "1.19.1"
99
include_gif = "1.2.0"
1010
serde = {version="1.0.192", default_features = false, features = ["derive"]}
1111
serde-json-core = { git = "https://github.com/rust-embedded-community/serde-json-core"}
@@ -37,3 +37,6 @@ icon = "crab_32x32.gif"
3737

3838
[package.metadata.ledger.flex]
3939
icon = "crab_40x40.gif"
40+
41+
[lints.rust]
42+
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_os, values("stax", "flex", "nanos", "nanox", "nanosplus"))'] }

src/settings.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,30 @@ impl Settings {
2020
#[inline(never)]
2121
#[allow(unused)]
2222
pub fn get_mut(&mut self) -> &mut AtomicStorage<[u8; SETTINGS_SIZE]> {
23-
return unsafe { DATA.get_mut() };
23+
let data = &raw mut DATA;
24+
unsafe { (*data).get_mut() }
2425
}
2526

2627
#[inline(never)]
2728
#[allow(unused)]
2829
pub fn get_ref(&mut self) -> &AtomicStorage<[u8; SETTINGS_SIZE]> {
29-
return unsafe { DATA.get_ref() };
30+
let data = &raw const DATA;
31+
unsafe { (*data).get_ref() }
3032
}
3133

3234
#[allow(unused)]
3335
pub fn get_element(&self, index: usize) -> u8 {
34-
let storage = unsafe { DATA.get_ref() };
36+
let data = &raw const DATA;
37+
let storage = unsafe { (*data).get_ref() };
3538
let settings = storage.get_ref();
3639
settings[index]
3740
}
3841

3942
#[allow(unused)]
4043
// Not used in this boilerplate, but can be used to set a value in the settings
4144
pub fn set_element(&self, index: usize, value: u8) {
42-
let storage = unsafe { DATA.get_mut() };
45+
let data = &raw mut DATA;
46+
let storage = unsafe { (*data).get_mut() };
4347
let mut updated_data = *storage.get_ref();
4448
updated_data[index] = value;
4549
unsafe {
45 Bytes
Loading
-9 Bytes
Loading
-9 Bytes
Loading
0 Bytes
Loading

0 commit comments

Comments
 (0)