rustc_span: return an impl Iterator instead of a Vec from macro_backtrace. #68407
Conversation
This file contains 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
rust-highfive
added
the
S-waiting-on-review
petrochenkov
added
S-waiting-on-author
eddyb
force-pushed
the
iter-macro-backtrace
branch
from
cd5eaf9
to
50fc4cd
Compare
|
@petrochenkov Addressed your comments, does it look good now? |
|
r=me with the clone removed |
eddyb
force-pushed
the
iter-macro-backtrace
branch
from
50fc4cd
to
43b46ac
Compare
|
@bors r=petrochenkov |
|
📌 Commit 43b46aceeb2a41fe95c4d6620e37e23c5d3dfebf has been approved by |
bors
added
S-waiting-on-bors
|
⌛ Testing commit 43b46aceeb2a41fe95c4d6620e37e23c5d3dfebf with merge d47dac1a0628908b7b9de1f8e70f770a1c92b7b9... |
This comment has been minimized.
This comment has been minimized.
bors
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
bors
added a commit
to rust-lang/cargo
that referenced
this pull request
Jan 24, 2020
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
force-pushed
the
iter-macro-backtrace
branch
from
43b46ac
to
9dec58f
Compare
|
@bors r=petrochenkov |
|
📌 Commit 9dec58fc0294d6f7ef896d78fc3dd8efb61f8831 has been approved by |
bors
added
S-waiting-on-bors
|
⌛ Testing commit 9dec58fc0294d6f7ef896d78fc3dd8efb61f8831 with merge db5e6d5d771b77dfeb0028e3871c9d7a5de75117... |
This comment has been minimized.
This comment has been minimized.
bors
added
the
S-waiting-on-review
|
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. |
petrochenkov
added
S-waiting-on-author
This comment has been minimized.
This comment has been minimized.
bors
added a commit
to rust-lang/rust-clippy
that referenced
this pull request
Jan 26, 2020
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.
bors
added a commit
to rust-lang/rust-clippy
that referenced
this pull request
Jan 26, 2020
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
eddyb
force-pushed
the
iter-macro-backtrace
branch
from
9dec58f
to
6980f82
Compare
|
@bors r=petrochenkov |
|
📌 Commit 6980f82 has been approved by |
bors
added
S-waiting-on-bors
|
according to the diff, this PR also changes submodules, is this intended? |
|
@matthiaskrgr Yupp, see #68407 (comment) and #68407 (comment). |
bors
added a commit
that referenced
this pull request
Jan 26, 2020
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
|
☀️ Test successful - checks-azure |
|
📣 Toolstate changed by #68407! Tested on commit a237641. 🎉 rustc-guide on linux: test-fail → test-pass (cc @JohnTitor @amanjeev @spastorino @mark-i-m, @rust-lang/infra). |
rust-highfive
added a commit
to rust-lang-nursery/rust-toolstate
that referenced
this pull request
Jan 27, 2020
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).
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Having
Span::macro_backtraceproduce animpl Iterator<Item = ExpnData>allows #67359 to use it instead of rolling its own similar functionality.The move from
MacroBacktracetoExpnData(which the first two commits are prerequisites for) both eliminates unnecessary allocations, and is strictly more flexible (exposes more information).r? @petrochenkov