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

parse/lexer: support StringReader::retokenize called on external files. #70172

Merged
merged 1 commit into from
Mar 22, 2020

Conversation

eddyb
Copy link
Member

@eddyb eddyb commented Mar 20, 2020

This should theoretically fixes #69933, but I'm not sure what the best way to test it is.
EDIT: see #69933 (comment).

r? @petrochenkov cc @Xanewok @staktrace

@petrochenkov
Copy link
Contributor

LGTM.
r? @Xanewok for the testing question

@eddyb
Copy link
Member Author

eddyb commented Mar 21, 2020

Turns out testing this was easier than I expected: #69933 (comment)

@bors r=petrochenkov

@bors
Copy link
Contributor

bors commented Mar 21, 2020

📌 Commit 6f6fe38 has been approved by petrochenkov

@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 Mar 21, 2020
Centril added a commit to Centril/rust that referenced this pull request Mar 22, 2020
…trochenkov

parse/lexer: support `StringReader::retokenize` called on external files.

This ~~should theoretically~~ fixes rust-lang#69933, ~~but I'm not sure what the best way to test it is~~.
**EDIT**: see rust-lang#69933 (comment).

r? @petrochenkov cc @Xanewok @staktrace
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 22, 2020
Rollup of 10 pull requests

Successful merges:

 - rust-lang#68099 (Amend Rc/Arc::from_raw() docs regarding unsafety)
 - rust-lang#70172 (parse/lexer: support `StringReader::retokenize` called on external files.)
 - rust-lang#70209 (parser: recover on `for<'a> |...| body` closures)
 - rust-lang#70223 (fix type of const params in associated types.)
 - rust-lang#70229 (more clippy fixes)
 - rust-lang#70240 (Return NonZeroU64 from ThreadId::as_u64.)
 - rust-lang#70250 (Remove wrong entry from RELEASES.md)
 - rust-lang#70253 (Remove another wrong entry from RELEASES.md)
 - rust-lang#70254 (couple more clippy fixes (let_and_return, if_same_then_else))
 - rust-lang#70266 (proc_macro_harness: Use item header spans for errors)

Failed merges:

r? @ghost
@bors bors merged commit 9890d9a into rust-lang:master Mar 22, 2020
@eddyb eddyb deleted the retokenize-external-src branch March 22, 2020 19:03
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.
Projects
None yet
5 participants