Move __getrandom_custom definition into a const block #344
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
The target triple name was changed in rust-lang/rust#106429 While `rustc` known the old spelling of the triple, `rustup` does not, so the toolchain download was not working. Signed-off-by: Joe Richey <[email protected]>
josephlr
changed the title
This supersedes #341, and makes the following changes - All the code for implementing `__getrandom_custom` is now in an **named** `const` block (unnamed consts require Rust 1.37) - I found this approch [here](https://internals.rust-lang.org/t/anonymous-modules/15441) - Nothing inside the block can be referenced outside of it - `__getrandom_custom` is marked `unsafe` - It can't be accessed externally, but is "logically" unsafe as it dereferences raw pointers - The type of the function is moved to a typedef, so we can check that the defined type matches that of `getrandom:getrandom`. - Use `::core::result::Result` instead of `Result` - Similar to use use of `from_raw_parts_mut` this prevents compilation errors if `Result` is redefined. Signed-off-by: Joe Richey <[email protected]>
newpavlov
approved these changes
Mar 10, 2023
Merged
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.
This supersedes #341 (and depends on #343)
__getrandom_customis now in annamed
constblock (unnamed consts require Rust 1.37)__getrandom_customis markedunsafedereferences raw pointers
the defined type matches that of
getrandom:getrandom.::core::result::Resultinstead ofResultfrom_raw_parts_mutthis preventscompilation errors if
Resultis redefined.I checked that our
customtest still worked, and that the__getrandom_customfunction was no longer directly accessible from Rust code.Signed-off-by: Joe Richey [email protected]