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

Add callback to check derives for blocklisted types #2007

Merged
merged 1 commit into from
Mar 22, 2021

Conversation

jethrogb
Copy link
Contributor

Fixes #1454 #2003

This includes #2006 because it needs the ParseCallbacks testing framework

@highfive
Copy link

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!

@bors-servo
Copy link

☔ The latest upstream changes (presumably 7286c81) made this pull request unmergeable. Please resolve the merge conflicts.

src/callbacks.rs Show resolved Hide resolved
tests/parse_callbacks/mod.rs Show resolved Hide resolved
@emilio
Copy link
Contributor

emilio commented Mar 22, 2021

Seems like there's a merge conflict though.

@bors-servo
Copy link

☔ The latest upstream changes (presumably 2a46e29) made this pull request unmergeable. Please resolve the merge conflicts.

@jethrogb jethrogb force-pushed the jb/issue-1454-alt branch from 447923b to 0780f80 Compare March 22, 2021 11:10
@jethrogb
Copy link
Contributor Author

That's odd, I was able to rebase without issues.

@emilio emilio merged commit de94b48 into rust-lang:master Mar 22, 2021
@jethrogb
Copy link
Contributor Author

@emilio Many thanks! When are you planning to publish a new release?

bors bot added a commit to fortanix/rust-mbedtls that referenced this pull request Apr 6, 2021
152: Update bindgen r=raoulstrackx a=jethrogb

I took some time this week to make the necessary bindgen changes (rust-lang/rust-bindgen#2004 rust-lang/rust-bindgen#2006 rust-lang/rust-bindgen#2007). This PR updates the bindgen build to use that.

Breaking changes:
* unnamed types are renamed
* C-unions are now actual unions
  * [x] the field accessor functions that used to exist are easy enough to add back
* bitfields are done differently now
* some fn-ptrs are now unsafe
* some fns and fn-ptrs now take const pointers as arguments
* havege.c and timing.c are now not compiled on non-unix platforms, i.e. SGX (probably wasn't working properly anyway)

Fixes #5 #14 #61 #72 #88 #121

Co-authored-by: Jethro Beekman <jethro@fortanix.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Copy not derived when using whitelist_recursively(false)
4 participants