Remove wrapper functions from c.rs #128092
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
O-windows
| apccontext: *mut c_void, | ||
| iostatusblock: &mut IO_STATUS_BLOCK, | ||
| buffer: *mut crate::mem::MaybeUninit<u8>, | ||
| apccontext: *const core::ffi::c_void, |
There was a problem hiding this comment.
Can we add core::ffi to the module imports here?
Comment on lines
-341
to
-342
| byteoffset: Option<&i64>, | ||
| key: Option<&u32> |
There was a problem hiding this comment.
these lifetimes would have been very useful if the thing we returned also had a lifetime... unfortunately...
|
You can address the diff in a followup since there's preexisting @bors r+ rollup |
bors
added
S-waiting-on-bors
This was referenced Jul 23, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I'd like for the windows
c.rsjust to contain the basic platform definitions and not anything higher level unless absolutely necessary. So this removes some wrapper functions that weren't really necessary in any case. The functions are only used in a few places which themselves are relatively thin wrappers. The "interesting" bit is that we had anAlertableIoFnthat abstracted overReadFileExandWriteFileEx. I've replaced this with a closure.Also I removed an
#[allow(unsafe_op_in_unsafe_fn)]while I was moving things around.