From 8545b5debe97a68b658495b630eb5157b51bb52e Mon Sep 17 00:00:00 2001 From: Johannes Altmanninger Date: Wed, 14 Feb 2024 22:32:49 +0100 Subject: [PATCH] Remove obsolete no_mangle directives --- src/common.rs | 2 -- src/env/mod.rs | 3 --- src/fallback.rs | 2 -- 3 files changed, 7 deletions(-) diff --git a/src/common.rs b/src/common.rs index a31427b55..9292cfcf4 100644 --- a/src/common.rs +++ b/src/common.rs @@ -988,8 +988,6 @@ pub const fn char_offset(base: char, offset: u32) -> char { } } -#[no_mangle] -#[inline(never)] fn debug_thread_error() { // Wait for a SIGINT. We can't use sigsuspend() because the signal may be delivered on another // thread. diff --git a/src/env/mod.rs b/src/env/mod.rs index 4a0d8e52a..3f7f7213a 100644 --- a/src/env/mod.rs +++ b/src/env/mod.rs @@ -16,15 +16,12 @@ pub const DEFAULT_READ_BYTE_LIMIT: usize = 100 * 1024 * 1024; /// The actual `read` limit in effect, defaulting to [`DEFAULT_READ_BYTE_LIMIT`] but overridable /// with `$fish_read_limit`. -#[no_mangle] pub static READ_BYTE_LIMIT: AtomicUsize = AtomicUsize::new(DEFAULT_READ_BYTE_LIMIT); /// The curses `cur_term` TERMINAL pointer has been set up. -#[no_mangle] pub static CURSES_INITIALIZED: AtomicBool = AtomicBool::new(false); /// Does the terminal have the "eat new line" glitch. -#[no_mangle] pub static TERM_HAS_XN: AtomicBool = AtomicBool::new(false); static SETENV_LOCK: Mutex<()> = Mutex::new(()); diff --git a/src/fallback.rs b/src/fallback.rs index d108c1613..896ce2dcd 100644 --- a/src/fallback.rs +++ b/src/fallback.rs @@ -12,7 +12,6 @@ use std::{ffi::CString, mem, os::fd::RawFd}; /// Width of ambiguous East Asian characters and, as of TR11, all private-use characters. /// 1 is the typical default, but we accept any non-negative override via `$fish_ambiguous_width`. -#[no_mangle] pub static FISH_AMBIGUOUS_WIDTH: AtomicI32 = AtomicI32::new(1); /// Width of emoji characters. @@ -25,7 +24,6 @@ pub static FISH_AMBIGUOUS_WIDTH: AtomicI32 = AtomicI32::new(1); /// Valid values are 1, and 2. 1 is the typical emoji width used in Unicode 8 while some newer /// terminals use a width of 2 since Unicode 9. // For some reason, this is declared here and exposed here, but is set in `env_dispatch`. -#[no_mangle] pub static FISH_EMOJI_WIDTH: AtomicI32 = AtomicI32::new(1); static WC_LOOKUP_TABLE: Lazy = Lazy::new(WcLookupTable::new);