Skip to content

Simplify c2rust (with latest C2Rust version)#199

Merged
bors[bot] merged 3 commits intoRIOT-OS:masterfrom
chrysn-pull-requests:simplify-c2rust-with-20220614-update
Jun 14, 2022
Merged

Simplify c2rust (with latest C2Rust version)#199
bors[bot] merged 3 commits intoRIOT-OS:masterfrom
chrysn-pull-requests:simplify-c2rust-with-20220614-update

Conversation

@chrysn
Copy link
Member

@chrysn chrysn commented Jun 14, 2022

This is equivalent to #196 (also fixing RIOT-OS/RIOT#18056) except that it is

  • rebased already, and
  • uses the latest upstream version after upstream merged all my relevant pull requests (they're still a bit slow on doing a Cargo release, but installing from a rev in their git history is actually easy).

(Opened as a separate PR because if this fails for some reason, it's easy to fall back to #196).

This has become possible now that it doesn't need fancy build
dependencies any more.
@chrysn
Copy link
Member Author

chrysn commented Jun 14, 2022

Build failure is being investigated, looks like they broke something in the Cargo.toml workspace setup -- it's a build system issue.

This unblocks a stage of [#18056].

[#18056]: RIOT-OS/RIOT#18056
@chrysn chrysn force-pushed the simplify-c2rust-with-20220614-update branch from ad12171 to 6c4b5ef Compare June 14, 2022 15:17
@chrysn
Copy link
Member Author

chrysn commented Jun 14, 2022

Downgraded C2Rust in a hotfix again by a bit: Starting a commit later it is using a more recent Rust version that we currently ship (the latest stable) -- not a problem to upgrade, but not a thing I'd want to tangle in here either.

@chrysn
Copy link
Member Author

chrysn commented Jun 14, 2022

nagh ... and now something is leaving root-owned files in /data/riotbuild; debugging...

Merely running earlier docker containers with `--user $(id -u)` would be
insufficient because some make runs are issued outside of docker with
root privileges as well.
@chrysn chrysn force-pushed the simplify-c2rust-with-20220614-update branch from ad11819 to bee55e5 Compare June 14, 2022 18:34
@chrysn
Copy link
Member Author

chrysn commented Jun 14, 2022

Build troubles resolved, I think this is ready for review now. (Also pinging @aabadie as this unblocks RIOT-OS/RIOT#18056)

@chrysn chrysn requested a review from aabadie June 14, 2022 19:13
Copy link
Contributor

@kaspar030 kaspar030 left a comment

Choose a reason for hiding this comment

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

ACK.

@kaspar030
Copy link
Contributor

bors merge

@bors
Copy link
Contributor

bors bot commented Jun 14, 2022

Build succeeded:

@bors bors bot merged commit fef9374 into RIOT-OS:master Jun 14, 2022
@chrysn chrysn deleted the simplify-c2rust-with-20220614-update branch June 14, 2022 21:00
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.

3 participants