From 892c0dfe587b7adb1c0b9629ccaad34ebd2af2f0 Mon Sep 17 00:00:00 2001 From: SOFe Date: Sat, 25 Nov 2023 22:27:36 +0800 Subject: [PATCH] chore: update rust-toolchain to 2023-11-21 --- codegen/src/system/arg.rs | 2 +- rust-toolchain | 2 +- src/lib.rs | 1 - src/scheduler/topology.rs | 1 - src/world/rw/isotope/read/partial.rs | 4 +--- src/world/rw/isotope/write/partial.rs | 4 +--- 6 files changed, 4 insertions(+), 10 deletions(-) diff --git a/codegen/src/system/arg.rs b/codegen/src/system/arg.rs index eebac350eb..1ca0985a9f 100644 --- a/codegen/src/system/arg.rs +++ b/codegen/src/system/arg.rs @@ -82,7 +82,7 @@ fn isotope_partial_builder( )); } - let &arch = args.get(0).expect("args.len() >= 2"); + let &arch = args.first().expect("args.len() >= 2"); let &comp = args.get(1).expect("args.len() >= 2"); let discrim_set = args.get(2).map(|&ty| Box::new(ty.clone())).ok_or(args_span); diff --git a/rust-toolchain b/rust-toolchain index 2540aa02c2..3882c635e0 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2023-09-01 +nightly-2023-11-21 diff --git a/src/lib.rs b/src/lib.rs index 14460bd67b..c93d08caaa 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -163,7 +163,6 @@ allow(dead_code) )] #![cfg_attr(doc, warn(missing_docs))] -#![feature(return_position_impl_trait_in_trait)] #![feature(type_alias_impl_trait, impl_trait_in_assoc_type)] #![feature(maybe_uninit_uninit_array, maybe_uninit_array_assume_init)] #![feature(never_type)] diff --git a/src/scheduler/topology.rs b/src/scheduler/topology.rs index bfa35d28bc..439e0a82af 100644 --- a/src/scheduler/topology.rs +++ b/src/scheduler/topology.rs @@ -191,7 +191,6 @@ fn build_initials( (node, WakeupState::Pending) } (node @ Node::Partition(_), 0) => (node, WakeupState::Completed), - _ => unreachable!(), // TODO remove this line when feature(precise_pointer_size_matching) is stable }) .collect(); diff --git a/src/world/rw/isotope/read/partial.rs b/src/world/rw/isotope/read/partial.rs index 72f07d0051..843ec60695 100644 --- a/src/world/rw/isotope/read/partial.rs +++ b/src/world/rw/isotope/read/partial.rs @@ -97,9 +97,7 @@ where type IterValues<'t> = impl Iterator + 't where Self: 't; - fn iter_values(&self) -> Self::IterValues<'_> { - self.storages.iter_mapped().map(|(key, discrim, storage)| (key, discrim, storage)) - } + fn iter_values(&self) -> Self::IterValues<'_> { self.storages.iter_mapped() } } impl PartialStorageMap for Storages diff --git a/src/world/rw/isotope/write/partial.rs b/src/world/rw/isotope/write/partial.rs index fd31505720..ad07a180a7 100644 --- a/src/world/rw/isotope/write/partial.rs +++ b/src/world/rw/isotope/write/partial.rs @@ -97,9 +97,7 @@ where type IterValues<'t> = impl Iterator + 't where Self: 't; - fn iter_values(&self) -> Self::IterValues<'_> { - self.storages.iter_mapped().map(|(key, discrim, storage)| (key, discrim, storage)) - } + fn iter_values(&self) -> Self::IterValues<'_> { self.storages.iter_mapped() } } impl PartialStorageMap for Storages