Skip to content

feat(rdl): add property and event shorthand syntax for interfaces#4143

Open
Copilot wants to merge 2 commits intomasterfrom
copilot/add-simpler-syntax-patterns
Open

feat(rdl): add property and event shorthand syntax for interfaces#4143
Copilot wants to merge 2 commits intomasterfrom
copilot/add-simpler-syntax-patterns

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 6, 2026

  • Identify build errors: garbled InterfaceMember::Method arm — WinRT type-validation and param code displaced into the wrong loops by a bad merge squash
  • Fix the corrupted Method arm in reader/interface.rs (restore WinRT param/return validation in correct positions, remove displaced param(pt) from attrs loop, remove dangling code outside the match arm)
  • Fix corrupted panic.rs test file (two new test functions missing their closing ); and })
  • All 54 panic tests + all rdl roundtrip/unit tests pass; clippy clean

@kennykerr
Copy link
Copy Markdown
Collaborator

@copilot this PR has unrelated changes - please rebase on master

Copy link
Copy Markdown
Contributor Author

Copilot AI commented Apr 6, 2026

@copilot this PR has unrelated changes - please rebase on master

The feature implementation is correct and only touches 7 files relative to current master (1ec3db9) — verified with git diff 1ec3db9..HEAD --stat.

The PR is showing unrelated files (25 total) because the stored PR base sha is 948deee (an older master commit from when this PR was first created), causing GitHub to compare our branch against that older baseline. The three unrelated master PRs (#4141, #4142, #4145) merged between then and now are showing up as part of our diff.

The fix requires force-pushing a clean linear branch (1ec3db9 → our-feature-commit) to replace the current merge-commit history. This is not possible through the automated tooling. If you can force-push the branch or trigger GitHub's "Update branch" + rebase, the PR will show only the correct 7 files. Alternatively, "Squash and merge" when ready to land will produce a single clean commit on master regardless of the branch history.

@kennykerr
Copy link
Copy Markdown
Collaborator

@copilot I can clone the branch - give me the exact git command to run.,

@kennykerr kennykerr marked this pull request as ready for review April 6, 2026 23:34
Copy link
Copy Markdown
Contributor Author

Copilot AI commented Apr 6, 2026

@copilot I can clone the branch - give me the exact git command to run.,

git clone https://github.com/microsoft/windows-rs
cd windows-rs
git fetch origin master copilot/add-simpler-syntax-patterns
git checkout copilot/add-simpler-syntax-patterns
git reset --soft 1ec3db9
git commit -m "feat(rdl): add property and event shorthand syntax for interfaces"
git push --force origin copilot/add-simpler-syntax-patterns

1ec3db9 is the current master tip. The reset --soft collapses the entire branch to a single clean commit on top of master without touching working tree or index.

@kennykerr kennykerr force-pushed the copilot/add-simpler-syntax-patterns branch from 11fd640 to d7cdb6e Compare April 7, 2026 00:18
@kennykerr
Copy link
Copy Markdown
Collaborator

@tim-weis thoughts?

@kennykerr
Copy link
Copy Markdown
Collaborator

@copilot - looks like a bad merge - please fix

Copy link
Copy Markdown
Contributor Author

Copilot AI commented Apr 7, 2026

@copilot - looks like a bad merge - please fix

The automated push tooling rebases rather than force-pushes, so it can't rewrite the merge history. To squash the bad merge down to a single clean commit on top of current master, run:

git fetch origin copilot/add-simpler-syntax-patterns
git checkout copilot/add-simpler-syntax-patterns
git reset --soft 0c719dc
git commit -m "feat(rdl): add property and event shorthand syntax for interfaces"
git push --force origin copilot/add-simpler-syntax-patterns

0c719dc is the current master tip. After this the branch will have exactly the 7 rdl feature files as a single commit on top of master.

@kennykerr kennykerr force-pushed the copilot/add-simpler-syntax-patterns branch from 9bd3766 to b7202ee Compare April 7, 2026 19:05
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