Skip to content

Commit

Permalink
Merge pull request #1450 from hermit-os/nightly-2024-11-01
Browse files Browse the repository at this point in the history
chore: upgrade toolchain channel to `nightly-2024-11-01`
  • Loading branch information
mkroening authored Nov 12, 2024
2 parents 4f73bfb + cfcdf75 commit 9807cf4
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 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-10-15"
channel = "nightly-2024-11-01"
components = [
"llvm-tools",
"rust-src",
Expand Down
2 changes: 1 addition & 1 deletion src/drivers/virtio/virtqueue/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ trait VirtqPrivate {

// The descriptors returned by the iterator will be incomplete, as they do not
// have all the information necessary.
fn descriptor_iter<'a>(
fn descriptor_iter(
buffer_tkn: &AvailBufferToken,
) -> Result<impl DoubleEndedIterator<Item = Self::Descriptor>, VirtqError> {
let send_desc_iter = buffer_tkn
Expand Down
2 changes: 0 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
)]
#![cfg_attr(target_arch = "x86_64", feature(abi_x86_interrupt))]
#![feature(allocator_api)]
#![feature(exposed_provenance)]
#![feature(linked_list_cursors)]
#![feature(map_try_insert)]
#![feature(maybe_uninit_as_bytes)]
Expand All @@ -27,7 +26,6 @@
any(target_arch = "aarch64", target_arch = "riscv64"),
feature(specialization)
)]
#![feature(strict_provenance)]
#![feature(thread_local)]
#![cfg_attr(target_os = "none", no_std)]
#![cfg_attr(target_os = "none", feature(custom_test_frameworks))]
Expand Down

0 comments on commit 9807cf4

Please sign in to comment.