Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't store a redundant span in user-type projections #137123

Merged
merged 4 commits into from
Feb 20, 2025

Conversation

Zalathar
Copy link
Contributor

While experimenting with some larger changes, I noticed that storing this span here is unnecessary, because it is also present in the corresponding CanonicalUserTypeAnnotation and can be retrieved via the annotation's ID.

@rustbot
Copy link
Collaborator

rustbot commented Feb 16, 2025

r? @BoxyUwU

rustbot has assigned @BoxyUwU.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 16, 2025
@oli-obk
Copy link
Contributor

oli-obk commented Feb 16, 2025

@bors try @rust-timer queue

r? @oli-obk

@rust-timer

This comment has been minimized.

@rustbot rustbot assigned oli-obk and unassigned BoxyUwU Feb 16, 2025
@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 16, 2025
@bors
Copy link
Collaborator

bors commented Feb 16, 2025

⌛ Trying commit 9f3fdb1 with merge aa2aeba...

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 16, 2025
Don't store a redundant span in user-type projections

While experimenting with some larger changes, I noticed that storing this span here is unnecessary, because it is also present in the corresponding `CanonicalUserTypeAnnotation` and can be retrieved via the annotation's ID.
@bors
Copy link
Collaborator

bors commented Feb 16, 2025

☀️ Try build successful - checks-actions
Build commit: aa2aeba (aa2aebab0f94a5f20d5ed31ac943f85b6335ec88)

@rust-timer

This comment has been minimized.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (aa2aeba): comparison URL.

Overall result: ✅ improvements - no action needed

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.2% [-0.3%, -0.2%] 4
Improvements ✅
(secondary)
-0.2% [-0.3%, -0.1%] 6
All ❌✅ (primary) -0.2% [-0.3%, -0.2%] 4

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

Results (secondary 4.9%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
4.9% [4.9%, 4.9%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 790.759s -> 787.867s (-0.37%)
Artifact size: 350.03 MiB -> 350.00 MiB (-0.01%)

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 16, 2025
@oli-obk
Copy link
Contributor

oli-obk commented Feb 16, 2025

r? @oli-obk

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 16, 2025

📌 Commit 9f3fdb1 has been approved by oli-obk

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 16, 2025
@bors
Copy link
Collaborator

bors commented Feb 19, 2025

⌛ Testing commit 9f3fdb1 with merge ec7f149...

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 19, 2025
Don't store a redundant span in user-type projections

While experimenting with some larger changes, I noticed that storing this span here is unnecessary, because it is also present in the corresponding `CanonicalUserTypeAnnotation` and can be retrieved via the annotation's ID.
@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Collaborator

bors commented Feb 19, 2025

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 19, 2025
@oli-obk
Copy link
Contributor

oli-obk commented Feb 19, 2025

@bors retry temp for failure on windows

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 19, 2025
@bors
Copy link
Collaborator

bors commented Feb 20, 2025

☔ The latest upstream changes (presumably #137295) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 20, 2025
@Zalathar
Copy link
Contributor Author

Rebased over #137266; no changes.

@bors r=oli-obk

@bors
Copy link
Collaborator

bors commented Feb 20, 2025

📌 Commit ffaf825 has been approved by oli-obk

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 20, 2025
@Zalathar
Copy link
Contributor Author

Actually, I'm going to back out the visitor changes, as I'm no longer confident in them, and they aren't strictly necessary for the other changes.

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 20, 2025
@Zalathar
Copy link
Contributor Author

PR CI is green; I'm going to unilaterally re-approve this because it's a subset of the changes that were originally approved.

@bors r=oli-obk

@bors
Copy link
Collaborator

bors commented Feb 20, 2025

📌 Commit 8bb574f has been approved by oli-obk

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 20, 2025
@bors
Copy link
Collaborator

bors commented Feb 20, 2025

⌛ Testing commit 8bb574f with merge 28b83ee...

@bors
Copy link
Collaborator

bors commented Feb 20, 2025

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 28b83ee to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 20, 2025
@bors bors merged commit 28b83ee into rust-lang:master Feb 20, 2025
7 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Feb 20, 2025
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (28b83ee): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.1% [-0.1%, -0.1%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 2.0%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
2.0% [1.6%, 2.3%] 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 2.0% [1.6%, 2.3%] 2

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 773.474s -> 774.026s (0.07%)
Artifact size: 360.26 MiB -> 360.27 MiB (0.00%)

@Zalathar Zalathar deleted the user-type-span branch February 20, 2025 22:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants