Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-28 13:53:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove additional unnecessary uses of unsafe

Browse source
This commit is contained in:
ridiculousfish 2024-01-07 17:39:23 -08:00
parent 92f49ca071
commit 40fad20d7f
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fish-rust/src/env_dispatch.rs
View file

@ -672,7 +672,7 @@ fn init_curses(vars: &EnvStack) {
update_fish_color_support(vars); update_fish_color_support(vars);
// Invalidate the cached escape sequences since they may no longer be valid. // Invalidate the cached escape sequences since they may no longer be valid.
unsafe { LAYOUT_CACHE_SHARED.lock().unwrap() }.clear(); LAYOUT_CACHE_SHARED.lock().unwrap().clear();
CURSES_INITIALIZED.store(true, Ordering::Relaxed); CURSES_INITIALIZED.store(true, Ordering::Relaxed);
} }

12
fish-rust/src/screen.rs
View file

@ -788,7 +788,7 @@ impl Screen {
zelf.outp.set_color(fg, bg); zelf.outp.set_color(fg, bg);
}; };
let mut cached_layouts = unsafe { LAYOUT_CACHE_SHARED.lock().unwrap() }; let mut cached_layouts = LAYOUT_CACHE_SHARED.lock().unwrap();
let mut zelf = self.scoped_buffer(); let mut zelf = self.scoped_buffer();
// Determine size of left and right prompt. Note these have already been truncated. // Determine size of left and right prompt. Note these have already been truncated.
@ -1122,7 +1122,7 @@ pub struct LayoutCache {
// Singleton of the cached escape sequences seen in prompts and similar strings. // Singleton of the cached escape sequences seen in prompts and similar strings.
// Note this is deliberately exported so that init_curses can clear it. // Note this is deliberately exported so that init_curses can clear it.
pub static mut LAYOUT_CACHE_SHARED: Mutex<LayoutCache> = Mutex::new(LayoutCache::new()); pub static LAYOUT_CACHE_SHARED: Mutex<LayoutCache> = Mutex::new(LayoutCache::new());
impl LayoutCache { impl LayoutCache {
pub const fn new() -> Self { pub const fn new() -> Self {
@ -1596,7 +1596,9 @@ fn calc_prompt_lines(prompt: &wstr) -> usize {
// calc_prompt_width_and_lines. // calc_prompt_width_and_lines.
let mut result = 1; let mut result = 1;
if prompt.chars().any(|c| matches!(c, '\n' | '\x0C')) { if prompt.chars().any(|c| matches!(c, '\n' | '\x0C')) {
result = unsafe { LAYOUT_CACHE_SHARED.lock().unwrap() } result = LAYOUT_CACHE_SHARED
.lock()
.unwrap()
.calc_prompt_layout(prompt, None, usize::MAX) .calc_prompt_layout(prompt, None, usize::MAX)
.line_breaks .line_breaks
.len() .len()
@ -1696,14 +1698,14 @@ fn compute_layout(
// Truncate both prompts to screen width (#904). // Truncate both prompts to screen width (#904).
let mut left_prompt = WString::new(); let mut left_prompt = WString::new();
let left_prompt_layout = unsafe { LAYOUT_CACHE_SHARED.lock().unwrap() }.calc_prompt_layout( let left_prompt_layout = LAYOUT_CACHE_SHARED.lock().unwrap().calc_prompt_layout(
left_untrunc_prompt, left_untrunc_prompt,
Some(&mut left_prompt), Some(&mut left_prompt),
screen_width, screen_width,
); );
let mut right_prompt = WString::new(); let mut right_prompt = WString::new();
let right_prompt_layout = unsafe { LAYOUT_CACHE_SHARED.lock().unwrap() }.calc_prompt_layout( let right_prompt_layout = LAYOUT_CACHE_SHARED.lock().unwrap().calc_prompt_layout(
right_untrunc_prompt, right_untrunc_prompt,
Some(&mut right_prompt), Some(&mut right_prompt),
screen_width, screen_width,