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

Simplify Span::source_callee impl #112705

Merged
merged 1 commit into from
Jun 19, 2023

Conversation

WaffleLapkin
Copy link
Member

Imo the iterator impl is easier to grasp.

@rustbot
Copy link
Collaborator

rustbot commented Jun 16, 2023

r? @cjgillot

(rustbot has picked a reviewer for you, use r? to override)

@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 Jun 16, 2023
@cjgillot
Copy link
Contributor

Good catch. A while loop would be even better.

@cjgillot cjgillot 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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 18, 2023
@WaffleLapkin
Copy link
Member Author

@cjgillot I don't see how this can be cleanly written with a while loop. Note that we need two recent versions (because we need the value before the root), which ends up being worse, imo:

    pub fn source_callee(self) -> Option<ExpnData> {
        let mut expn_data = None;
        let mut next_expn_data = self.ctxt().outer_expn_data();

        while !next_expn_data.is_root() {
            expn_data = Some(next_expn_data);
            next_expn_data = next_expn_data.call_site.ctxt().outer_expn_data();
        }

        expn_data
    }

@WaffleLapkin WaffleLapkin added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 19, 2023
@cjgillot
Copy link
Contributor

Fair enough.
@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 19, 2023

📌 Commit fe4aec1 has been approved by cjgillot

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 Jun 19, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 19, 2023
…e_impl, r=cjgillot

Simplify `Span::source_callee` impl

Imo the iterator impl is easier to grasp.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 19, 2023
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#109970 ([doc] `poll_fn`: explain how to `pin` captured state safely)
 - rust-lang#112705 (Simplify `Span::source_callee` impl)
 - rust-lang#112757 (Use BorrowFlag instead of explicit isize)
 - rust-lang#112768 (Rewrite various resolve/diagnostics errors as translatable diagnostics)
 - rust-lang#112777 (Continue folding in query normalizer on weak aliases)
 - rust-lang#112780 (Treat TAIT equation as always ambiguous in coherence)
 - rust-lang#112783 (Don't ICE on bound var in `reject_fn_ptr_impls`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit af348a8 into rust-lang:master Jun 19, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

4 participants