Unnamed repository; edit this file 'description' to name the repository.
Merge #10921
10921: minor: Update list of safe intrinsics r=Veykril a=Veykril
Closes https://github.com/rust-analyzer/rust-analyzer/issues/4798
bors r+
Co-authored-by: Lukas Wirth <[email protected]>
| -rw-r--r-- | crates/hir_def/src/item_tree/lower.rs | 4 | ||||
| -rw-r--r-- | crates/hir_expand/src/name.rs | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/crates/hir_def/src/item_tree/lower.rs b/crates/hir_def/src/item_tree/lower.rs index bb224f57b2..32213aac39 100644 --- a/crates/hir_def/src/item_tree/lower.rs +++ b/crates/hir_def/src/item_tree/lower.rs @@ -694,11 +694,11 @@ enum GenericsOwner<'a> { /// Returns `true` if the given intrinsic is unsafe to call, or false otherwise. fn is_intrinsic_fn_unsafe(name: &Name) -> bool { - // Should be kept in sync with https://github.com/rust-lang/rust/blob/0cd0709f19d316c4796fa71c5f52c8612a5f3771/compiler/rustc_typeck/src/check/intrinsic.rs#L72-L105 + // Should be kept in sync with https://github.com/rust-lang/rust/blob/532d2b14c05f9bc20b2d27cbb5f4550d28343a36/compiler/rustc_typeck/src/check/intrinsic.rs#L72-L106 ![ - known::abort, known::add_with_overflow, known::bitreverse, + known::black_box, known::bswap, known::caller_location, known::ctlz, diff --git a/crates/hir_expand/src/name.rs b/crates/hir_expand/src/name.rs index 95d272ba68..ab730b54bc 100644 --- a/crates/hir_expand/src/name.rs +++ b/crates/hir_expand/src/name.rs @@ -272,6 +272,7 @@ pub mod known { // Safe intrinsics abort, add_with_overflow, + black_box, bitreverse, bswap, caller_location, |