refactor: reduce some clones inside App::run - #15766
Merged
Merged
Conversation
Contributor
Package Changes Through 32670a0There are 14 changes which include tauri with minor, tauri-cli with minor, @tauri-apps/cli with minor, tauri-runtime with minor, tauri-runtime-wry with minor, tauri-utils with minor, tauri-bundler with minor, tauri-build with minor, tauri-macos-sign with minor, tauri-codegen with minor, tauri-macros with minor, tauri-plugin with minor, tauri-driver with minor, @tauri-apps/api with minor Planned Package VersionsThe following package releases are the planned based on the context of changes in this pull request.
Add another change file through the GitHub UI by following this link. Read about change files or the docs at github.com/jbolda/covector |
FabianLars
approved these changes
Jul 23, 2026
OlympusLedgerOrg
added a commit
to OlympusLedgerOrg/tauri
that referenced
this pull request
Aug 3, 2026
Completes the 2026-08-03 upstream sync. tauri-apps#15307 bumped crates/tauri-runtime-wry to tao 0.36.0 / wry 0.56.0, which left [patch.crates-io] pointing at ports/ trees still at 0.35.3 / 0.55.1. Cargo did not error on that -- it silently dropped both patches and resolved stock GTK3 tao/wry from crates.io, bypassing the GTK4/WebKit6 port entirely. Both ports are now at the required versions and both patches are back in the crate graph. Method: each port was reconstructed as a git branch off the upstream commit it was actually built from (tao 722aad90, wry 09f088e9 -- both on dev, ahead of their tags, which is why the ports were already much closer to 0.36/0.56 than to 0.35.3/0.55.1), then upstream's release tag was merged in. This kept the port's own changes as the "ours" side of a real 3-way merge rather than replaying patches. All of platform_impl/linux -- the GTK4 surface -- merged without conflict. Per-conflict reasoning is in the two port merge commits. Also fixes crates/tauri/src/app.rs from the previous commit: resolving that conflict with --ours took the whole file and so discarded upstream's tauri-apps#15766 clone reduction in App::run. The file is now upstream's, with only the fork's supports_multiple_windows early return re-applied. Lockfiles regenerated: - Cargo.lock: cargo metadata now resolves tao 0.36.0, wry 0.56.0, muda, tray-icon and wayland-scanner to the local paths, with no "patch ... was not used" warnings. - pnpm-lock.yaml: regenerated so the merged pnpm-workspace.yaml overrides are reflected, including the fork's brace-expansion, js-yaml and sharp audit remediations, which upstream's lockfile did not carry. NOT COMPILE VERIFIED. This was done on Windows; the GTK4/WebKit6 code is Linux-only and cannot be built or cross-compiled here. Dependency resolution is verified, the source is not. Needs a Linux build plus the fork's CI before merging. Still deferred: upstream tauri-apps#15701 (resize cursor within the inset for undecorated webkitgtk windows) remains unported to GTK4 -- see the previous commit.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
No description provided.