Skip to content

Commit

Permalink
Merge pull request #1374 from hermit-os/nightly-2024-09-01
Browse files Browse the repository at this point in the history
chore: upgrade toolchain channel to `nightly-2024-09-01`
  • Loading branch information
mkroening authored Sep 1, 2024
2 parents 82f0d28 + 0070f45 commit fd66355
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
channel = "nightly-2024-08-01"
channel = "nightly-2024-09-01"
components = [
"llvm-tools",
"rust-src",
Expand Down
4 changes: 4 additions & 0 deletions src/fd/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,8 @@ async fn poll_fds(fds: &mut [PollFd]) -> io::Result<u64> {
.await
}

/// Wait for some event on a file descriptor.
///
/// The unix-like `poll` waits for one of a set of file descriptors
/// to become ready to perform I/O. The set of file descriptors to be
/// monitored is specified in the `fds` argument, which is an array
Expand All @@ -383,6 +385,8 @@ pub fn poll(fds: &mut [PollFd], timeout: Option<Duration>) -> io::Result<u64> {
result
}

/// Wait for some event on a file descriptor.
///
/// `eventfd` creates an linux-like "eventfd object" that can be used
/// as an event wait/notify mechanism by user-space applications, and by
/// the kernel to notify user-space applications of events. The
Expand Down
2 changes: 0 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,13 @@
)]
#![cfg_attr(target_arch = "x86_64", feature(abi_x86_interrupt))]
#![feature(allocator_api)]
#![feature(asm_const)]
#![feature(exposed_provenance)]
#![feature(linked_list_cursors)]
#![feature(map_try_insert)]
#![feature(maybe_uninit_as_bytes)]
#![feature(maybe_uninit_slice)]
#![feature(naked_functions)]
#![feature(never_type)]
#![feature(new_uninit)]
#![feature(noop_waker)]
#![feature(slice_from_ptr_range)]
#![feature(slice_ptr_get)]
Expand Down

0 comments on commit fd66355

Please sign in to comment.