h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-17 11:01:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary mut specifier

Browse Source
This commit is contained in:
Daniel Rainer
2025-05-25 17:37:51 +02:00
parent f40e31f675
commit f2f54919af
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/env_universal_common.rs
View File

@@ -224,13 +224,13 @@ pub fn sync(&mut self) -> (bool, Option<CallbackDataList>) {
FLOG!(uvar_file, "universal log performing full sync");
// Open the file.
let Some(mut vars_file) = self.open_and_acquire_lock() else {
let Some(vars_file) = self.open_and_acquire_lock() else {
FLOG!(uvar_file, "universal log open_and_acquire_lock() failed");
return (false, None);
};
// Read from it.
let callbacks = self.load_from_file(&mut vars_file);
let callbacks = self.load_from_file(&vars_file);
if self.ok_to_save {
(self.save(&directory), callbacks)
@@ -377,18 +377,16 @@ fn load_from_path_narrow(&mut self) -> Option<CallbackDataList> {
return None;
}
let Ok(mut file) = open_cloexec(&self.narrow_vars_path, OFlag::O_RDONLY, Mode::empty())
else {
let Ok(file) = open_cloexec(&self.narrow_vars_path, OFlag::O_RDONLY, Mode::empty()) else {
return None;
};
FLOG!(uvar_file, "universal log reading from file");
self.load_from_file(&mut file)
self.load_from_file(&file)
}
// Load environment variables from the opened [`File`] `file`. It must be mutable because we
// will read from the underlying fd.
fn load_from_file(&mut self, file: &mut File) -> Option<CallbackDataList> {
/// Load environment variables from the opened [`file`](`File`).
fn load_from_file(&mut self, file: &File) -> Option<CallbackDataList> {
// Get the dev / inode.
let current_file_id = file_id_for_file(file);
if current_file_id == self.last_read_file_id {