Skip to content

More v0.6.3 backports #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 20, 2020
Merged

More v0.6.3 backports #249

merged 8 commits into from
Jul 20, 2020

Conversation

adamgreig
Copy link
Member

@adamgreig adamgreig commented Jul 20, 2020

I think this includes the remainder of the non-breaking changes since v0.6.2, with a couple of exceptions:

I did include #226 which adds a new field to Peripherals, but as I understand it that should be a non-breaking change since it's non-exhaustive.

I've updated the CHANGELOG with all the changes from this PR and the previous #248.

On ARMv7-M, bits 31:1 of the value read from STIMx are reserved, so
comparing them against zero is a bad idea.

On ARMv8-M, bit 1 has been repurposed to indicate DISABLED. This means
that the is_fifo_ready impl hangs forever when ITM is disabled on a
Cortex-M33 (for example).

Changed to test only the FIFOREADY bit.
@adamgreig adamgreig requested a review from a team as a code owner July 20, 2020 01:34
@jonas-schievink
Copy link
Contributor

I did include #226 which adds a new field to Peripherals, but as I understand it that should be a non-breaking change since it's non-exhaustive.

I think it's only non-exhaustive on master, not 0.6.x (if not, did I accidentally backport that breaking change?)

@adamgreig
Copy link
Member Author

Aha, no, I merged the clippy fix (manual_non_exhaustive) but it's still non-exhaustive on 0.6.x. I'll remove #226.

cbiffle and others added 7 commits July 20, 2020 11:58
On ARMv7-M, bits 31:1 of the value read from STIMx are reserved, so
comparing them against zero is a bad idea.

On ARMv8-M, bit 1 has been repurposed to indicate DISABLED. This means
that the is_fifo_ready impl hangs forever when ITM is disabled on a
Cortex-M33 (for example).

Changed to test only the FIFOREADY bit on ARMv7-M, and to test either
FIFOREADY or DISABLED on ARMv8-M.
See #232, which this partially fixes -- there's still the question of
taking an interrupt in the midst of these sequences.
This removes the duplication of the look-up table and enforces some
safety checks with the match statement.

Signed-off-by: Hugues de Valon <[email protected]>
@adamgreig adamgreig force-pushed the more-v6-backports branch from c6800fb to 6717d4b Compare July 20, 2020 10:59
@jonas-schievink
Copy link
Contributor

bors r+

@bors
Copy link
Contributor

bors bot commented Jul 20, 2020

👎 Rejected by too few approved reviews

Copy link
Contributor

@jonas-schievink jonas-schievink left a comment

Choose a reason for hiding this comment

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

bors r+

@adamgreig
Copy link
Member Author

Looks like the -Dwarnings in CI is causing all nightlies to fail due to a clippy lint? here.

@bors
Copy link
Contributor

bors bot commented Jul 20, 2020

Build succeeded:

@bors bors bot merged commit 358be5d into v0.6.x Jul 20, 2020
@bors bors bot deleted the more-v6-backports branch July 20, 2020 11:26
@therealprof
Copy link
Contributor

Looks like the -Dwarnings in CI is causing all nightlies to fail due to a clippy lint? here.

I wonder why it's not failing on stable, too.

@adamgreig
Copy link
Member Author

The lint doesn't seem quite right, either, I don't think it's understood what we're doing. I guess let's not worry about it for 0.6.x and solve it in master which presumably has the same issue?

@therealprof
Copy link
Contributor

It can't see through the #[cfg] gate.

We have that in a few HAL impls, too: If you have a match and all arms except for 1 or 2 are cfg-gated it'll recommend an if instead. Unfortunately you cannot #[cfg] gate an if expression or we'd have switched over to that instead...

adamgreig pushed a commit that referenced this pull request Jan 12, 2022
249: Ignore a doctest again r=adamgreig a=jonas-schievink

I accidentally typoed `no_run`, but compiling the test fails since the
`device.x` path is wrong. I don't think this can be fixed, so ignore the
test instead.

The effect is the same as before but now the block gets highlighted again.

Co-authored-by: Jonas Schievink <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants