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

refact: Resolve some clippy warnings

Browse source 
(cherry picked from commit dc4bfaa993eb2d712d53f70551db9ac34b0cda08)
This commit is contained in:
Robert Hensing 2024-11-27 10:26:39 +01:00
parent 12d3d62108
commit 1e3cce7742
5 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rust/nix-util/src/context.rs
View file

@ -18,10 +18,9 @@ impl Context {
// We're almost certainly going to crash anyways.
panic!("nix_c_context_create returned a null pointer");
}
let ctx = Context {
Context {
inner: NonNull::new(ctx).unwrap(),
};
ctx
}
}
/// Access the C context pointer.
@ -36,7 +35,7 @@ impl Context {
/// We recommend to use `check_call!` if possible.
pub fn check_err(&self) -> Result<()> {
let err = unsafe { raw::err_code(self.inner.as_ptr()) };
if err != raw::err_NIX_OK.try_into().unwrap() {
if err != raw::err_NIX_OK {
// msgp is a borrowed pointer (pointing into the context), so we don't need to free it
let msgp = unsafe { raw::err_msg(null_mut(), self.inner.as_ptr(), null_mut()) };
// Turn the i8 pointer into a Rust string by copying
@ -50,7 +49,7 @@ impl Context {
unsafe {
raw::set_err_msg(
self.inner.as_ptr(),
raw::err_NIX_OK.try_into().unwrap(),
raw::err_NIX_OK,
b"\0".as_ptr() as *const i8,
);
}