Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-14 14:03:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update env_var_to_ffi() to take an Option<EnvVar>

Browse source 
It wasn't possible to handle cases where vars.get() returned `None` then forward
that to C++, but now we can.
This commit is contained in:
Mahmoud Al-Qudsi 2023-05-16 20:11:05 -05:00
parent 32912b6525
commit cce78eeb43
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fish-rust/src/env/environment.rs vendored
View file

@ -34,8 +34,12 @@ lazy_static! {
static UVARS_LOCALLY_MODIFIED: RelaxedAtomicBool = RelaxedAtomicBool::new(false); static UVARS_LOCALLY_MODIFIED: RelaxedAtomicBool = RelaxedAtomicBool::new(false);
/// Convert an EnvVar to an FFI env_var_t. /// Convert an EnvVar to an FFI env_var_t.
fn env_var_to_ffi(var: EnvVar) -> cxx::UniquePtr<ffi::env_var_t> { pub fn env_var_to_ffi(var: Option<EnvVar>) -> cxx::UniquePtr<ffi::env_var_t> {
ffi::env_var_t::new_ffi(Box::into_raw(Box::from(var)).cast()).within_unique_ptr() if let Some(var) = var {
ffi::env_var_t::new_ffi(Box::into_raw(Box::from(var)).cast()).within_unique_ptr()
} else {
cxx::UniquePtr::null()
}
} }
/// An environment is read-only access to variable values. /// An environment is read-only access to variable values.

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

@ -150,7 +150,7 @@ pub trait FloggableDisplay {
impl<T: std::fmt::Display> FloggableDisplay for T { impl<T: std::fmt::Display> FloggableDisplay for T {
fn to_flog_str(&self) -> String { fn to_flog_str(&self) -> String {
format!("{}", self) self.to_string()
} }
} }