Skip to content

Commit 3583a41

Browse files
compiler: remove misleading 'c' from abi_c_cmse_nonsecure_call feature
1 parent ad5d698 commit 3583a41

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

compiler/rustc_ast_lowering/src/stability.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ pub fn extern_abi_stability(abi: ExternAbi) -> Result<(), UnstableAbi> {
126126
}),
127127
ExternAbi::CmseNonSecureCall => Err(UnstableAbi {
128128
abi,
129-
feature: sym::abi_c_cmse_nonsecure_call,
129+
feature: sym::abi_cmse_nonsecure_call,
130130
explain: GateReason::Experimental,
131131
}),
132132
ExternAbi::CmseNonSecureEntry => Err(UnstableAbi {

compiler/rustc_feature/src/removed.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ declare_features! (
5454

5555
/// Allows using the `amdgpu-kernel` ABI.
5656
(removed, abi_amdgpu_kernel, "1.77.0", Some(51575), None, 120495),
57+
(removed, abi_c_cmse_nonsecure_call, "CURRENT_RUSTC_VERSION", Some(81391), Some("renamed to abi_cmse_nonsecure_call"), 142146),
5758
(removed, advanced_slice_patterns, "1.42.0", Some(62254),
5859
Some("merged into `#![feature(slice_patterns)]`"), 67712),
5960
(removed, allocator, "1.0.0", None, None),

compiler/rustc_feature/src/unstable.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,8 +353,8 @@ declare_features! (
353353

354354
/// Allows `extern "avr-interrupt" fn()` and `extern "avr-non-blocking-interrupt" fn()`.
355355
(unstable, abi_avr_interrupt, "1.45.0", Some(69664)),
356-
/// Allows `extern "C-cmse-nonsecure-call" fn()`.
357-
(unstable, abi_c_cmse_nonsecure_call, "1.51.0", Some(81391)),
356+
/// Allows `extern "cmse-nonsecure-call" fn()`.
357+
(unstable, abi_cmse_nonsecure_call, "CURRENT_RUSTC_VERSION", Some(81391)),
358358
/// Allows `extern "custom" fn()`.
359359
(unstable, abi_custom, "CURRENT_RUSTC_VERSION", Some(140829)),
360360
/// Allows `extern "gpu-kernel" fn()`.

compiler/rustc_span/src/symbol.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,7 @@ symbols! {
406406
abi_amdgpu_kernel,
407407
abi_avr_interrupt,
408408
abi_c_cmse_nonsecure_call,
409+
abi_cmse_nonsecure_call,
409410
abi_custom,
410411
abi_efiapi,
411412
abi_gpu_kernel,

0 commit comments

Comments
 (0)