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

Disarm C's doc comments even inside lines #311

Merged
merged 2 commits into from
Jan 13, 2022

Conversation

chrysn
Copy link
Contributor

@chrysn chrysn commented Sep 22, 2020

This is a straightforward fix for #310, accompanied by an extension to the test cases to cover the new behavior. The new test failed with the old code, and now passes.

edit for github's automatism that doesn't get the information from the individual commits: Closes #310

As C-style comments are aggregated to the point where translate_comment
receives input like `/**********//*********/`, the per-line processing
that reliably removes `///` and `//!` before expressing the comments in
Rust (where a doc comment may not be legal at a given position) failed
to catch input like the above that needed `/**` replaced with `/* *`
twice, and not only at the start of the line.

Closes: immunant#310
@chrysn
Copy link
Contributor Author

chrysn commented Aug 25, 2021

Still merges cleanly into master and works fine. Can the CI be retriggered? Or should this be rebased?

@chrysn
Copy link
Contributor Author

chrysn commented Jan 13, 2022

With the (harder-to-solve) ASM issues are slowly becoming obsolete, I'd like to push on the easy PRs so that RIOT (once having worked around the remaining assembly) can be built using an upstream C2Rust.

What's the status on this, is there anything that needs fixing on the CI side, or should I just rebase my PR onto master and try again?

Copy link
Contributor

@thedataking thedataking left a comment

Choose a reason for hiding this comment

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

LGTM

@thedataking thedataking merged commit b3dad71 into immunant:master Jan 13, 2022
@chrysn chrysn deleted the fix-310 branch January 13, 2022 20:10
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.

Comments can become accidental doc comments
2 participants