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

fix: Require mutable Context, as it should be

Browse source 
This spreads out transitively to many places and requires that
we use `check_call!` instead of `check_one_call` in a number of
places.

(cherry picked from commit 6bc31dcf206518a7be7f0ac6e773d5dfe25531ea)
This commit is contained in:
Robert Hensing 2024-06-15 12:40:45 +02:00
parent 226639939f
commit a6dbf17778
5 changed files with 143 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

15
rust/nix-util/src/settings.rs
View file

@ -7,7 +7,7 @@ use crate::{
};
pub fn set(key: &str, value: &str) -> Result<()> {
let ctx = context::Context::new();
let mut ctx = context::Context::new();
let key = std::ffi::CString::new(key)?;
let value = std::ffi::CString::new(value)?;
ctx.check_one_call(|ctx_ptr| unsafe {
@ -16,7 +16,7 @@ pub fn set(key: &str, value: &str) -> Result<()> {
}
pub fn get(key: &str) -> Result<String> {
let ctx = context::Context::new();
let mut ctx = context::Context::new();
let key = std::ffi::CString::new(key)?;
let mut r: Result<String> = result_string_init!();
ctx.check_one_call(|ctx_ptr| unsafe {
@ -32,15 +32,16 @@ pub fn get(key: &str) -> Result<String> {
#[cfg(test)]
mod tests {
use crate::check_call;
use super::*;
#[ctor::ctor]
fn setup() {
let ctx = context::Context::new();
ctx.check_one_call(|ctx_ptr| unsafe {
nix_c_raw::libstore_init(ctx_ptr);
})
.unwrap();
let mut ctx = context::Context::new();
unsafe {
check_call!(raw::libstore_init[ctx]).unwrap();
}
}
#[test]