Skip to content

Conversation

compiler-errors
Copy link
Member

This may make #101281 slightly easier to understand

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Sep 1, 2022
@rust-highfive
Copy link
Contributor

r? @oli-obk

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 1, 2022
@compiler-errors
Copy link
Member Author

I am also happy to rename enclosing_scope now that it's really not "enclosing" -- it's more like parent_label now.

@@ -526,7 +526,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
});

let enclosing_scope_span =
tcx.hir().span_with_body(tcx.hir().local_def_id_to_hir_id(body));
tcx.hir().span(tcx.hir().local_def_id_to_hir_id(body));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
tcx.hir().span(tcx.hir().local_def_id_to_hir_id(body));
tcx.def_span(body);

@compiler-errors compiler-errors force-pushed the head-span-for-enclosing-scope branch from 44b498a to 21f050e Compare September 3, 2022 03:07
@oli-obk
Copy link
Contributor

oli-obk commented Sep 3, 2022

r=me with def span used and the proposed variable rename applied

@compiler-errors compiler-errors force-pushed the head-span-for-enclosing-scope branch from 21f050e to edba0c9 Compare September 4, 2022 02:10
@oli-obk
Copy link
Contributor

oli-obk commented Sep 4, 2022

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 4, 2022

📌 Commit edba0c9 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 Sep 4, 2022
@bors
Copy link
Collaborator

bors commented Sep 4, 2022

⌛ Testing commit edba0c9 with merge a2cdcb3...

@bors
Copy link
Collaborator

bors commented Sep 4, 2022

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 4, 2022
@bors bors merged commit a2cdcb3 into rust-lang:master Sep 4, 2022
@rustbot rustbot added this to the 1.65.0 milestone Sep 4, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (a2cdcb3): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean1 range count2
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.7% [-0.8%, -0.6%] 5
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results

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.

mean1 range count2
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
2.2% [2.2%, 2.2%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.0% [-2.0%, -2.0%] 1
All ❌✅ (primary) - - 0

Cycles

Results

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.

mean1 range count2
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.6% [-2.6%, -2.6%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -2.6% [-2.6%, -2.6%] 1

Footnotes

  1. the arithmetic mean of the percent change 2 3

  2. number of relevant changes 2 3

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