Skip to content

Update deps + clippy fixes + rustfmt - #23

Closed
0323pin wants to merge 2 commits into
jzbor:masterfrom
0323pin:master
Closed

Update deps + clippy fixes + rustfmt#23
0323pin wants to merge 2 commits into
jzbor:masterfrom
0323pin:master

Conversation

@0323pin

@0323pin 0323pin commented Dec 5, 2025

Copy link
Copy Markdown
Contributor

@jzbor Could you have a look? I've fixed most of it but, clippy still warns about:

warning: this `if` has identical blocks
  --> marswm/src/monitor.rs:88:48
   |
88 |           if workspace_idx == self.cur_workspace {
   |  ________________________________________________^
89 | |         } else if workspace_idx >= self.workspace_count() {
   | |_________^
   |
note: same as this
  --> marswm/src/monitor.rs:89:59
   |
89 |           } else if workspace_idx >= self.workspace_count() {
   |  ___________________________________________________________^
90 | |         } else {
   | |_________^
   = help: for further information visit https://rust-lang.github.io/rust-clippy/rust-1.91.0/index.html#if_same_then_else
   = note: `#[warn(clippy::if_same_then_else)]` on by default

Appreciated.
Thanks!

@0323pin

0323pin commented Dec 22, 2025

Copy link
Copy Markdown
Contributor Author

@jzbor Would you mind reviewing and try again?

Disclaimer: I've asked LLM for help, hence my request for a review on the code changes in marswm/src/monitor.rs.

@jzbor

jzbor commented Dec 24, 2025

Copy link
Copy Markdown
Owner

Hi,
Sorry for taking so long to review. I have cherry picked your code for monitor.rs (odd that I did not write it this way in the first place). As for cargo update and cargo clippy I just ran them myself, as it's easier than reviewing, I hope thats ok. I will push all commits and release a new minor version shortly.

@jzbor jzbor closed this Dec 24, 2025
@0323pin

0323pin commented Dec 24, 2025

Copy link
Copy Markdown
Contributor Author

As for cargo update and cargo clippy I just ran them myself, as it's easier than reviewing, I hope thats ok.

Sure, no problem. I've been using marswm for the last 18 32 months. Keeping it up-to-date is the least I can do.

I'm really happy with this window manager, it hits the right balance between features and simplicity and it does exactly what I need. I wish I could contribute more.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants