Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

alevy
Copy link
Member

@alevy alevy commented Apr 16, 2024

Pull Request Overview

This change is a _stopgap_ pending a permanent, safe solution, sketched in #3945.

We can't currently update Rust compiler versions due deprecation of creating references from &'static muts. This workaround simply replaces those with uses of the addr_of{_mut}! macros as recommended by Rust. This should have no semantic affect on compiled artifacts.

Testing Strategy

Compile tested all boards with a recent nightly

Formatting

  • Ran make prepush.

@github-actions github-actions bot added kernel chips/nrf Change pertains to the nRF5x family of MCUs. WG-OpenTitan In the purview of the OpenTitan working group. WG-Network In the purview of the Network working group. tock-libraries This affects libraries supported by the Tock project labels Apr 16, 2024
@alevy alevy added the P-Significant This is a substancial change that requires review from all core developers. label Apr 16, 2024
@alevy alevy force-pushed the bug/statimut-stopgap branch from f3c1d4d to 66bd24f Compare April 16, 2024 17:49
@bradjc bradjc mentioned this pull request Apr 16, 2024
2 tasks
Copy link
Contributor

@bradjc bradjc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems useful to be able to revert this PR

Comment on lines 605 to 617
button: button,
ble_radio: ble_radio,
console: console,
led: led,
gpio: gpio,
rng: rng,
temp: temp,
alarm: alarm,
gpio_async: gpio_async,
light: light,
buzzer: buzzer,
button,
ble_radio,
console,
led,
gpio,
rng,
temp,
alarm,
gpio_async,
light,
buzzer,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Getting rid of compiler warnings since the whole task was basically to get rid of compiler warnings

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are both merged upstream.

Comment on lines 24 to 25
use nrf52_components::{self, UartChannel, UartPins};
use nrf52_components::{UartChannel, UartPins};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

Comment on lines 8 to 10
use core::{i16, i32, i64, i8, isize};
use core::{u16, u32, u64, u8, usize};

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

}

struct AppIdAssignerSimulated {}
pub struct AppIdAssignerSimulated {}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alevy
Copy link
Member Author

alevy commented Apr 16, 2024

@bradjc do you really want me to remove these changes that are redundant with other PRs fixing style/warning issues?

@bradjc
Copy link
Contributor

bradjc commented Apr 16, 2024

@bradjc do you really want me to remove these changes that are redundant with other PRs fixing style/warning issues?

Yes just merge PRs and rebase. It would be nice to just do a clean revert of this PR.

@alevy alevy force-pushed the bug/statimut-stopgap branch from 5032553 to c22999d Compare April 17, 2024 14:18
@github-actions github-actions bot removed the tock-libraries This affects libraries supported by the Tock project label Apr 17, 2024
@alevy
Copy link
Member Author

alevy commented Apr 17, 2024

OK, @bradjc, all done I think

@bradjc bradjc enabled auto-merge April 17, 2024 14:19
@bradjc bradjc added this pull request to the merge queue Apr 17, 2024
Merged via the queue into tock:master with commit 28a132f Apr 17, 2024
@alevy alevy deleted the bug/statimut-stopgap branch April 17, 2024 14:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chips/nrf Change pertains to the nRF5x family of MCUs. kernel P-Significant This is a substancial change that requires review from all core developers. WG-Network In the purview of the Network working group. WG-OpenTitan In the purview of the OpenTitan working group.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants