cry/nixide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refact: Make the callback convert to Result<String> immediately

Browse source 
This is slightly easier to use than the previous pattern that was
always followed up by the same conversions.

(cherry picked from commit 756c080730cd4fa81d4c0e3a99688cbe8debe57f)
This commit is contained in:
Robert Hensing 2024-05-22 14:45:12 +02:00
parent 9a6ef0489e
commit 4688ccbf95
6 changed files with 61 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rust/nix-expr/src/eval_state.rs
View file

@ -6,7 +6,8 @@ use nix_c_raw as raw;
use nix_store::path::StorePath;
use nix_store::store::Store;
use nix_util::context::Context;
use nix_util::string_return::callback_get_vec_u8;
use nix_util::result_string_init;
use nix_util::string_return::{callback_get_result_string, callback_get_result_string_data};
use std::ffi::CString;
use std::ptr::null_mut;
use std::ptr::NonNull;
@ -116,18 +117,17 @@ impl EvalState {
}
/// Not exposed, because the caller must always explicitly handle the context or not accept one at all.
fn get_string(&self, value: &Value) -> Result<String> {
let mut raw_buffer: Vec<u8> = Vec::new();
let mut r = result_string_init!();
unsafe {
raw::get_string(
self.context.ptr(),
value.raw_ptr(),
Some(callback_get_vec_u8),
&mut raw_buffer as *mut Vec<u8> as *mut std::ffi::c_void,
Some(callback_get_result_string),
callback_get_result_string_data(&mut r),
)
};
self.context.check_err()?;
String::from_utf8(raw_buffer)
.map_err(|e| anyhow::format_err!("Nix string is not valid UTF-8: {}", e))
r
}
/// NOTE: this will be replaced by two methods, one that also returns the context, and one that checks that the context is empty
pub fn require_string(&self, value: &Value) -> Result<String> {