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

Always collect tokens when we are already inside a collect_tokens call #81029

Closed
wants to merge 1 commit into from

Conversation

Aaron1011
Copy link
Member

Fixes #81007

This is needed to ensure that the LazyTokenStream we use does not
include attributes - the outer call may include the attributes, which we
don't want to include in the LazyTokenSTream.

@rust-highfive
Copy link
Collaborator

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 Jan 15, 2021
@petrochenkov petrochenkov self-assigned this Jan 15, 2021
@bors
Copy link
Contributor

bors commented Jan 15, 2021

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

@oli-obk oli-obk removed their assignment Jan 15, 2021
Fixes rust-lang#81007

This is needed to ensure that the `LazyTokenStream` we use does not
include attributes - the outer call may include the attributes, which we
don't want to include in the `LazyTokenSTream`.
@Aaron1011
Copy link
Member Author

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@bors
Copy link
Contributor

bors commented Jan 15, 2021

⌛ Trying commit 372b567 with merge 9f6de25f295e73311e6356b40ebab59069798fce...

@bors
Copy link
Contributor

bors commented Jan 15, 2021

☀️ Try build successful - checks-actions
Build commit: 9f6de25f295e73311e6356b40ebab59069798fce (9f6de25f295e73311e6356b40ebab59069798fce)

@rust-timer
Copy link
Collaborator

Queued 9f6de25f295e73311e6356b40ebab59069798fce with parent e48eb37, future comparison URL.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jan 15, 2021
@rust-timer
Copy link
Collaborator

Finished benchmarking try commit (9f6de25f295e73311e6356b40ebab59069798fce): comparison url.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. Please note that if the perf results are neutral, you should likely undo the rollup=never given below by specifying rollup- to bors.

Importantly, though, if the results of this run are non-neutral do not roll this PR up -- it will mask other regressions or improvements in the roll up.

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

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jan 15, 2021
@Aaron1011
Copy link
Member Author

Aaron1011 commented Jan 16, 2021

This is implemented (with some extra performance improvements) in #81017. Once that PR is merged, this PR can be merged with just the test.

@Aaron1011 Aaron1011 added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 16, 2021
@Aaron1011
Copy link
Member Author

Closing in favor of #81177, which accomplishes the same result more efficiently.

@Aaron1011 Aaron1011 closed this Jan 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-blocked Status: Blocked on something else such as an RFC or other implementation work.
Projects
None yet
7 participants