Skip to content

Commit 573f855

Browse files
authored
Rename __getrandom_custom to __getrandom_v03_custom (#531)
This is done to prevent potential conflicts between getrandom v0.2 and v0.3 in the case when users rely on a custom backend and have both versions in their dependency tree.
1 parent 41817c7 commit 573f855

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

nopanic_check/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pub extern "C" fn getrandom_wrapper(buf_ptr: *mut u8, buf_len: usize) -> u32 {
1919

2020
#[cfg(getrandom_backend = "custom")]
2121
#[no_mangle]
22-
unsafe extern "Rust" fn __getrandom_custom(
22+
unsafe extern "Rust" fn __getrandom_v03_custom(
2323
dest: *mut u8,
2424
len: usize,
2525
) -> Result<(), getrandom::Error> {

src/custom.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use core::mem::MaybeUninit;
44

55
pub fn getrandom_inner(dest: &mut [MaybeUninit<u8>]) -> Result<(), Error> {
66
extern "Rust" {
7-
fn __getrandom_custom(dest: *mut u8, len: usize) -> Result<(), Error>;
7+
fn __getrandom_v03_custom(dest: *mut u8, len: usize) -> Result<(), Error>;
88
}
9-
unsafe { __getrandom_custom(dest.as_mut_ptr().cast(), dest.len()) }
9+
unsafe { __getrandom_v03_custom(dest.as_mut_ptr().cast(), dest.len()) }
1010
}

src/lib.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,10 @@
110110
//! use getrandom::Error;
111111
//!
112112
//! #[no_mangle]
113-
//! unsafe extern "Rust" fn __getrandom_custom(dest: *mut u8, len: usize) -> Result<(), Error> {
113+
//! unsafe extern "Rust" fn __getrandom_v03_custom(
114+
//! dest: *mut u8,
115+
//! len: usize,
116+
//! ) -> Result<(), Error> {
114117
//! todo!()
115118
//! }
116119
//! ```
@@ -133,7 +136,10 @@
133136
//! use getrandom::Error;
134137
//!
135138
//! #[no_mangle]
136-
//! unsafe extern "Rust" fn __getrandom_custom(dest: *mut u8, len: usize) -> Result<(), Error> {
139+
//! unsafe extern "Rust" fn __getrandom_v03_custom(
140+
//! dest: *mut u8,
141+
//! len: usize,
142+
//! ) -> Result<(), Error> {
137143
//! Err(Error::UNSUPPORTED)
138144
//! }
139145
//! ```

tests/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ mod custom {
206206
//
207207
// WARNING: this custom implementation is for testing purposes ONLY!
208208
#[no_mangle]
209-
unsafe extern "Rust" fn __getrandom_custom(dest: *mut u8, len: usize) -> Result<(), Error> {
209+
unsafe extern "Rust" fn __getrandom_v03_custom(dest: *mut u8, len: usize) -> Result<(), Error> {
210210
use std::time::{SystemTime, UNIX_EPOCH};
211211

212212
assert_ne!(len, 0);

0 commit comments

Comments
 (0)