Fix master CI: restore child_view_ids on StoredView#12847
Draft
warp-dev-github-integration[bot] wants to merge 1 commit into
Draft
Fix master CI: restore child_view_ids on StoredView#12847warp-dev-github-integration[bot] wants to merge 1 commit into
warp-dev-github-integration[bot] wants to merge 1 commit into
Conversation
PR #12633 introduced the `StoredView` enum wrapping `AnyView`/`AnyTuiView`, but the concurrently-merged `collect_transferable_subtree` walk still calls `child_view_ids` on a window's stored view. `StoredView` didn't delegate that neutral hook, breaking compilation of `warpui_core` (E0599) and cascading to every CI job. - Add `StoredView::child_view_ids`, delegating to the GUI view and returning empty for TUI views (consistent with the other TUI no-op hooks). - Fix missing `TuiBuffer`/`TuiConstraint`/`TuiRect`/`TuiSize` imports in `tui_view_tests.rs` so the `tui` feature lib+tests compile again. CHANGELOG-NONE Co-Authored-By: Oz <oz-agent@warp.dev>
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
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.
Description
masterCI went red after #12633 merged. The merge produced a semanticconflict: #12633 introduced the
StoredViewenum (wrappingAnyView/AnyTuiView) as the type stored in each window'sviewsmap, but aconcurrently-merged change —
AppContext::collect_transferable_subtree—still calls
child_view_idson a window's stored view.StoredViewdid notdelegate that neutral hook, so
warpui_corefailed to compile:This broke every CI job in the suite (clippy on all platforms, all test
jobs, and the release-flag compilation jobs).
Changes
StoredView::child_view_ids, delegating to the GUI view'simplementation and returning an empty vec for TUI views (matching the
existing TUI no-op delegations like
accessibility_data).TuiBuffer/TuiConstraint/TuiRect/TuiSizeimports intui_view_tests.rs, which broke thetui-feature lib+test build. (No CIjob builds with
--features tui, but this restores that configuration.)Testing
cargo check -p warpui_core— clean (default and--features tui).cargo clippy -p warpui_core --all-targets -- -D warnings— clean (defaultand
--features tui).cargo fmt -p warpui_core -- --check— clean.cargo nextest run -p warpui_core transfer_view— 14/14 pass (exercises thechild_view_idspath throughStoredView).Agent Mode
CHANGELOG-NONE
Conversation: https://staging.warp.dev/conversation/d1c84ef4-952f-481e-9b2a-2ef61bbf9bb4
Run: https://oz.staging.warp.dev/runs/019ee255-ee44-75a1-9484-56c988702c4a
This PR was generated with Oz.