rust-analyzer

diff --git a/crates/hir-ty/src/lib.rs b/crates/hir-ty/src/lib.rs
index cc02b71f05..e4c50f2ebd 100644
--- a/crates/hir-ty/src/lib.rs
+++ b/crates/hir-ty/src/lib.rs

@@ -400,7 +400,6 @@ pub enum FnAbi {

Rust,

RustCall,

RustCold,

- RustIntrinsic,

Stdcall,

StdcallUnwind,

System,

@@ -457,7 +456,6 @@ impl FnAbi {

s if *s == sym::riscv_dash_interrupt_dash_s => FnAbi::RiscvInterruptS,

s if *s == sym::rust_dash_call => FnAbi::RustCall,

s if *s == sym::rust_dash_cold => FnAbi::RustCold,

- s if *s == sym::rust_dash_intrinsic => FnAbi::RustIntrinsic,

s if *s == sym::Rust => FnAbi::Rust,

s if *s == sym::stdcall_dash_unwind => FnAbi::StdcallUnwind,

s if *s == sym::stdcall => FnAbi::Stdcall,

@@ -500,7 +498,6 @@ impl FnAbi {

FnAbi::Rust => "Rust",

FnAbi::RustCall => "rust-call",

FnAbi::RustCold => "rust-cold",

- FnAbi::RustIntrinsic => "rust-intrinsic",

FnAbi::Stdcall => "stdcall",

FnAbi::StdcallUnwind => "stdcall-unwind",

FnAbi::System => "system",

diff --git a/crates/hir-ty/src/mir/eval/shim.rs b/crates/hir-ty/src/mir/eval/shim.rs
index f61ecabb7e..06ac5b1ffa 100644
--- a/crates/hir-ty/src/mir/eval/shim.rs
+++ b/crates/hir-ty/src/mir/eval/shim.rs

@@ -59,19 +59,7 @@ impl Evaluator<'_> {

let function_data = self.db.function_data(def);

let attrs = self.db.attrs(def.into());

- let is_intrinsic = attrs.by_key(&sym::rustc_intrinsic).exists()

- // Keep this around for a bit until extern "rustc-intrinsic" abis are no longer used

- || (match &function_data.abi {

- Some(abi) => *abi == sym::rust_dash_intrinsic,

- None => match def.lookup(self.db.upcast()).container {

- hir_def::ItemContainerId::ExternBlockId(block) => {

- let id = block.lookup(self.db.upcast()).id;

- id.item_tree(self.db.upcast())[id.value].abi.as_ref()

- == Some(&sym::rust_dash_intrinsic)

- }

- _ => false,

- },

- });

+ let is_intrinsic = attrs.by_key(&sym::rustc_intrinsic).exists();

if is_intrinsic {

return self.exec_intrinsic(

diff --git a/crates/hir-ty/src/utils.rs b/crates/hir-ty/src/utils.rs
index 89d89fe223..0cfd36d916 100644
--- a/crates/hir-ty/src/utils.rs
+++ b/crates/hir-ty/src/utils.rs

@@ -18,7 +18,6 @@ use hir_def::{

TypeOrConstParamId,

};

use hir_expand::name::Name;

-use intern::sym;

use rustc_abi::TargetDataLayout;

use rustc_hash::FxHashSet;

use smallvec::{smallvec, SmallVec};

@@ -303,26 +302,13 @@ pub fn is_fn_unsafe_to_call(

let loc = func.lookup(db.upcast());

match loc.container {

- hir_def::ItemContainerId::ExternBlockId(block) => {

- let id = block.lookup(db.upcast()).id;

- let is_intrinsic_block =

- id.item_tree(db.upcast())[id.value].abi.as_ref() == Some(&sym::rust_dash_intrinsic);

- if is_intrinsic_block {

- // legacy intrinsics

- // extern "rust-intrinsic" intrinsics are unsafe unless they have the rustc_safe_intrinsic attribute

- if db.attrs(func.into()).by_key(&sym::rustc_safe_intrinsic).exists() {

- Unsafety::Safe

- } else {

- Unsafety::Unsafe

- }

+ hir_def::ItemContainerId::ExternBlockId(_block) => {

+ // Function in an `extern` block are always unsafe to call, except when

+ // it is marked as `safe`.

+ if data.is_safe() {

+ Unsafety::Safe

} else {

- // Function in an `extern` block are always unsafe to call, except when

- // it is marked as `safe`.

- if data.is_safe() {

- Unsafety::Safe

- } else {

- Unsafety::Unsafe

- }

+ Unsafety::Unsafe

}

_ => Unsafety::Safe,

diff --git a/crates/ide-completion/src/completions/extern_abi.rs b/crates/ide-completion/src/completions/extern_abi.rs
index 7c2cc2a6c1..a3554114f4 100644
--- a/crates/ide-completion/src/completions/extern_abi.rs
+++ b/crates/ide-completion/src/completions/extern_abi.rs

@@ -36,7 +36,6 @@ const SUPPORTED_CALLING_CONVENTIONS: &[&str] = &[

"wasm",

"system",

"system-unwind",

- "rust-intrinsic",

"rust-call",

"unadjusted",

];

diff --git a/crates/intern/src/symbol/symbols.rs b/crates/intern/src/symbol/symbols.rs
index 6b77c72cee..d4f334289f 100644
--- a/crates/intern/src/symbol/symbols.rs
+++ b/crates/intern/src/symbol/symbols.rs

@@ -125,7 +125,6 @@ define_symbols! {

riscv_dash_interrupt_dash_s = "riscv-interrupt-s",

rust_dash_call = "rust-call",

rust_dash_cold = "rust-cold",

- rust_dash_intrinsic = "rust-intrinsic",

stdcall_dash_unwind = "stdcall-unwind",

system_dash_unwind = "system-unwind",

sysv64_dash_unwind = "sysv64-unwind",