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

Revert recursive TokenKind::Interpolated expansion for now #72724

Merged
merged 5 commits into from
May 30, 2020

Conversation

Aaron1011
Copy link
Member

The crater run #72622 revealed many root regressions, at least one of which is going to take some time to fix.

For now, let's revert #72388 to allow the 709 affected crates to continue building on the latest nightly.

@rust-highfive
Copy link
Collaborator

r? @davidtwco

(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 May 29, 2020
@Aaron1011 Aaron1011 changed the title Revert recursive TokenKind::Interpolated for now Revert recursive TokenKind::Interpolated expansion for now May 29, 2020
@Aaron1011
Copy link
Member Author

r? @petrochenkov

@rust-highfive

This comment has been minimized.

@Aaron1011 Aaron1011 force-pushed the revert-tokenstream-expand branch from 9bddd77 to b802eeb Compare May 29, 2020 05:11
@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented May 29, 2020

📌 Commit b802eeb 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 May 29, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request May 30, 2020
Rollup of 10 pull requests

Successful merges:

 - rust-lang#72033 (Update RELEASES.md for 1.44.0)
 - rust-lang#72162 (Add Extend::{extend_one,extend_reserve})
 - rust-lang#72419 (Miri read_discriminant: return a scalar instead of raw underlying bytes)
 - rust-lang#72621 (Don't bail out of trait selection when predicate references an error)
 - rust-lang#72677 (Fix diagnostics for `@ ..` binding pattern in tuples and tuple structs)
 - rust-lang#72710 (Add test to make sure -Wunused-crate-dependencies works with tests)
 - rust-lang#72724 (Revert recursive `TokenKind::Interpolated` expansion for now)
 - rust-lang#72741 (Remove unused mut from long-linker-command-lines test)
 - rust-lang#72750 (Remove remaining calls to `as_local_node_id`)
 - rust-lang#72752 (remove mk_bool)

Failed merges:

r? @ghost
@bors bors merged commit 047b3bd into rust-lang:master May 30, 2020
Aaron1011 added a commit to Aaron1011/rust that referenced this pull request May 31, 2020
…m-expand, r=petrochenkov"

This reverts commit 047b3bd, reversing
changes made to 875c6b2.
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
Development

Successfully merging this pull request may close these issues.

5 participants