Open
Conversation
Contributor
Author
|
This should wait for #153493, to avoid causing conflicts. |
zetanumbers
reviewed
Mar 10, 2026
Contributor
|
This is a good refactor. |
75f763d to
0c04bfe
Compare
This comment has been minimized.
This comment has been minimized.
Contributor
Author
|
I added a tiny commit to remove |
Zoxc
reviewed
Mar 11, 2026
0c04bfe to
bd3ad2f
Compare
This comment has been minimized.
This comment has been minimized.
`CycleError` has one field containing a `(Span, QueryStackFrame<I>)` and another field containing a `QueryInfo`, which is a struct containing just a `Span` and a `QueryStackFrame<I>`. We already have the `Spanned` type for adding a span to something. This commit uses it for both fields in `CycleError`, removing the need for `QueryInfo`. Which is good for the following reasons. - Any type with `Info` in the name is suspect, IMO. - `QueryInfo` can no longer be confused with the similar `QueryJobInfo`. - The doc comment on `QueryInfo` was wrong; it didn't contain a query key.
It's unused.
bd3ad2f to
66771e4
Compare
Collaborator
|
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
Contributor
Author
|
I rebased. |
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
5 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.
CycleErrorhas one field containing a(Span, QueryStackFrame<I>)and another field containing aQueryInfo, which is a struct containing just aSpanand aQueryStackFrame<I>.We already have the
Spannedtype for adding a span to something. This commit uses it for both fields inCycleError, removing the need forQueryInfo. Which is good for the following reasons.Infoin the name is suspect, IMO.QueryInfocan no longer be confused with the similarQueryJobInfo.QueryInfowas wrong; it didn't contain a query key.r? @Mark-Simulacrum