Skip to content

Commit b9faf9b

Browse files
committed
changes old intrinsic to new declaration
1 parent 21b7d68 commit b9faf9b

File tree

1 file changed

+38
-35
lines changed
  • library/core/src/intrinsics

1 file changed

+38
-35
lines changed

library/core/src/intrinsics/mod.rs

+38-35
Original file line numberDiff line numberDiff line change
@@ -3577,42 +3577,45 @@ pub const fn discriminant_value<T>(_v: &T) -> <T as DiscriminantKind>::Discrimin
35773577
unimplemented!()
35783578
}
35793579

3580-
/// Rust's "try catch" construct for unwinding. Invokes the function pointer `try_fn` with the
3581-
/// data pointer `data`, and calls `catch_fn` if unwinding occurs while `try_fn` runs.
3582-
///
3583-
/// `catch_fn` must not unwind.
3584-
///
3585-
/// The third argument is a function called if an unwind occurs (both Rust `panic` and foreign
3586-
/// unwinds). This function takes the data pointer and a pointer to the target- and
3587-
/// runtime-specific exception object that was caught.
3588-
///
3589-
/// Note that in the case of a foreign unwinding operation, the exception object data may not be
3590-
/// safely usable from Rust, and should not be directly exposed via the standard library. To
3591-
/// prevent unsafe access, the library implementation may either abort the process or present an
3592-
/// opaque error type to the user.
3593-
///
3594-
/// For more information, see the compiler's source, as well as the documentation for the stable
3595-
/// version of this intrinsic, `std::panic::catch_unwind`.
3596-
#[rustc_intrinsic]
3597-
#[rustc_intrinsic_must_be_overridden]
3598-
#[rustc_nounwind]
3599-
pub unsafe fn catch_unwind(_try_fn: fn(*mut u8), _data: *mut u8, _catch_fn: fn(*mut u8, *mut u8)) -> i32 {
3600-
unreachable!()
3601-
}
3602-
3603-
/// Emits a `nontemporal` store, which gives a hint to the CPU that the data should not be held
3604-
/// in cache. Except for performance, this is fully equivalent to `ptr.write(val)`.
3605-
///
3606-
/// Not all architectures provide such an operation. For instance, x86 does not: while `MOVNT`
3607-
/// exists, that operation is *not* equivalent to `ptr.write(val)` (`MOVNT` writes can be reordered
3608-
/// in ways that are not allowed for regular writes).
3609-
#[rustc_intrinsic]
3610-
#[rustc_intrinsic_must_be_overridden]
3611-
#[rustc_nounwind]
3612-
pub unsafe fn nontemporal_store<T>(_ptr: *mut T, _val: T) {
3613-
unreachable!()
3614-
}
3580+
/// Rust's "try catch" construct for unwinding. Invokes the function pointer `try_fn` with the
3581+
/// data pointer `data`, and calls `catch_fn` if unwinding occurs while `try_fn` runs.
3582+
///
3583+
/// `catch_fn` must not unwind.
3584+
///
3585+
/// The third argument is a function called if an unwind occurs (both Rust `panic` and foreign
3586+
/// unwinds). This function takes the data pointer and a pointer to the target- and
3587+
/// runtime-specific exception object that was caught.
3588+
///
3589+
/// Note that in the case of a foreign unwinding operation, the exception object data may not be
3590+
/// safely usable from Rust, and should not be directly exposed via the standard library. To
3591+
/// prevent unsafe access, the library implementation may either abort the process or present an
3592+
/// opaque error type to the user.
3593+
///
3594+
/// For more information, see the compiler's source, as well as the documentation for the stable
3595+
/// version of this intrinsic, `std::panic::catch_unwind`.
3596+
#[rustc_intrinsic]
3597+
#[rustc_intrinsic_must_be_overridden]
3598+
#[rustc_nounwind]
3599+
pub unsafe fn catch_unwind(
3600+
_try_fn: fn(*mut u8),
3601+
_data: *mut u8,
3602+
_catch_fn: fn(*mut u8, *mut u8),
3603+
) -> i32 {
3604+
unreachable!()
3605+
}
36153606

3607+
/// Emits a `nontemporal` store, which gives a hint to the CPU that the data should not be held
3608+
/// in cache. Except for performance, this is fully equivalent to `ptr.write(val)`.
3609+
///
3610+
/// Not all architectures provide such an operation. For instance, x86 does not: while `MOVNT`
3611+
/// exists, that operation is *not* equivalent to `ptr.write(val)` (`MOVNT` writes can be reordered
3612+
/// in ways that are not allowed for regular writes).
3613+
#[rustc_intrinsic]
3614+
#[rustc_intrinsic_must_be_overridden]
3615+
#[rustc_nounwind]
3616+
pub unsafe fn nontemporal_store<T>(_ptr: *mut T, _val: T) {
3617+
unreachable!()
3618+
}
36163619

36173620
/// See documentation of `<*const T>::offset_from` for details.
36183621
#[rustc_intrinsic_const_stable_indirect]

0 commit comments

Comments
 (0)