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: compatibility with cbindgen 0.27 #11622

Merged
merged 1 commit into from
Aug 13, 2024

Conversation

catenacyber
Copy link
Contributor

Link to ticket: https://redmine.openinfosecfoundation.org/issues/
https://redmine.openinfosecfoundation.org/issues/7206

Describe changes:

Should make CI green again

Ticket: 7206

Cbindgen 0.27 now handles extern blocks as extern "C" blocks.
The way to differentiate them is to use a special comment
before the block.
Copy link

codecov bot commented Aug 12, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 82.61%. Comparing base (564a6c9) to head (304271e).

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #11622      +/-   ##
==========================================
+ Coverage   82.52%   82.61%   +0.09%     
==========================================
  Files         919      919              
  Lines      248997   248997              
==========================================
+ Hits       205480   205717     +237     
+ Misses      43517    43280     -237     
Flag Coverage Δ
fuzzcorpus 60.88% <ø> (+0.26%) ⬆️
livemode 18.66% <ø> (-0.01%) ⬇️
pcap 44.14% <ø> (+0.01%) ⬆️
suricata-verify 61.89% <ø> (+0.01%) ⬆️
unittests 59.00% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

@catenacyber
Copy link
Contributor Author

I think CIFuzz tries first to build master before building this PR...

@catenacyber
Copy link
Contributor Author

See also google/oss-fuzz#12336

Comment on lines +52 to +54
// Allow /// cbindgen:ignore comments on extern blocks
// cf https://github.com/mozilla/cbindgen/issues/709
#![allow(unused_doc_comments)]
Copy link
Member

Choose a reason for hiding this comment

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

Annoying that this is required.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Maybe we can have these individually and not globally..?

@suricata-qa
Copy link

Information: QA ran without warnings.

Pipeline 22077

@jasonish jasonish merged commit 304271e into OISF:master Aug 13, 2024
57 of 59 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants