rustc_span: return an impl Iterator instead of a Vec from macro_backtrace. by eddyb · Pull Request #68407 · rust-lang/rust

eddyb · 2020-01-20T23:57:55Z

Having Span::macro_backtrace produce an impl Iterator<Item = ExpnData> allows #67359 to use it instead of rolling its own similar functionality.

The move from MacroBacktrace to ExpnData (which the first two commits are prerequisites for) both eliminates unnecessary allocations, and is strictly more flexible (exposes more information).

r? @petrochenkov

eddyb · 2020-01-21T23:38:14Z

@petrochenkov Addressed your comments, does it look good now?

petrochenkov · 2020-01-22T17:03:38Z

r=me with the clone removed

eddyb · 2020-01-24T01:56:18Z

@bors r=petrochenkov

bors · 2020-01-24T01:56:19Z

📌 Commit 43b46aceeb2a41fe95c4d6620e37e23c5d3dfebf has been approved by petrochenkov

bors · 2020-01-24T11:57:31Z

⌛ Testing commit 43b46aceeb2a41fe95c4d6620e37e23c5d3dfebf with merge d47dac1a0628908b7b9de1f8e70f770a1c92b7b9...

test: allow some flexibility in check::error_from_deep_recursion's expected diagnostic. This should unblock rust-lang/rust#68407, by loosening the expected output pattern. As per rust-lang/rust#68407 (comment), this is the change in the diagnostic: ```diff -recursion limit reached while expanding the macro `m` +recursion limit reached while expanding `m!` ``` Ideally I would use something like this regex: ``` recursion limit reached while expanding (the macro `m`|`m!`) ``` but AFAIK these tests don't support regexes.

eddyb · 2020-01-24T19:03:28Z

@bors r=petrochenkov

bors · 2020-01-24T19:03:29Z

📌 Commit 9dec58fc0294d6f7ef896d78fc3dd8efb61f8831 has been approved by petrochenkov

bors · 2020-01-24T20:35:36Z

⌛ Testing commit 9dec58fc0294d6f7ef896d78fc3dd8efb61f8831 with merge db5e6d5d771b77dfeb0028e3871c9d7a5de75117...

petrochenkov · 2020-01-25T08:28:10Z

Some tests in clippy failed and it's a no tool breakage week.

Marking as waiting on author because some regressions in rustfix tests there look legitimate.

Don't use ExpnKind::descr to get the name of a bang macro. This is the same change as the first commit in rust-lang/rust#68407, but applied to clippy. The new code should work both before and after the changes in rust-lang/rust#68407.

Don't use ExpnKind::descr to get the name of a bang macro. This is the same change as the first commit in rust-lang/rust#68407, but applied to clippy. The new code should work both before and after the changes in rust-lang/rust#68407. changelog: none

…race.

eddyb · 2020-01-26T15:19:49Z

@bors r=petrochenkov

bors · 2020-01-26T15:19:50Z

📌 Commit 6980f82 has been approved by petrochenkov

matthiaskrgr · 2020-01-26T15:47:34Z

according to the diff, this PR also changes submodules, is this intended?

eddyb · 2020-01-26T17:23:29Z

@matthiaskrgr Yupp, see #68407 (comment) and #68407 (comment).

bors · 2020-01-26T21:01:19Z

⌛ Testing commit 6980f82 with merge a237641...

@petrochenkov

rustc_span: return an impl Iterator instead of a Vec from macro_backtrace. Having `Span::macro_backtrace` produce an `impl Iterator<Item = ExpnData>` allows #67359 to use it instead of rolling its own similar functionality. The move from `MacroBacktrace` to `ExpnData` (which the first two commits are prerequisites for) both eliminates unnecessary allocations, and is strictly more flexible (exposes more information). r? @petrochenkov

bors · 2020-01-27T00:05:48Z

☀️ Test successful - checks-azure
Approved by: petrochenkov
Pushing a237641 to master...

rust-highfive · 2020-01-27T00:07:14Z

📣 Toolstate changed by #68407!

Tested on commit a237641.
Direct link to PR: #68407

🎉 rustc-guide on linux: test-fail → test-pass (cc @JohnTitor @amanjeev @spastorino @mark-i-m, @rust-lang/infra).

@JohnTitor

Tested on commit rust-lang/rust@a237641. Direct link to PR: <rust-lang/rust#68407> 🎉 rustc-guide on linux: test-fail → test-pass (cc @JohnTitor @amanjeev @spastorino @mark-i-m, @rust-lang/infra).

rust-highfive assigned petrochenkov Jan 20, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 20, 2020

petrochenkov reviewed Jan 21, 2020
View reviewed changes

Comment threadsrc/librustc_span/hygiene.rs Outdated
Comment threadsrc/librustc_span/lib.rs Outdated
Comment threadsrc/librustc_span/hygiene.rs Outdated

petrochenkov 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 Jan 21, 2020

eddyb force-pushed the iter-macro-backtrace branch from cd5eaf9 to 50fc4cdCompare January 21, 2020 23:24

petrochenkov mentioned this pull request Jan 22, 2020
Rename -Zexternal-macro-backtrace to -Zmacro-backtrace and clean up implementation. #67359
Merged

eddyb force-pushed the iter-macro-backtrace branch from 50fc4cd to 43b46acCompare January 24, 2020 01:31

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 Jan 24, 2020

This comment has been minimized.
Sign in to view

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 Jan 24, 2020

This comment has been minimized.
Sign in to view

eddyb mentioned this pull request Jan 24, 2020
test: allow some flexibility in check::error_from_deep_recursion's expected diagnostic. rust-lang/cargo#7826
Merged

eddyb force-pushed the iter-macro-backtrace branch from 43b46ac to 9dec58fCompare January 24, 2020 19:02

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 Jan 24, 2020

This comment has been minimized.
Sign in to view

bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 24, 2020

petrochenkov 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 Jan 25, 2020

This comment has been minimized.
Sign in to view

eddyb mentioned this pull request Jan 26, 2020
Don't use ExpnKind::descr to get the name of a bang macro. rust-lang/rust-clippy#5096
Merged

eddyb added 4 commits January 26, 2020 17:18

Don't use ExpnKind::descr to get the name of a bang macro.
787c458

rustc_span: move pretty syntax from macro_backtrace to ExpnKind::descr.
a7b0aa0

rustc_span: replace MacroBacktrace with ExpnData.
75284f8

rustc_span: return an impl Iterator instead of a Vec from macro_backt…
6980f82
…race.

eddyb force-pushed the iter-macro-backtrace branch from 9dec58f to 6980f82Compare January 26, 2020 15:19

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 Jan 26, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 27, 2020

bors merged commit 6980f82 into rust-lang:masterJan 27, 2020

bors mentioned this pull request Jan 27, 2020
don't clone types that are copy, round two. #68459
Merged

eddyb deleted the iter-macro-backtrace branch January 27, 2020 13:35

ehuss mentioned this pull request Jan 27, 2020
Update cargo #68579
Merged

mati865 mentioned this pull request Jan 28, 2020
Cargo is entering an infinite loop rust-lang/cargo#7840
Closed

Uh oh!

Uh oh!

Conversation

eddyb commented Jan 20, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

eddyb commented Jan 21, 2020

Uh oh!

petrochenkov commented Jan 22, 2020

Uh oh!

eddyb commented Jan 24, 2020

Uh oh!

bors commented Jan 24, 2020

Uh oh!

bors commented Jan 24, 2020

Uh oh!

This comment has been minimized.

This comment has been minimized.

eddyb commented Jan 24, 2020

Uh oh!

bors commented Jan 24, 2020

Uh oh!

bors commented Jan 24, 2020

Uh oh!

This comment has been minimized.

petrochenkov commented Jan 25, 2020

Uh oh!

This comment has been minimized.

eddyb commented Jan 26, 2020

Uh oh!

bors commented Jan 26, 2020

Uh oh!

matthiaskrgr commented Jan 26, 2020

Uh oh!

eddyb commented Jan 26, 2020

Uh oh!

bors commented Jan 26, 2020

Uh oh!

bors commented Jan 27, 2020

Uh oh!

rust-highfive commented Jan 27, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants