Skip to content

build(deps): bump rust-vmm-ci from 042b206 to b4bb768 #363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

build(deps): bump rust-vmm-ci from 042b206 to b4bb768 #363

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0a10d6
build(deps): bump rust-vmm-ci from `042b206` to `b4bb768`
dependabot[bot] Nov 10, 2025
c46ddaf
chore: fix clippy lints/cargo warnings
roypat Nov 10, 2025
9aeb1e0
Merge branch 'main' into dependabot/submodules/rust-vmm-ci-b4bb768
roypat Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/mmap/unix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ impl<B: Bitmap> VolatileMemory for MmapRegion<B> {
&self,
offset: usize,
count: usize,
) -> volatile_memory::Result<VolatileSlice<BS<B>>> {
) -> volatile_memory::Result<VolatileSlice<'_, BS<'_, B>>> {
let _ = self.compute_end_offset(offset, count)?;

Ok(
Expand Down
12 changes: 6 additions & 6 deletions src/mmap/windows.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use crate::volatile_memory::{self, compute_offset, VolatileMemory, VolatileSlice

#[allow(non_snake_case)]
#[link(name = "kernel32")]
extern "stdcall" {
extern "C" {
Copy link
Collaborator

@XanClic XanClic Nov 13, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not "system", as seems to be recommended by rust-lang/rust#137018 (and AFAIU https://doc.rust-lang.org/nomicon/ffi.html#foreign-calling-conventions)?

pub fn VirtualAlloc(
lpAddress: *mut c_void,
dwSize: size_t,
Expand Down Expand Up @@ -55,7 +55,7 @@ const MEM_RELEASE: u32 = 0x00008000;
const FILE_MAP_ALL_ACCESS: u32 = 0xf001f;
const PAGE_READWRITE: u32 = 0x04;

pub const MAP_FAILED: *mut c_void = 0 as *mut c_void;
pub const MAP_FAILED: *mut c_void = null_mut::<c_void>();
pub const INVALID_HANDLE_VALUE: RawHandle = (-1isize) as RawHandle;
#[allow(dead_code)]
pub const ERROR_INVALID_PARAMETER: i32 = 87;
Expand Down Expand Up @@ -95,7 +95,7 @@ impl<B: NewBitmap> MmapRegion<B> {
}
// This is safe because we are creating an anonymous mapping in a place not already used by
// any other area in this process.
let addr = unsafe { VirtualAlloc(0 as *mut c_void, size, MEM_COMMIT, PAGE_READWRITE) };
let addr = unsafe { VirtualAlloc(null_mut::<c_void>(), size, MEM_COMMIT, PAGE_READWRITE) };
if addr == MAP_FAILED {
return Err(io::Error::last_os_error());
}
Expand All @@ -111,7 +111,7 @@ impl<B: NewBitmap> MmapRegion<B> {
///
/// # Arguments
/// * `file_offset` - The mapping will be created at offset `file_offset.start` in the file
/// referred to by `file_offset.file`.
/// referred to by `file_offset.file`.
/// * `size` - The size of the memory region in bytes.
pub fn from_file(file_offset: FileOffset, size: usize) -> io::Result<Self> {
let handle = file_offset.file().as_raw_handle();
Expand Down Expand Up @@ -151,7 +151,7 @@ impl<B: NewBitmap> MmapRegion<B> {
CloseHandle(mapping);
}

if addr == null_mut() {
if addr.is_null() {
return Err(io::Error::last_os_error());
}
Ok(Self {
Expand Down Expand Up @@ -200,7 +200,7 @@ impl<B: Bitmap> VolatileMemory for MmapRegion<B> {
&self,
offset: usize,
count: usize,
) -> volatile_memory::Result<VolatileSlice<BS<Self::B>>> {
) -> volatile_memory::Result<VolatileSlice<'_, BS<'_, Self::B>>> {
let end = compute_offset(offset, count)?;
if end > self.size {
return Err(volatile_memory::Error::OutOfBounds { addr: end });
Expand Down