fix: resolve merge conflicts in hero_db_ui #21

Merged

mahmoud merged 3 commits from development_fix_resolve_merge_conflicts into development

2026-04-16 18:42:32 +00:00

zaelgohary commented

2026-04-16 18:07:51 +00:00

Member

Fixes #20

Summary

Resolve merge conflict markers in main.rs and web.rs
Keep incoming version with socket_dir() naming convention

Test plan

cargo build --release passes

Fixes #20 ## Summary - Resolve merge conflict markers in main.rs and web.rs - Keep incoming version with socket_dir() naming convention ## Test plan - [x] cargo build --release passes

zaelgohary added 1 commit

2026-04-16 18:07:51 +00:00

fix: resolve merge conflicts in hero_db_ui

CI / cargo check + clippy (pull_request) Failing after 53s

Details

CI / cargo test (pull_request) Successful in 1m18s

Details

Build and Test / build (pull_request) Successful in 3m50s

Details

a7f63ff2c2

Resolve merge conflicts in main.rs and web.rs that were
committed to development branch. Keeps the incoming version
which uses the new socket_dir() naming convention.

zaelgohary added 1 commit

2026-04-16 18:29:31 +00:00

fix: resolve clippy warnings in hero_db_app

CI / cargo check + clippy (pull_request) Failing after 3s

Details

CI / cargo test (pull_request) Successful in 1m53s

Details

Build and Test / build (pull_request) Successful in 3m43s

Details

055dc09325

- Collapse nested if-let statements
- Remove redundant local binding
- Remove unused enumerate index
- Replace redundant closure with function reference
- Allow type_complexity for benchmark test types

zaelgohary added 1 commit

2026-04-16 18:33:47 +00:00

style: apply cargo fmt formatting

Build and Test / build (pull_request) Successful in 3m9s

Details

CI / cargo check + clippy (pull_request) Successful in 1m5s

Details

CI / cargo test (pull_request) Successful in 1m11s

Details

c294740b9e