Skip to content
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

rust: Update cstr dependency [backport 2022.07] #18485

Merged

Conversation

maribu
Copy link
Member

@maribu maribu commented Aug 21, 2022

Backport of #18389

Contribution description

A change in Rust nightly features broke version 0.2.5 of the cstr
crate, whose nightly-only features are enabled in some examples. The
breakage was quickly fixed upstream in the 0.2.6 version, this updates
the locks.


We could (and should, to minimize this on the long run) also stop using the nightly features -- but given that riot-wrappers are about to switch over to what the standard library now provides anyway, this is the least intrusive fix.

The issue doesn't hit us now because our Rust nightly version is pinned, but it'd hit us as soon as we updated the Rust nightly version in riotdocker.

Testing procedure

  • Green CI
  • The breakage before this PR only shows when using a local Rust installation and building the rust-gcoap example with a recent nightly. (I tested that).

Issues/PRs references

Builds on #18388 (they wouldn't merge conflict if I wrote them separately, but it'd still be practically useless rebasing). Look at the second change if that is

Backporting

This only needs backporting if riotdocker updates its nightly version, and after that a point release is to be made. (Because only the automated tests use the latest riotdocker image; regular users would get the riotdocker image that was versioned together with the release AIU).

chrysn added 2 commits August 21, 2022 10:01
The riotmodules dependency was missed in bc8ec6d, and while generally
it does not severly harm builds, it does harm builds riotdocker CI where
branches are switched, which is blocked by dirty files in the checkout.

The riot-wrappers version was missed when what is now 5e75f4b was
rebased onto fdc4e11.

(cherry picked from commit 86dc086)
A change in Rust nightly features broke version 0.2.5 of the `cstr`
crate, whose nightly-only features are enabled in some examples. The
breakage was quickly fixed upstream in the 0.2.6 version, this updates
the locks.

(cherry picked from commit 863a1c2)
@maribu maribu added Area: examples Area: Example Applications Area: Rust Area: Rust wrapper Area: sys Area: System Area: tests Area: tests and testing framework CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Impact: minor The PR is small in size and might only require a quick look of a knowledgeable reviewer Process: release backport Integration Process: The PR is a release backport of a change previously provided to master labels Aug 21, 2022
@maribu maribu requested a review from chrysn August 21, 2022 08:01
Copy link
Member

@chrysn chrysn left a comment

Choose a reason for hiding this comment

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

Thanks

@chrysn chrysn enabled auto-merge August 21, 2022 08:05
@chrysn chrysn added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Aug 21, 2022
@chrysn chrysn merged commit 9262f36 into RIOT-OS:2022.07-branch Aug 21, 2022
@chrysn chrysn added this to the Release 2022.07 milestone Aug 25, 2022
@maribu maribu deleted the backport/2022.07/rust-cstr-update branch April 25, 2023 11:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: examples Area: Example Applications Area: Rust Area: Rust wrapper Area: sys Area: System Area: tests Area: tests and testing framework CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Impact: minor The PR is small in size and might only require a quick look of a knowledgeable reviewer Process: release backport Integration Process: The PR is a release backport of a change previously provided to master
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants