diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 03:59:24 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 03:59:24 +0000 |
| commit | 023939b627b7dc93b01471f7d41fb8553ddb4ffa (patch) | |
| tree | 60fc59477c605c72b0a1051409062ddecc43f877 /vendor/rustix/src/utils.rs | |
| parent | Adding debian version 1.72.1+dfsg1-1. (diff) | |
| download | rustc-023939b627b7dc93b01471f7d41fb8553ddb4ffa.tar.xz rustc-023939b627b7dc93b01471f7d41fb8553ddb4ffa.zip | |
Merging upstream version 1.73.0+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/rustix/src/utils.rs')
| -rw-r--r-- | vendor/rustix/src/utils.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vendor/rustix/src/utils.rs b/vendor/rustix/src/utils.rs index df2ac315b..c5258394d 100644 --- a/vendor/rustix/src/utils.rs +++ b/vendor/rustix/src/utils.rs @@ -18,7 +18,7 @@ pub(crate) fn as_mut_ptr<T>(t: &mut T) -> *mut T { /// Convert an `Option<&T>` into a possibly-null `*const T`. #[inline] -pub(crate) const fn optional_as_ptr<T>(t: Option<&T>) -> *const T { +pub(crate) const fn option_as_ptr<T>(t: Option<&T>) -> *const T { match t { Some(t) => t, None => null(), @@ -27,7 +27,7 @@ pub(crate) const fn optional_as_ptr<T>(t: Option<&T>) -> *const T { /// Convert an `Option<&mut T>` into a possibly-null `*mut T`. #[inline] -pub(crate) fn optional_as_mut_ptr<T>(t: Option<&mut T>) -> *mut T { +pub(crate) fn option_as_mut_ptr<T>(t: Option<&mut T>) -> *mut T { match t { Some(t) => t, None => null_mut(), |