diff --git a/voxygen/src/hud/bag.rs b/voxygen/src/hud/bag.rs index 8c4dadecfd..112db80037 100644 --- a/voxygen/src/hud/bag.rs +++ b/voxygen/src/hud/bag.rs @@ -566,8 +566,7 @@ impl<'a> Widget for Bag<'a> { } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} #[allow(clippy::useless_format)] // TODO: Pending review in #587 fn update(self, args: widget::UpdateArgs) -> Self::Event { diff --git a/voxygen/src/hud/buttons.rs b/voxygen/src/hud/buttons.rs index 115ea9c7cf..9cf52a0e8f 100644 --- a/voxygen/src/hud/buttons.rs +++ b/voxygen/src/hud/buttons.rs @@ -120,8 +120,7 @@ impl<'a> Widget for Buttons<'a> { } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} fn update(self, args: widget::UpdateArgs) -> Self::Event { common_base::prof_span!("Buttons::update"); diff --git a/voxygen/src/hud/chat.rs b/voxygen/src/hud/chat.rs index 65f42344c7..9a3175c108 100644 --- a/voxygen/src/hud/chat.rs +++ b/voxygen/src/hud/chat.rs @@ -200,8 +200,7 @@ impl<'a> Widget for Chat<'a> { } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} #[allow(clippy::redundant_clone)] // TODO: Pending review in #587 #[allow(clippy::single_match)] // TODO: Pending review in #587 diff --git a/voxygen/src/hud/crafting.rs b/voxygen/src/hud/crafting.rs index 58fe981605..79093537ac 100644 --- a/voxygen/src/hud/crafting.rs +++ b/voxygen/src/hud/crafting.rs @@ -230,8 +230,7 @@ impl<'a> Widget for Crafting<'a> { } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} fn update(self, args: widget::UpdateArgs) -> Self::Event { common_base::prof_span!("Crafting::update"); diff --git a/voxygen/src/hud/diary.rs b/voxygen/src/hud/diary.rs index 74f04ff778..1f1fd98eb9 100644 --- a/voxygen/src/hud/diary.rs +++ b/voxygen/src/hud/diary.rs @@ -256,8 +256,7 @@ impl<'a> Widget for Diary<'a> { fn init_state(&self, id_gen: widget::id::Generator) -> Self::State { Ids::new(id_gen) } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} fn update(mut self, args: widget::UpdateArgs) -> Self::Event { common_base::prof_span!("Diary::update"); diff --git a/voxygen/src/hud/esc_menu.rs b/voxygen/src/hud/esc_menu.rs index 8a267467cc..5573cf3ad6 100644 --- a/voxygen/src/hud/esc_menu.rs +++ b/voxygen/src/hud/esc_menu.rs @@ -63,8 +63,7 @@ impl<'a> Widget for EscMenu<'a> { } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} fn update(self, args: widget::UpdateArgs) -> Self::Event { common_base::prof_span!("EscMenu::update"); diff --git a/voxygen/src/hud/group.rs b/voxygen/src/hud/group.rs index 663af1772e..f14b629323 100644 --- a/voxygen/src/hud/group.rs +++ b/voxygen/src/hud/group.rs @@ -145,7 +145,6 @@ impl<'a> Widget for Group<'a> { //TODO: Disband groups when there's only one member in them //TODO: Always send health, energy, level and position of group members to the // client - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 #[allow(clippy::blocks_in_if_conditions)] // TODO: Pending review in #587 fn update(self, args: widget::UpdateArgs) -> Self::Event { common_base::prof_span!("Group::update"); diff --git a/voxygen/src/hud/loot_scroller.rs b/voxygen/src/hud/loot_scroller.rs index 7f497afc0e..676291465b 100644 --- a/voxygen/src/hud/loot_scroller.rs +++ b/voxygen/src/hud/loot_scroller.rs @@ -126,8 +126,7 @@ impl<'a> Widget for LootScroller<'a> { } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} fn update(self, args: widget::UpdateArgs) -> Self::Event { let widget::UpdateArgs { state, ui, .. } = args; diff --git a/voxygen/src/hud/map.rs b/voxygen/src/hud/map.rs index 792fdc3662..b730475775 100644 --- a/voxygen/src/hud/map.rs +++ b/voxygen/src/hud/map.rs @@ -192,8 +192,7 @@ impl<'a> Widget for Map<'a> { } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} #[allow(clippy::useless_format)] // TODO: Pending review in #587 fn update(self, args: widget::UpdateArgs) -> Self::Event { diff --git a/voxygen/src/hud/minimap.rs b/voxygen/src/hud/minimap.rs index b496106772..754d3cbf3a 100644 --- a/voxygen/src/hud/minimap.rs +++ b/voxygen/src/hud/minimap.rs @@ -433,8 +433,7 @@ impl<'a> Widget for MiniMap<'a> { } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} fn update(self, args: widget::UpdateArgs) -> Self::Event { common_base::prof_span!("Minimap::update"); diff --git a/voxygen/src/hud/popup.rs b/voxygen/src/hud/popup.rs index f1e8ef2f97..843bc57baf 100644 --- a/voxygen/src/hud/popup.rs +++ b/voxygen/src/hud/popup.rs @@ -80,8 +80,7 @@ impl<'a> Widget for Popup<'a> { } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} #[allow(clippy::single_match)] // TODO: Pending review in #587 fn update(self, args: widget::UpdateArgs) -> Self::Event { diff --git a/voxygen/src/hud/prompt_dialog.rs b/voxygen/src/hud/prompt_dialog.rs index eea312fb6b..ae9ae15770 100644 --- a/voxygen/src/hud/prompt_dialog.rs +++ b/voxygen/src/hud/prompt_dialog.rs @@ -79,8 +79,7 @@ impl<'a> Widget for PromptDialog<'a> { } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} fn update(self, args: widget::UpdateArgs) -> Self::Event { common_base::prof_span!("PromptDialog::update"); diff --git a/voxygen/src/hud/settings_window/chat.rs b/voxygen/src/hud/settings_window/chat.rs index 4a211cfcf8..60c540d8fd 100644 --- a/voxygen/src/hud/settings_window/chat.rs +++ b/voxygen/src/hud/settings_window/chat.rs @@ -118,8 +118,7 @@ impl<'a> Widget for Chat<'a> { } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} fn update(self, args: widget::UpdateArgs) -> Self::Event { common_base::prof_span!("Chat::update"); diff --git a/voxygen/src/hud/settings_window/controls.rs b/voxygen/src/hud/settings_window/controls.rs index 433fcd2e07..9e6ee55769 100644 --- a/voxygen/src/hud/settings_window/controls.rs +++ b/voxygen/src/hud/settings_window/controls.rs @@ -68,8 +68,7 @@ impl<'a> Widget for Controls<'a> { } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} fn update(self, args: widget::UpdateArgs) -> Self::Event { common_base::prof_span!("Controls::update"); diff --git a/voxygen/src/hud/settings_window/gameplay.rs b/voxygen/src/hud/settings_window/gameplay.rs index 137a21976a..bb059f528d 100644 --- a/voxygen/src/hud/settings_window/gameplay.rs +++ b/voxygen/src/hud/settings_window/gameplay.rs @@ -94,8 +94,7 @@ impl<'a> Widget for Gameplay<'a> { } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} fn update(self, args: widget::UpdateArgs) -> Self::Event { common_base::prof_span!("Gameplay::update"); diff --git a/voxygen/src/hud/settings_window/interface.rs b/voxygen/src/hud/settings_window/interface.rs index eb9949fd1a..f39def8fa6 100644 --- a/voxygen/src/hud/settings_window/interface.rs +++ b/voxygen/src/hud/settings_window/interface.rs @@ -135,8 +135,7 @@ impl<'a> Widget for Interface<'a> { } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} fn update(self, args: widget::UpdateArgs) -> Self::Event { common_base::prof_span!("Interface::update"); diff --git a/voxygen/src/hud/settings_window/language.rs b/voxygen/src/hud/settings_window/language.rs index c549a9ade1..e1cb5787c7 100644 --- a/voxygen/src/hud/settings_window/language.rs +++ b/voxygen/src/hud/settings_window/language.rs @@ -63,8 +63,7 @@ impl<'a> Widget for Language<'a> { } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} fn update(self, args: widget::UpdateArgs) -> Self::Event { common_base::prof_span!("Language::update"); diff --git a/voxygen/src/hud/settings_window/mod.rs b/voxygen/src/hud/settings_window/mod.rs index 58453ad905..73de93697a 100644 --- a/voxygen/src/hud/settings_window/mod.rs +++ b/voxygen/src/hud/settings_window/mod.rs @@ -144,8 +144,7 @@ impl<'a> Widget for SettingsWindow<'a> { } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} fn update(self, args: widget::UpdateArgs) -> Self::Event { common_base::prof_span!("SettingsWindow::update"); diff --git a/voxygen/src/hud/settings_window/sound.rs b/voxygen/src/hud/settings_window/sound.rs index 476606fae5..f563b48f9e 100644 --- a/voxygen/src/hud/settings_window/sound.rs +++ b/voxygen/src/hud/settings_window/sound.rs @@ -76,8 +76,7 @@ impl<'a> Widget for Sound<'a> { } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} fn update(self, args: widget::UpdateArgs) -> Self::Event { common_base::prof_span!("Sound::update"); diff --git a/voxygen/src/hud/settings_window/video.rs b/voxygen/src/hud/settings_window/video.rs index 05b0b0d1a5..c638602f30 100644 --- a/voxygen/src/hud/settings_window/video.rs +++ b/voxygen/src/hud/settings_window/video.rs @@ -173,8 +173,7 @@ impl<'a> Widget for Video<'a> { } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} fn update(self, args: widget::UpdateArgs) -> Self::Event { common_base::prof_span!("Video::update"); diff --git a/voxygen/src/hud/skillbar.rs b/voxygen/src/hud/skillbar.rs index 2805f3e480..dc16f30237 100644 --- a/voxygen/src/hud/skillbar.rs +++ b/voxygen/src/hud/skillbar.rs @@ -222,8 +222,7 @@ impl<'a> Widget for Skillbar<'a> { } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} fn update(self, args: widget::UpdateArgs) -> Self::Event { common_base::prof_span!("Skillbar::update"); diff --git a/voxygen/src/hud/social.rs b/voxygen/src/hud/social.rs index fb8d9e0c9f..8c81cf06a7 100644 --- a/voxygen/src/hud/social.rs +++ b/voxygen/src/hud/social.rs @@ -105,8 +105,7 @@ impl<'a> Widget for Social<'a> { } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} fn update(self, args: widget::UpdateArgs) -> Self::Event { common_base::prof_span!("Social::update"); diff --git a/voxygen/src/ui/widgets/image_frame.rs b/voxygen/src/ui/widgets/image_frame.rs index 03ed80da99..0e3e79cba3 100644 --- a/voxygen/src/ui/widgets/image_frame.rs +++ b/voxygen/src/ui/widgets/image_frame.rs @@ -133,8 +133,7 @@ impl Widget for ImageFrame { } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} /// Update the state of the ImageFrame fn update(self, args: widget::UpdateArgs) -> Self::Event { diff --git a/voxygen/src/ui/widgets/image_slider.rs b/voxygen/src/ui/widgets/image_slider.rs index 3620e1b273..dbff4e518e 100644 --- a/voxygen/src/ui/widgets/image_slider.rs +++ b/voxygen/src/ui/widgets/image_slider.rs @@ -175,8 +175,7 @@ where } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} /// Update the state of the Slider. fn update(self, args: widget::UpdateArgs) -> Self::Event { diff --git a/voxygen/src/ui/widgets/ingame.rs b/voxygen/src/ui/widgets/ingame.rs index 957b049343..1f5737b679 100644 --- a/voxygen/src/ui/widgets/ingame.rs +++ b/voxygen/src/ui/widgets/ingame.rs @@ -87,8 +87,7 @@ impl Widget for Ingame { } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} fn update(self, args: widget::UpdateArgs) -> Self::Event { let widget::UpdateArgs { state, ui, .. } = args; diff --git a/voxygen/src/ui/widgets/outlined_text.rs b/voxygen/src/ui/widgets/outlined_text.rs index 8c778d5276..07f3ee30c5 100644 --- a/voxygen/src/ui/widgets/outlined_text.rs +++ b/voxygen/src/ui/widgets/outlined_text.rs @@ -66,8 +66,7 @@ impl<'a> Widget for OutlinedText<'a> { } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} fn update(self, args: widget::UpdateArgs) -> Self::Event { let widget::UpdateArgs { diff --git a/voxygen/src/ui/widgets/radio_list.rs b/voxygen/src/ui/widgets/radio_list.rs index 1c250c01b2..08cf5aa331 100644 --- a/voxygen/src/ui/widgets/radio_list.rs +++ b/voxygen/src/ui/widgets/radio_list.rs @@ -113,8 +113,7 @@ impl<'a, T> Widget for RadioList<'a, T> { } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} #[allow(clippy::needless_range_loop)] // TODO: Pending review in #587 fn update(self, args: widget::UpdateArgs) -> Self::Event { diff --git a/voxygen/src/ui/widgets/slot.rs b/voxygen/src/ui/widgets/slot.rs index 3dff42139d..b26006b9f8 100644 --- a/voxygen/src/ui/widgets/slot.rs +++ b/voxygen/src/ui/widgets/slot.rs @@ -568,8 +568,7 @@ where } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} /// Update the state of the Slot. fn update(self, args: widget::UpdateArgs) -> Self::Event { diff --git a/voxygen/src/ui/widgets/toggle_button.rs b/voxygen/src/ui/widgets/toggle_button.rs index 5aacb0e4f9..ccc62b6637 100644 --- a/voxygen/src/ui/widgets/toggle_button.rs +++ b/voxygen/src/ui/widgets/toggle_button.rs @@ -87,8 +87,7 @@ impl Widget for ToggleButton { } } - #[allow(clippy::unused_unit)] // TODO: Pending review in #587 - fn style(&self) -> Self::Style { () } + fn style(&self) -> Self::Style {} fn update(self, args: widget::UpdateArgs) -> Self::Event { let widget::UpdateArgs {