From c924fed81bb8f2e0e6b87adf70c65e13a07639de Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Thu, 18 Sep 2025 12:54:21 -0700 Subject: [PATCH] fix: rust types (cherry picked from commit 925a0abd694f6409b6d54b6cad3a61fc916215d3) --- rust/nix-expr/src/eval_state.rs | 2 +- rust/nix-flake/src/lib.rs | 4 ++-- rust/nix-util/src/context.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rust/nix-expr/src/eval_state.rs b/rust/nix-expr/src/eval_state.rs index af24045..e6cf8bd 100644 --- a/rust/nix-expr/src/eval_state.rs +++ b/rust/nix-expr/src/eval_state.rs @@ -284,7 +284,7 @@ impl EvalState { let n = unsafe { check_call!(raw::get_attrs_size(&mut self.context, v.raw_ptr())) }?; let mut attrs = Vec::with_capacity(n as usize); for i in 0..n { - let cstr_ptr: *const i8 = unsafe { + let cstr_ptr: *const u8 = unsafe { check_call!(raw::get_attr_name_byidx( &mut self.context, v.raw_ptr(), diff --git a/rust/nix-flake/src/lib.rs b/rust/nix-flake/src/lib.rs index e4c45e5..dfaa533 100644 --- a/rust/nix-flake/src/lib.rs +++ b/rust/nix-flake/src/lib.rs @@ -87,7 +87,7 @@ impl FlakeReferenceParseFlags { context::check_call!(raw::flake_reference_parse_flags_set_base_directory( &mut ctx, self.ptr.as_ptr(), - base_directory.as_ptr() as *const i8, + base_directory.as_ptr() as *const u8, base_directory.len() )) }?; @@ -125,7 +125,7 @@ impl FlakeReference { fetch_settings.raw_ptr(), flake_settings.ptr, flags.ptr.as_ptr(), - reference.as_ptr() as *const i8, + reference.as_ptr() as *const u8, reference.len(), // pointer to ptr &mut ptr, diff --git a/rust/nix-util/src/context.rs b/rust/nix-util/src/context.rs index 8e12a8b..0a885b5 100644 --- a/rust/nix-util/src/context.rs +++ b/rust/nix-util/src/context.rs @@ -50,7 +50,7 @@ impl Context { raw::set_err_msg( self.inner.as_ptr(), raw::err_NIX_OK, - b"\0".as_ptr() as *const i8, + b"\0".as_ptr() as *const u8, ); } }