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.

Sign up for GitHub

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

Jump to bottom

Fix nested eager expansions in arguments of format_args #63717

Merged
merged 5 commits into from
Aug 21, 2019
Merged

Fix nested eager expansions in arguments of format_args #63717

merged 5 commits into from
Aug 21, 2019

Conversation

petrochenkov
Copy link
Contributor

@petrochenkov petrochenkov commented Aug 19, 2019 •
edited
Loading

Fixes #63460
Fixes #63685 (regression from making format_args opaque - #63114)

r? @matthewjasper

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 19, 2019
@petrochenkov petrochenkov mentioned this pull request Aug 19, 2019
Closed
@matthewjasper
Copy link
Contributor

matthewjasper commented Aug 20, 2019 •
edited
Loading

Can you check if this also fixes #63460, and if so as a test?
r=me with that done

@matthewjasper matthewjasper added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 20, 2019
@tesuji
Copy link
Contributor

tesuji commented Aug 20, 2019

Ping @petrochenkov
@rustbot modify labels: -S-waiting-on-review S-waiting-on-author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 20, 2019
@petrochenkov
Add a test for an opaque macro eagerly expanding its arguments
1dd56aa
@petrochenkov
expand: Keep the correct current expansion ID for eager expansions
96032aa 
Solve the problem of `ParentScope` entries for eager expansions not exising in the resolver map by creating them on demand.
@petrochenkov
expand: Do not do questionable span adjustment before eagerly expandi…
a83c356 
…ng an expression

Maybe it made sense when it was introduced, but now it's doing something incorrect.
@petrochenkov
resolve/expand: Rename some things for clarity and add comments
93d369b
@petrochenkov
Add a regression test for issue rust-lang#63460
fe2dc91
@petrochenkov
Copy link
Contributor Author

Yes, #63460 is fixed as well, I've added a test.
@bors r=matthewjasper

@bors
Copy link
Contributor

bors commented Aug 21, 2019

📌 Commit fe2dc91 has been approved by matthewjasper

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 21, 2019
@petrochenkov petrochenkov mentioned this pull request Aug 21, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Aug 21, 2019
@Centril
Rollup merge of rust-lang#63717 - petrochenkov:eager, r=matthewjasper
7043696 
Fix nested eager expansions in arguments of `format_args`

Fixes rust-lang#63460
Fixes rust-lang#63685 (regression from making `format_args` opaque - rust-lang#63114)

r? @matthewjasper
@Centril Centril mentioned this pull request Aug 21, 2019
Merged
@petrochenkov
Copy link
Contributor Author

To the release team:
I'm not entirely sure this can be backported to beta without #63535.
I'll try and report.

bors added a commit that referenced this pull request Aug 21, 2019
@bors
Auto merge of #63790 - Centril:rollup-m4ax3r9, r=Centril
e44fdf9 
Rollup of 6 pull requests

Successful merges:

 - #61236 (take into account the system theme)
 - #63717 (Fix nested eager expansions in arguments of `format_args`)
 - #63747 (update Miri)
 - #63772 (ci: move libc mirrors to the rust-lang-ci-mirrors bucket)
 - #63780 (Improve diagnostics: break/continue in wrong context)
 - #63781 (Run Clippy without json-rendered flag)

Failed merges:

r? @ghost
@bors bors merged commit fe2dc91 into rust-lang:master Aug 21, 2019
@petrochenkov
Copy link
Contributor Author

I'm not entirely sure this can be backported to beta without #63535.

Ok, it seems to work, here's a beta backport (without the renaming commit).

@petrochenkov petrochenkov mentioned this pull request Aug 24, 2019
Closed
@jonas-schievink jonas-schievink added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Aug 24, 2019
@petrochenkov petrochenkov mentioned this pull request Aug 25, 2019
Closed
@kinnison kinnison mentioned this pull request Aug 29, 2019
Closed
@nikomatsakis nikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Aug 29, 2019
@nikomatsakis
Copy link
Contributor

nikomatsakis commented Aug 29, 2019 •
edited
Loading

Reviewed by the compiler team:

Accepted for beta backport

@pietroalbini pietroalbini mentioned this pull request Sep 2, 2019
Merged
@pietroalbini pietroalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 2, 2019
bors added a commit that referenced this pull request Sep 3, 2019
@bors
Auto merge of #64097 - pietroalbini:beta-rollup, r=pietroalbini
d097af1 
[beta] Rollup backports

Rolled up:

* [beta] Utilize released stable over dev-static #64046

Cherry picked:

* Update rust-installer to limit memory use #63984
* debuginfo: give unique names to closure and generator types #63875
* ci: move libc mirrors to the rust-lang-ci-mirrors bucket #63772
* Fix nested eager expansions in arguments of `format_args` #63717

r? @ghost
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@matthewjasper matthewjasper

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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
Milestone
No milestone
9 participants
@petrochenkov @matthewjasper @tesuji @bors @nikomatsakis @jonas-schievink @pietroalbini @rust-highfive @rustbot