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

Remove hacks in make_token_stream. #96543

Merged
merged 2 commits into from May 11, 2022

Conversation

nnethercote
Copy link
Contributor

make_tokenstream has three commented hacks, and a comment at the top
referring to #67062. These hacks have no observable effect, at least as judged
by running the test suite. The hacks were added in #82608, with an explanation
here. It
appears that one of the following is true: (a) they never did anything useful,
(b) they do something useful but we have no test coverage for them, or (c)
something has changed in the meantime that means they are no longer necessary.

This commit removes the hacks and the comments, in the hope that (b) is not
true.

r? @Aaron1011

`make_tokenstream` has three commented hacks, and a comment at the top
referring to rust-lang#67062. These hacks have no observable effect, at least as judged
by running the test suite. The hacks were added in rust-lang#82608, with an explanation
[here](rust-lang#82608 (comment)). It
appears that one of the following is true: (a) they never did anything useful,
(b) they do something useful but we have no test coverage for them, or (c)
something has changed in the meantime that means they are no longer necessary.

This commit removes the hacks and the comments, in the hope that (b) is not
true.
@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Apr 29, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 29, 2022
@nnethercote nnethercote mentioned this pull request Apr 29, 2022
@nnethercote
Copy link
Contributor Author

@bors rollup=always

@nnethercote
Copy link
Contributor Author

@Aaron1011 Ten day review ping.

These seem to have no useful effect... they don't seem useful from a
code inspection point of view, and they affect anything in the test
suite.
@nnethercote nnethercote mentioned this pull request May 11, 2022
@Aaron1011
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented May 11, 2022

📌 Commit 3cd8e98 has been approved by Aaron1011

@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 May 11, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request May 11, 2022
Rollup of 7 pull requests

Successful merges:

 - rust-lang#96543 (Remove hacks in `make_token_stream`.)
 - rust-lang#96887 (rustdoc: correct path to type alias methods)
 - rust-lang#96896 (Add regression test for rust-lang#68408)
 - rust-lang#96900 (Fix js error)
 - rust-lang#96903 (Use lifetimes on type-alias-impl-trait used in function signatures to infer output type lifetimes)
 - rust-lang#96916 (simplify length count)
 - rust-lang#96925 (Fix issue rust-lang#95151)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 81c0a2d into rust-lang:master May 11, 2022
@rustbot rustbot added this to the 1.62.0 milestone May 11, 2022
@bors
Copy link
Contributor

bors commented May 11, 2022

⌛ Testing commit 3cd8e98 with merge ee6eaab...

@nnethercote nnethercote deleted the rm-make_token_stream-hacks branch May 11, 2022 09:13
calebcartwright pushed a commit to calebcartwright/rust that referenced this pull request Jun 13, 2022
…cks, r=Aaron1011

Remove hacks in `make_token_stream`.

`make_tokenstream` has three commented hacks, and a comment at the top
referring to rust-lang#67062. These hacks have no observable effect, at least as judged
by running the test suite. The hacks were added in rust-lang#82608, with an explanation
[here](rust-lang#82608 (comment)). It
appears that one of the following is true: (a) they never did anything useful,
(b) they do something useful but we have no test coverage for them, or (c)
something has changed in the meantime that means they are no longer necessary.

This commit removes the hacks and the comments, in the hope that (b) is not
true.

r? `@Aaron1011`
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.

None yet

5 participants