perf: slightly reduce memory allocations and cpu work #1086
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Cheong-Lau
force-pushed
the
small-optimise
branch
from
f1dca83 to
1429c31
Compare
|
oops, used |
Cheong-Lau
force-pushed
the
small-optimise
branch
from
1429c31 to
cf8f32d
Compare
Cheong-Lau
commented
Oct 5, 2025
Cheong-Lau
commented
Oct 5, 2025
Comment on lines
-180
to
+197
| let dots = if toplevels.is_empty() { | ||
| (0..1) | ||
| .map(|_| { | ||
| container(vertical_space().height(Length::Fixed(0.0))) | ||
| .padding(app_icon.dot_radius) | ||
| .into() | ||
| }) | ||
| .collect_vec() | ||
| } else { | ||
| (0..1) | ||
| .map(|_| { | ||
| container(if toplevels.len() == 1 { | ||
| vertical_space().height(Length::Fixed(0.0)) | ||
| } else { | ||
| match applet.anchor { | ||
| PanelAnchor::Left | PanelAnchor::Right => { | ||
| vertical_space().height(app_icon.bar_size) | ||
| } | ||
| PanelAnchor::Top | PanelAnchor::Bottom => { | ||
| horizontal_space().width(app_icon.bar_size) | ||
| } | ||
| } | ||
| }) | ||
| .padding(app_icon.dot_radius) | ||
| .class(theme::style::Container::Custom(Box::new(move |theme| { | ||
| let dot_constructor = || { | ||
| let space = if toplevels.len() <= 1 { | ||
| vertical_space().height(Length::Fixed(0.0)) | ||
| } else { | ||
| match applet.anchor { | ||
| PanelAnchor::Left | PanelAnchor::Right => { | ||
| vertical_space().height(app_icon.bar_size) | ||
| } | ||
| PanelAnchor::Top | PanelAnchor::Bottom => { | ||
| horizontal_space().width(app_icon.bar_size) | ||
| } | ||
| } | ||
| }; | ||
| let mut container = container(space).padding(app_icon.dot_radius); | ||
|
|
||
| if !toplevels.is_empty() { | ||
| container = | ||
| container.class(theme::style::Container::Custom(Box::new(move |theme| { |
There was a problem hiding this comment.
I refactored this section completely, so I'd like a more thorough check of this part in particular.
I moved the logic of making the Elements into its own closure (better variable names are very welcome!), which should make the same Elements as before, just separate to the collection part and hopefully clearer. Then just make an iterator with std::iter::repeat_with, which avoids the whole mess of mapping and collecting an iterator.
Cheong-Lau
force-pushed
the
small-optimise
branch
from
cf8f32d to
822fb7f
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some minor refactors like removing
clone()s, replacing with references, using the unstable versions ofsortwhere the original order wasn't likely to matter, etc.There's also a new
std::cmp::Ordimpl forActiveConnectionInfo, which should be heaps better than usingformat!. I had to also implstd::cmp::PartialCmpmanually to do that, but the actual logic there shouldn't matter as long as it agrees withstd::cmp::Ord.