From 43a946bb0890ce0f20cb84c9161fffef5a2a0acb 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 1/5] update toolchain to `nightly-2021-09-24` --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7e2f683580..7808503726 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2739,9 +2739,9 @@ dependencies = [ [[package]] name = "kiddo" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73e70400c6435a3f5e4d7bfb406af50bc66950cc8f24f45488d66f47bf3f5e25" +checksum = "66d93815d7b36a79b35bafa5227738f81e2072764235f1369a412de0e16459e7" dependencies = [ "num-traits", ] 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 2/5] 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, } From 96bd27db62e4a26dd0b081b3938f7a73f95a9599 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= Date: Fri, 24 Sep 2021 23:11:05 +0200 Subject: [PATCH 3/5] apply some clippy fixes that comes with the new toolchain version --- common/net/src/lib.rs | 5 +-- common/src/comp/inventory/item/tool.rs | 1 + common/src/resources.rs | 11 +----- common/src/skillset_builder.rs | 5 +-- common/src/states/basic_beam.rs | 2 +- server/src/input.rs | 5 +-- server/src/sys/agent.rs | 6 ++-- voxygen/anim/src/biped_large/spin.rs | 2 +- voxygen/src/hud/hotbar.rs | 11 +----- voxygen/src/menu/char_selection/ui/mod.rs | 1 + voxygen/src/render/mod.rs | 1 + voxygen/src/render/renderer.rs | 2 +- voxygen/src/settings/gamepad.rs | 12 ++----- voxygen/src/ui/ice/renderer/style/checkbox.rs | 11 +----- voxygen/src/ui/mod.rs | 7 +--- world/src/lib.rs | 6 +--- world/src/site/economy.rs | 35 ++----------------- 17 files changed, 22 insertions(+), 101 deletions(-) diff --git a/common/net/src/lib.rs b/common/net/src/lib.rs index 17db09349d..faacbb015e 100644 --- a/common/net/src/lib.rs +++ b/common/net/src/lib.rs @@ -1,7 +1,4 @@ #![allow(incomplete_features)] -#![feature( - generic_const_exprs, - const_fn_floating_point_arithmetic, -)] +#![feature(generic_const_exprs, const_fn_floating_point_arithmetic)] pub mod msg; pub mod sync; diff --git a/common/src/comp/inventory/item/tool.rs b/common/src/comp/inventory/item/tool.rs index 62b9d48509..8c53d71020 100644 --- a/common/src/comp/inventory/item/tool.rs +++ b/common/src/comp/inventory/item/tool.rs @@ -375,6 +375,7 @@ impl AbilitySet { } } +#[allow(clippy::derivable_impls)] impl Default for AbilitySet { fn default() -> Self { AbilitySet { diff --git a/common/src/resources.rs b/common/src/resources.rs index fee169e388..4a55d3b5c3 100644 --- a/common/src/resources.rs +++ b/common/src/resources.rs @@ -41,7 +41,7 @@ pub enum GameMode { #[derive(Copy, Clone, Default, Debug)] pub struct PlayerEntity(pub Option); -#[derive(Copy, Clone, Debug)] +#[derive(Copy, Clone, Debug, Default)] pub struct PlayerPhysicsSetting { /// true if the client wants server-authoratative physics (e.g. to use /// airships properly) @@ -51,15 +51,6 @@ pub struct PlayerPhysicsSetting { pub server_force: bool, } -impl Default for PlayerPhysicsSetting { - fn default() -> PlayerPhysicsSetting { - PlayerPhysicsSetting { - client_optin: false, - server_force: false, - } - } -} - impl PlayerPhysicsSetting { pub fn server_authoritative(&self) -> bool { self.client_optin || self.server_force } diff --git a/common/src/skillset_builder.rs b/common/src/skillset_builder.rs index d0e7b2ecc0..90282d912e 100644 --- a/common/src/skillset_builder.rs +++ b/common/src/skillset_builder.rs @@ -54,12 +54,9 @@ fn skills_from_nodes(nodes: &[SkillNode]) -> Vec<(Skill, Option)> { skills } +#[derive(Default)] pub struct SkillSetBuilder(SkillSet); -impl Default for SkillSetBuilder { - fn default() -> Self { Self(SkillSet::default()) } -} - impl SkillSetBuilder { /// Creates `SkillSetBuilder` from `asset_specifier` #[must_use] diff --git a/common/src/states/basic_beam.rs b/common/src/states/basic_beam.rs index a9da6c3f24..6e863a6e8b 100644 --- a/common/src/states/basic_beam.rs +++ b/common/src/states/basic_beam.rs @@ -151,7 +151,7 @@ impl CharacterBehavior for Data { // and applying `pitch` to get needed orientation. let look_dir = data.inputs.look_dir; let xy_dir = Dir::from_unnormalized(Vec3::new(look_dir.x, look_dir.y, 0.0)) - .unwrap_or_else(Dir::default); + .unwrap_or_default(); let pitch = xy_dir.rotation_between(look_dir); Ori::from(Vec3::new( diff --git a/server/src/input.rs b/server/src/input.rs index c542fe83f2..7a5c751246 100644 --- a/server/src/input.rs +++ b/server/src/input.rs @@ -1,7 +1,4 @@ +#[derive(Default)] pub struct Input { // TODO: Use this type to manage server input. } - -impl Default for Input { - fn default() -> Self { Input {} } -} diff --git a/server/src/sys/agent.rs b/server/src/sys/agent.rs index c8112b25ca..2b712dc2af 100644 --- a/server/src/sys/agent.rs +++ b/server/src/sys/agent.rs @@ -1662,9 +1662,9 @@ impl<'a> AgentData<'a> { Some((entity, *e_pos)) } else if let Some(villain_info) = guard_duty(e_health, e_alignment) { Some(villain_info) - } else if rtsim_remember(e_stats, agent, event_emitter) { - Some((entity, *e_pos)) - } else if npc_sees_cultist(e_stats, e_inventory, agent, event_emitter) { + } else if rtsim_remember(e_stats, agent, event_emitter) + || npc_sees_cultist(e_stats, e_inventory, agent, event_emitter) + { Some((entity, *e_pos)) } else { None diff --git a/voxygen/anim/src/biped_large/spin.rs b/voxygen/anim/src/biped_large/spin.rs index 213d8b943d..5debd2f82a 100644 --- a/voxygen/anim/src/biped_large/spin.rs +++ b/voxygen/anim/src/biped_large/spin.rs @@ -87,7 +87,7 @@ impl Animation for SpinAnimation { next.head.orientation = Quaternion::rotation_y(movement1 * 0.1 - movement2 * -0.1) * Quaternion::rotation_z(1.07 + movement1 * 0.4 + movement2 * -1.5); - next.torso.orientation = Quaternion::rotation_z(movement2 * 6.28); + next.torso.orientation = Quaternion::rotation_z(movement2 * std::f32::consts::TAU); } if let Some(ToolKind::Axe | ToolKind::Hammer | ToolKind::Dagger) = active_tool_kind { diff --git a/voxygen/src/hud/hotbar.rs b/voxygen/src/hud/hotbar.rs index e6dd84112d..8bbcd07a15 100644 --- a/voxygen/src/hud/hotbar.rs +++ b/voxygen/src/hud/hotbar.rs @@ -27,21 +27,12 @@ pub enum SlotContents { Ability4, } -#[derive(Clone, Debug)] +#[derive(Clone, Copy, Default)] pub struct State { pub slots: [Option; 10], inputs: [bool; 10], } -impl Default for State { - fn default() -> Self { - Self { - slots: [None; 10], - inputs: [false; 10], - } - } -} - impl State { pub fn new(slots: [Option; 10]) -> Self { Self { diff --git a/voxygen/src/menu/char_selection/ui/mod.rs b/voxygen/src/menu/char_selection/ui/mod.rs index 2561f3bb90..9ffb4a5ef5 100644 --- a/voxygen/src/menu/char_selection/ui/mod.rs +++ b/voxygen/src/menu/char_selection/ui/mod.rs @@ -378,6 +378,7 @@ impl Controls { .position(|i| i.character.id == Some(id)) }); + #[allow(clippy::if_same_then_else)] if let Some(error) = error { // TODO: use more user friendly errors with suggestions on potential solutions // instead of directly showing error message here diff --git a/voxygen/src/render/mod.rs b/voxygen/src/render/mod.rs index 594a114384..b98fc788c8 100644 --- a/voxygen/src/render/mod.rs +++ b/voxygen/src/render/mod.rs @@ -209,6 +209,7 @@ pub enum ShadowMode { Cheap, } +#[allow(clippy::derivable_impls)] impl Default for ShadowMode { fn default() -> Self { ShadowMode::Map(Default::default()) } } diff --git a/voxygen/src/render/renderer.rs b/voxygen/src/render/renderer.rs index 1e13017d6d..1c5f22bd57 100644 --- a/voxygen/src/render/renderer.rs +++ b/voxygen/src/render/renderer.rs @@ -310,7 +310,7 @@ impl Renderer { | (adapter.features() & wgpu_profiler::GpuProfiler::REQUIRED_WGPU_FEATURES), limits, }, - trace_path.as_deref(), + trace_path, ))?; // Set error handler for wgpu errors diff --git a/voxygen/src/settings/gamepad.rs b/voxygen/src/settings/gamepad.rs index 53313cc047..0aa405e173 100644 --- a/voxygen/src/settings/gamepad.rs +++ b/voxygen/src/settings/gamepad.rs @@ -136,11 +136,11 @@ pub mod con_settings { pub scroll_y: Axis, } - #[derive(Clone, Debug, Serialize, Deserialize)] + #[derive(Clone, Debug, Default, Serialize, Deserialize)] #[serde(default)] pub struct GameAnalogButton {} - #[derive(Clone, Debug, Serialize, Deserialize)] + #[derive(Clone, Debug, Default, Serialize, Deserialize)] #[serde(default)] pub struct MenuAnalogButton {} @@ -246,12 +246,4 @@ pub mod con_settings { } } } - - impl Default for GameAnalogButton { - fn default() -> Self { Self {} } - } - - impl Default for MenuAnalogButton { - fn default() -> Self { Self {} } - } } diff --git a/voxygen/src/ui/ice/renderer/style/checkbox.rs b/voxygen/src/ui/ice/renderer/style/checkbox.rs index a113c0911b..bf0f63864d 100644 --- a/voxygen/src/ui/ice/renderer/style/checkbox.rs +++ b/voxygen/src/ui/ice/renderer/style/checkbox.rs @@ -19,7 +19,7 @@ impl Background { } } -#[derive(Clone, Copy)] +#[derive(Clone, Copy, Default)] pub struct Style { background: Option, check: Option, @@ -82,12 +82,3 @@ impl Style { self.background.as_ref().map(|b| b.default) } } - -impl Default for Style { - fn default() -> Self { - Self { - background: None, - check: None, - } - } -} diff --git a/voxygen/src/ui/mod.rs b/voxygen/src/ui/mod.rs index 65b57fb139..0cbee75004 100644 --- a/voxygen/src/ui/mod.rs +++ b/voxygen/src/ui/mod.rs @@ -875,12 +875,7 @@ impl Ui { switch_to_plain_state!(); // Mesh should already be cached. - mesh.push_mesh( - text_cache - .get(&widget_id) - .as_deref() - .unwrap_or(&Mesh::new()), - ); + mesh.push_mesh(text_cache.get(&widget_id).unwrap_or(&Mesh::new())); }, PrimitiveKind::Rectangle { color } => { let color = srgba_to_linear(color.to_fsa().into()); diff --git a/world/src/lib.rs b/world/src/lib.rs index 3fde821cf4..2ebd01a561 100644 --- a/world/src/lib.rs +++ b/world/src/lib.rs @@ -7,11 +7,7 @@ )] #![allow(clippy::branches_sharing_code)] // TODO: evaluate #![deny(clippy::clone_on_ref_ptr)] -#![feature( - bool_to_option, - const_panic, - label_break_value -)] +#![feature(bool_to_option, const_panic, label_break_value)] mod all; mod block; diff --git a/world/src/site/economy.rs b/world/src/site/economy.rs index 20dd4ef789..11afd2ff4b 100644 --- a/world/src/site/economy.rs +++ b/world/src/site/economy.rs @@ -274,24 +274,14 @@ impl LaborMap { } } -#[derive(Debug)] +#[derive(Debug, Default)] pub struct AreaResources { pub resource_sum: GoodMap, pub resource_chunks: GoodMap, pub chunks: u32, } -impl Default for AreaResources { - fn default() -> Self { - Self { - resource_sum: GoodMap::default(), - resource_chunks: GoodMap::default(), - chunks: 0, - } - } -} - -#[derive(Debug)] +#[derive(Debug, Default)] pub struct NaturalResources { // resources per distance, we should increase labor cost for far resources pub per_area: Vec, @@ -301,16 +291,6 @@ pub struct NaturalResources { pub average_yield_per_chunk: GoodMap, } -impl Default for NaturalResources { - fn default() -> Self { - Self { - per_area: Vec::new(), - chunks_per_resource: GoodMap::default(), - average_yield_per_chunk: GoodMap::default(), - } - } -} - #[derive(Debug, Deserialize)] pub struct RawProfessions(Vec); @@ -383,21 +363,12 @@ pub struct TradeDelivery { pub supply: GoodMap, // maximum amount available, at the time of interaction } -#[derive(Debug)] +#[derive(Debug, Default)] pub struct TradeInformation { pub orders: DHashMap, Vec>, // per provider pub deliveries: DHashMap, Vec>, // per receiver } -impl Default for TradeInformation { - fn default() -> Self { - Self { - orders: Default::default(), - deliveries: Default::default(), - } - } -} - #[derive(Debug)] pub struct NeighborInformation { pub id: Id, From 22f4a73fa8a56248ef70090f6301a4fe28f39118 Mon Sep 17 00:00:00 2001 From: Imbris Date: Sat, 25 Sep 2021 14:58:34 -0400 Subject: [PATCH 4/5] Bump to fresh CI image with the new toolchain --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5de4e88eed..8abe30fe43 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ variables: # https://docs.gitlab.com/ee/ci/yaml/#shallow-cloning GIT_DEPTH: 3 GIT_CLEAN_FLAGS: -f - CACHE_IMAGE_TAG: 5d0b61ad + CACHE_IMAGE_TAG: c94d1580 default: # https://docs.gitlab.com/ee/ci/pipelines/settings.html#auto-cancel-pending-pipelines From ec5204af372c7b62bf3c3758c5afc38becf33aad Mon Sep 17 00:00:00 2001 From: Imbris Date: Sun, 26 Sep 2021 11:24:30 -0400 Subject: [PATCH 5/5] Add note on a clippy suppression pointing to relevant clippy issue --- server/src/settings/banlist.rs | 2 +- voxygen/src/menu/char_selection/ui/mod.rs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/settings/banlist.rs b/server/src/settings/banlist.rs index bc519743cf..35f297b010 100644 --- a/server/src/settings/banlist.rs +++ b/server/src/settings/banlist.rs @@ -78,7 +78,7 @@ pub enum BanErrorKind { #[allow(dead_code)] pub struct BanError { kind: BanErrorKind, - /// Uuid of affected + /// Uuid of affected user uuid: Uuid, /// Username of affected user (as of ban/unban time). username: String, diff --git a/voxygen/src/menu/char_selection/ui/mod.rs b/voxygen/src/menu/char_selection/ui/mod.rs index 9ffb4a5ef5..7955fdbd91 100644 --- a/voxygen/src/menu/char_selection/ui/mod.rs +++ b/voxygen/src/menu/char_selection/ui/mod.rs @@ -378,6 +378,7 @@ impl Controls { .position(|i| i.character.id == Some(id)) }); + // TODO: this appears to be instance of https://github.com/rust-lang/rust-clippy/issues/7579 #[allow(clippy::if_same_then_else)] if let Some(error) = error { // TODO: use more user friendly errors with suggestions on potential solutions