[PR #43] [MERGED] General refactoring and tidy-up #4682

New issue

Closed

opened 2026-05-23 00:55:09 +01:00 by JakeStanger · 0 comments

JakeStanger commented

2026-05-23 00:55:09 +01:00

Owner

📋 Pull Request Information

Original PR: https://github.com/JakeStanger/ironbar/pull/43
Author: @JakeStanger
Created: 12/4/2022
Status: ✅ Merged
Merged: 12/12/2022
Merged by: @JakeStanger

Base: master ← Head: refactor/general

📝 Commits (6)

2c1b292 refactor: move most of the horrible add_module macro content into proper functions
fd2d7e5 refactor: move startup logging code to logging module
9d5049d refactor: standardise error messages
5e21cbc refactor: macros to reduce repeated code
ea2c84d refactor: general code tidy-up
a45ebfc build: update dependencies

📊 Changes

25 files changed (+680 additions, -742 deletions)

View changed files

📝 Cargo.lock (+78 -179)
📝 Cargo.toml (+1 -2)
📝 src/bar.rs (+252 -236)
📝 src/bridge_channel.rs (+2 -1)
📝 src/clients/wayland/client.rs (+14 -25)
📝 src/clients/wayland/toplevel.rs (+7 -6)
📝 src/config.rs (+4 -0)
📝 src/dynamic_string.rs (+9 -21)
➕ src/error.rs (+13 -0)
📝 src/logging.rs (+26 -2)
➕ src/macros.rs (+89 -0)
📝 src/main.rs (+19 -37)
📝 src/modules/clock.rs (+11 -11)
📝 src/modules/custom.rs (+16 -17)
📝 src/modules/focused.rs (+16 -15)
📝 src/modules/launcher/item.rs (+15 -20)
📝 src/modules/launcher/mod.rs (+23 -38)
📝 src/modules/mod.rs (+2 -4)
📝 src/modules/mpd.rs (+15 -21)
📝 src/modules/script.rs (+5 -1)

...and 5 more files

📄 Description

Closes #42

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/JakeStanger/ironbar/pull/43 **Author:** [@JakeStanger](https://github.com/JakeStanger) **Created:** 12/4/2022 **Status:** ✅ Merged **Merged:** 12/12/2022 **Merged by:** [@JakeStanger](https://github.com/JakeStanger) **Base:** `master` ← **Head:** `refactor/general` --- ### 📝 Commits (6) - [`2c1b292`](https://github.com/JakeStanger/ironbar/commit/2c1b2924d4a103183d3974ac066623a80277a79a) refactor: move most of the horrible `add_module` macro content into proper functions - [`fd2d7e5`](https://github.com/JakeStanger/ironbar/commit/fd2d7e5c7ab8de50c4621b19d07d8b012a451564) refactor: move startup logging code to logging module - [`9d5049d`](https://github.com/JakeStanger/ironbar/commit/9d5049dde01cdb76f4772f8ce8f61a8b5bad3a50) refactor: standardise error messages - [`5e21cbc`](https://github.com/JakeStanger/ironbar/commit/5e21cbcca6cc30d725acdea0f6561cfd6acdcc3c) refactor: macros to reduce repeated code - [`ea2c84d`](https://github.com/JakeStanger/ironbar/commit/ea2c84d1bd15798e32496397c4a6aa42fab39d95) refactor: general code tidy-up - [`a45ebfc`](https://github.com/JakeStanger/ironbar/commit/a45ebfc1f50430979021518e1697d6d142baf797) build: update dependencies ### 📊 Changes **25 files changed** (+680 additions, -742 deletions) <details> <summary>View changed files</summary> 📝 `Cargo.lock` (+78 -179) 📝 `Cargo.toml` (+1 -2) 📝 `src/bar.rs` (+252 -236) 📝 `src/bridge_channel.rs` (+2 -1) 📝 `src/clients/wayland/client.rs` (+14 -25) 📝 `src/clients/wayland/toplevel.rs` (+7 -6) 📝 `src/config.rs` (+4 -0) 📝 `src/dynamic_string.rs` (+9 -21) ➕ `src/error.rs` (+13 -0) 📝 `src/logging.rs` (+26 -2) ➕ `src/macros.rs` (+89 -0) 📝 `src/main.rs` (+19 -37) 📝 `src/modules/clock.rs` (+11 -11) 📝 `src/modules/custom.rs` (+16 -17) 📝 `src/modules/focused.rs` (+16 -15) 📝 `src/modules/launcher/item.rs` (+15 -20) 📝 `src/modules/launcher/mod.rs` (+23 -38) 📝 `src/modules/mod.rs` (+2 -4) 📝 `src/modules/mpd.rs` (+15 -21) 📝 `src/modules/script.rs` (+5 -1) _...and 5 more files_ </details> ### 📄 Description Closes #42 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

JakeStanger

2026-05-23 00:55:09 +01:00