Skip to content

Commit dc5a5c0

Browse files
committed
update nix dependency
1 parent 10bfd5e commit dc5a5c0

File tree

3 files changed

+5
-19
lines changed

3 files changed

+5
-19
lines changed

Cargo.lock

Lines changed: 1 addition & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ lazy_static = "1.0"
3939
log = "0.4.6"
4040
mime = "0.3.1"
4141
minifier = { version = "0.3", features = ["html"] }
42-
nix = { version = "0.27.1", features = ["mman", "resource"] }
42+
nix = { version = "0.31.2", features = ["mman", "resource"] }
4343
percent-encoding = "2.1.0"
4444
prometheus = "0.13.3"
4545
r2d2 = "0.8.2"

src/report/archives.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,12 @@ impl TempfileBackedBuffer {
2828
NonZeroUsize::new(len).unwrap(),
2929
nix::sys::mman::ProtFlags::PROT_READ,
3030
nix::sys::mman::MapFlags::MAP_PRIVATE,
31-
Some(&file),
31+
&file,
3232
0,
3333
)?;
34-
let Some(base) = NonNull::new(base as *mut u8) else {
35-
panic!("Failed to map file");
36-
};
3734
Ok(TempfileBackedBuffer {
3835
_file: file,
39-
mmap: NonNull::slice_from_raw_parts(base, len),
36+
mmap: NonNull::slice_from_raw_parts(base.cast(), len),
4037
})
4138
}
4239
}
@@ -50,7 +47,7 @@ impl TempfileBackedBuffer {
5047
impl Drop for TempfileBackedBuffer {
5148
fn drop(&mut self) {
5249
unsafe {
53-
if let Err(e) = nix::sys::mman::munmap(self.mmap.as_ptr() as *mut _, self.mmap.len()) {
50+
if let Err(e) = nix::sys::mman::munmap(self.mmap.cast(), self.mmap.len()) {
5451
eprintln!("Failed to unmap temporary file: {e:?}");
5552
}
5653
}

0 commit comments

Comments
 (0)