From 8c0c86b192e2b0572ddd6bc20b0334e245ec1e25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= Date: Mon, 20 Sep 2021 12:05:41 +0200 Subject: [PATCH] update toolchain to `nightly-2021-09-24` --- Cargo.lock | 4 ++-- common/net/src/lib.rs | 5 ++--- common/src/lib.rs | 2 -- common/state/src/plugin/mod.rs | 1 + common/state/src/plugin/module.rs | 1 + common/systems/src/lib.rs | 2 +- network/protocol/src/metrics.rs | 1 + network/protocol/src/mpsc.rs | 1 + network/protocol/src/prio.rs | 1 + network/protocol/src/quic.rs | 1 + network/protocol/src/tcp.rs | 1 + network/src/api.rs | 2 ++ network/src/channel.rs | 1 + network/src/participant.rs | 3 +++ network/src/scheduler.rs | 1 + rust-toolchain | 2 +- server/src/settings/banlist.rs | 3 ++- voxygen/src/lib.rs | 1 - world/Cargo.toml | 2 +- world/src/lib.rs | 4 +--- world/src/sim/location.rs | 1 + 21 files changed, 25 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7808503726..d592098e18 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3801,9 +3801,9 @@ dependencies = [ [[package]] name = "packed_simd_2" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e64858a2d3733fdd61adfdd6da89aa202f7ff0e741d2fc7ed1e452ba9dc99d7" +checksum = "71c0c06716cfc81616fa8e22b721ce92fecd594508bc0eb3d04ae3ef35ac10c5" dependencies = [ "cfg-if 0.1.10", "libm 0.1.4", diff --git a/common/net/src/lib.rs b/common/net/src/lib.rs index 0613892644..17db09349d 100644 --- a/common/net/src/lib.rs +++ b/common/net/src/lib.rs @@ -1,8 +1,7 @@ #![allow(incomplete_features)] #![feature( - const_generics, - const_evaluatable_checked, - const_fn_floating_point_arithmetic + generic_const_exprs, + const_fn_floating_point_arithmetic, )] pub mod msg; pub mod sync; diff --git a/common/src/lib.rs b/common/src/lib.rs index e16ffa7ff7..a337c57b88 100644 --- a/common/src/lib.rs +++ b/common/src/lib.rs @@ -4,11 +4,9 @@ #![allow(clippy::option_map_unit_fn)] #![deny(clippy::clone_on_ref_ptr)] #![feature( - arbitrary_enum_discriminant, associated_type_defaults, bool_to_option, fundamental, - iter_map_while, label_break_value, option_zip, trait_alias, diff --git a/common/state/src/plugin/mod.rs b/common/state/src/plugin/mod.rs index c7ca43d7f2..8197f4b076 100644 --- a/common/state/src/plugin/mod.rs +++ b/common/state/src/plugin/mod.rs @@ -34,6 +34,7 @@ pub struct PluginData { pub struct Plugin { data: PluginData, modules: Vec, + #[allow(dead_code)] files: HashMap>, } diff --git a/common/state/src/plugin/module.rs b/common/state/src/plugin/module.rs index cf4322a578..740bb32b0f 100644 --- a/common/state/src/plugin/module.rs +++ b/common/state/src/plugin/module.rs @@ -25,6 +25,7 @@ pub struct PluginModule { events: HashSet, allocator: Function, memory: Memory, + #[allow(dead_code)] name: String, } diff --git a/common/systems/src/lib.rs b/common/systems/src/lib.rs index bd0b018e3d..1a2de0b900 100644 --- a/common/systems/src/lib.rs +++ b/common/systems/src/lib.rs @@ -1,4 +1,4 @@ -#![feature(bool_to_option, array_map)] +#![feature(bool_to_option)] #![allow(clippy::option_map_unit_fn)] mod aura; diff --git a/network/protocol/src/metrics.rs b/network/protocol/src/metrics.rs index c318ea5034..7d0dbf7ba2 100644 --- a/network/protocol/src/metrics.rs +++ b/network/protocol/src/metrics.rs @@ -74,6 +74,7 @@ pub struct ProtocolMetricCache { sdata_frames_b: GenericCounter, rdata_frames_t: GenericCounter, rdata_frames_b: GenericCounter, + #[allow(dead_code)] ping: GenericGauge, } diff --git a/network/protocol/src/mpsc.rs b/network/protocol/src/mpsc.rs index f4a5eee1cd..ee497e5b4a 100644 --- a/network/protocol/src/mpsc.rs +++ b/network/protocol/src/mpsc.rs @@ -30,6 +30,7 @@ where D: UnreliableDrain, { drain: D, + #[allow(dead_code)] last: Instant, metrics: ProtocolMetricCache, } diff --git a/network/protocol/src/prio.rs b/network/protocol/src/prio.rs index 7304086a1b..f66e73313c 100644 --- a/network/protocol/src/prio.rs +++ b/network/protocol/src/prio.rs @@ -14,6 +14,7 @@ use std::{ struct StreamInfo { pub(crate) guaranteed_bandwidth: Bandwidth, pub(crate) prio: Prio, + #[allow(dead_code)] pub(crate) promises: Promises, pub(crate) messages: VecDeque, } diff --git a/network/protocol/src/quic.rs b/network/protocol/src/quic.rs index cd76c0b3ef..fa905bdefd 100644 --- a/network/protocol/src/quic.rs +++ b/network/protocol/src/quic.rs @@ -71,6 +71,7 @@ where notify_closing_streams: Vec, pending_shutdown: bool, drain: D, + #[allow(dead_code)] last: Instant, metrics: ProtocolMetricCache, } diff --git a/network/protocol/src/tcp.rs b/network/protocol/src/tcp.rs index 0909336a58..bb8bc350d1 100644 --- a/network/protocol/src/tcp.rs +++ b/network/protocol/src/tcp.rs @@ -32,6 +32,7 @@ where notify_closing_streams: Vec, pending_shutdown: bool, drain: D, + #[allow(dead_code)] last: Instant, metrics: ProtocolMetricCache, } diff --git a/network/src/api.rs b/network/src/api.rs index 8a2b0dc09b..b711246c3c 100644 --- a/network/src/api.rs +++ b/network/src/api.rs @@ -82,8 +82,10 @@ pub struct Stream { local_pid: Pid, remote_pid: Pid, sid: Sid, + #[allow(dead_code)] prio: Prio, promises: Promises, + #[allow(dead_code)] guaranteed_bandwidth: Bandwidth, send_closed: Arc, a2b_msg_s: crossbeam_channel::Sender<(Sid, Bytes)>, diff --git a/network/src/channel.rs b/network/src/channel.rs index e58d8057f9..6064edf53d 100644 --- a/network/src/channel.rs +++ b/network/src/channel.rs @@ -525,6 +525,7 @@ pub struct QuicDrain { #[cfg(feature = "quic")] #[derive(Debug)] pub struct QuicSink { + #[allow(dead_code)] con: quinn::Connection, bi: quinn::IncomingBiStreams, recvstreams_r: mpsc::UnboundedReceiver, diff --git a/network/src/participant.rs b/network/src/participant.rs index c49f1ad869..1b585ae653 100644 --- a/network/src/participant.rs +++ b/network/src/participant.rs @@ -32,6 +32,7 @@ pub(crate) type S2bShutdownBparticipant = (Duration, oneshot::Sender, b2a_msg_recv_s: Mutex>, diff --git a/network/src/scheduler.rs b/network/src/scheduler.rs index b6576b4c7b..48d51be32e 100644 --- a/network/src/scheduler.rs +++ b/network/src/scheduler.rs @@ -36,6 +36,7 @@ use tracing::*; #[derive(Debug)] struct ParticipantInfo { secret: u128, + #[allow(dead_code)] s2b_create_channel_s: mpsc::UnboundedSender, s2b_shutdown_bparticipant_s: Option>, } diff --git a/rust-toolchain b/rust-toolchain index 8cef3f3dd2..7ed28ef3a2 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2021-07-06 +nightly-2021-09-24 diff --git a/server/src/settings/banlist.rs b/server/src/settings/banlist.rs index 5fbab03338..bc519743cf 100644 --- a/server/src/settings/banlist.rs +++ b/server/src/settings/banlist.rs @@ -75,9 +75,10 @@ pub enum BanErrorKind { } #[derive(Debug)] +#[allow(dead_code)] pub struct BanError { kind: BanErrorKind, - /// Uuid of affected user + /// Uuid of affected uuid: Uuid, /// Username of affected user (as of ban/unban time). username: String, diff --git a/voxygen/src/lib.rs b/voxygen/src/lib.rs index 069e34b249..da3bde5232 100644 --- a/voxygen/src/lib.rs +++ b/voxygen/src/lib.rs @@ -3,7 +3,6 @@ #![allow(clippy::option_map_unit_fn)] #![deny(clippy::clone_on_ref_ptr)] #![feature( - array_map, array_methods, array_zip, bool_to_option, diff --git a/world/Cargo.toml b/world/Cargo.toml index 554d1f6681..9f0401abe2 100644 --- a/world/Cargo.toml +++ b/world/Cargo.toml @@ -43,7 +43,7 @@ deflate = { version = "0.9.1", optional = true } flate2 = { version = "1.0.20", optional = true } num-traits = { version = "0.2", optional = true } fallible-iterator = { version = "0.2.0", optional = true } -kiddo = { version = "0.1.4", optional = true } +kiddo = { version = "0.1.5", optional = true } rstar = { version = "0.9", optional = true } clap = { version = "2.33.3", optional = true } diff --git a/world/src/lib.rs b/world/src/lib.rs index eadf8f43d2..3fde821cf4 100644 --- a/world/src/lib.rs +++ b/world/src/lib.rs @@ -8,11 +8,9 @@ #![allow(clippy::branches_sharing_code)] // TODO: evaluate #![deny(clippy::clone_on_ref_ptr)] #![feature( - arbitrary_enum_discriminant, bool_to_option, const_panic, - label_break_value, - array_map + label_break_value )] mod all; diff --git a/world/src/sim/location.rs b/world/src/sim/location.rs index 5f9efa0e36..83a7899858 100644 --- a/world/src/sim/location.rs +++ b/world/src/sim/location.rs @@ -33,6 +33,7 @@ impl Location { #[derive(Clone, Debug)] pub struct Kingdom { + #[allow(dead_code)] region_name: String, }