Avoid over-wrapping optional callback parameters #3452
Merged
Conversation
This file contains hidden or 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
riverar
approved these changes
Jan 16, 2025
There was a problem hiding this comment.
Looks OK in my testing.
One thing I observed--maybe known/intentional--is that delegate types are emitted with a Option wrapper, despite being not optional in all dependent functions. Should we drop the Optional at that site instead and then keep the existing code?
Edit: Ah you addressed this in your edit. 👍
// Metadata
unsafe HRESULT setPfnMiniPDBErrorCallback2(
[In] void* pvContext,
[In] PFNMINIPDBERRORCALLBACK2 pfn);pub type PFNMINIPDBERRORCALLBACK2 = Option<
unsafe extern "system" fn(
pvcontext: *mut core::ffi::c_void,
dwerrorcode: u32,
szobjorpdb: windows_core::PCWSTR,
szlib: windows_core::PCWSTR,
) -> windows_core::HRESULT,
>;
|
Right, I'm leaning toward making the C++ delegate type omit |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
When a parameter is both optional and a callback, it should not be wrapped in an
Option.Fixes: #3437
I have been thinking about removing the
Optionfrom the callback type itself. At that point we'd not need this workaround and we'd be able to distinguish between optional and required callback parameters, but this is a small and targeted fix to the immediate problem for the time being.