h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-02 05:41:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

simplify serialize_with_vars

Browse Source 
Closes #12453
This commit is contained in:
xtqqczze
2026-02-15 11:59:53 +00:00
committed by Johannes Altmanninger
parent 4eac5f4d9d
commit 93478e7c51
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/env_universal_common.rs
View File

@@ -9,6 +9,7 @@
use crate::wutil::{FileId, INVALID_FILE_ID, file_id_for_file, file_id_for_path_narrow, wrealpath};
use fish_wcstringutil::{LineIterator, join_strings};
use fish_widestring::decode_byte_from_char;
use itertools::Itertools as _;
use std::collections::HashSet;
use std::collections::hash_map::Entry;
use std::ffi::CString;
@@ -317,21 +318,20 @@ fn serialize_with_vars(vars: &VarTable) -> Vec<u8> {
contents.extend_from_slice(UVARS_VERSION_3_0);
contents.push(b'\n');
// Preserve legacy behavior by sorting the values first
let mut cloned: Vec<(&wstr, &EnvVar)> =
vars.iter().map(|(key, var)| (key.as_ref(), var)).collect();
cloned.sort_by_key(|(key, _)| *key);
vars.iter()
// Preserve legacy behavior by sorting the values first
.sorted_by_key(|(k, _)| *k)
.for_each(|(k, v)| {
// Append the entry. Note that append_file_entry may fail,
// but that only affects one variable; soldier on.
append_file_entry(
v.get_flags(),
k,
&encode_serialized(v.as_list()),
&mut contents,
);
});
for (key, var) in cloned {
// Append the entry. Note that append_file_entry may fail, but that only affects one
// variable; soldier on.
append_file_entry(
var.get_flags(),
key,
&encode_serialized(var.as_list()),
&mut contents,
);
}
contents
}