Skip to content

Re-land Windows Trust, logo and popup links - #90

Merged
ian-at-strix merged 4 commits into
mainfrom
windows/reland
Oct 23, 2026
Merged

ian-at-strix merged 4 commits into
mainfrom
windows/reland

Conversation

@ian-at-strix

Copy link
Copy Markdown
Collaborator

What

Re-lands #80, #81, #89 and #75, one commit each, in that order.

Why

#80, #81, #89 and #75 merged into stacked branches after their bases had landed, so main never got them.

How

Cherry-picked each PR's own commit from windows/logo onto main, kept main's code where #68's reformat conflicted, then cargo fmt. #75 is the version stacked on #81's task dialog (what merged), not the standalone rebuild. Dependency changes redone with cargo add; Cargo.lock matches the original.

Tested

  • macOS: cargo build, cargo clippy --all-targets, cargo test, cargo fmt --check, with and without machine-wide
  • cargo clippy --target x86_64-pc-windows-msvc on tray.rs and pipe.rs in a scratch crate with main's windows features
  • dist plan

Untested

  • A Windows build (build.rs embedding the manifest and icon) and the tray, popups and UAC prompt on Windows

@ian-at-strix
ian-at-strix merged commit a162c53 into main Oct 23, 2026
7 checks passed
@ian-at-strix ian-at-strix mentioned this pull request Oct 23, 2026
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