Skip to content

pretty-print: Do not lose the $crate printing flag in print_tt#62574

Merged
bors merged 3 commits intorust-lang:masterfrom
petrochenkov:dcrate-40000
Jul 11, 2019
Merged

pretty-print: Do not lose the $crate printing flag in print_tt#62574
bors merged 3 commits intorust-lang:masterfrom
petrochenkov:dcrate-40000

Conversation

@petrochenkov
Copy link
Contributor

@petrochenkov petrochenkov commented Jul 10, 2019

#62393 had this accidental mistake.

Fixes #62562
r? @Mark-Simulacrum

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

petrochenkov commented Jul 11, 2019

Second commit removes the confusing default.

@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Jul 11, 2019

@bors p=10 (regression fix for core ecosystem crate)

I think it would probably be wise to also eliminate the other "wrappers", e.g. ident_to_string which is called sometimes from within the pretty printer and presumably needs the same treatment (or, could, anyway).

r=me with either comments on all of the "wrapper" methods added in the previous PR or them folded away for explicit handling one way or another.

@bors
Copy link
Collaborator

bors commented Jul 11, 2019

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

@Ralith Ralith mentioned this pull request Jul 11, 2019
Merged
@flip1995 flip1995 mentioned this pull request Jul 11, 2019
Merged
@gnzlbg gnzlbg mentioned this pull request Jul 11, 2019
Closed
@gnzlbg
Copy link
Contributor

gnzlbg commented Jul 11, 2019

@petrochenkov this needs rebasing

@r3v2d0g r3v2d0g mentioned this pull request Jul 11, 2019
Merged
@petrochenkov
Copy link
Contributor Author

petrochenkov commented Jul 11, 2019

I think it would probably be wise to also eliminate the other "wrappers", e.g. ident_to_string which is called sometimes from within the pretty printer and presumably needs the same treatment (or, could, anyway).

Some of those wrappers are commonly used, so I didn't change them, but added some comments instead, ident_to_string is renamed.

@bors r=Mark-Simulacrum

@bors
Copy link
Collaborator

bors commented Jul 11, 2019

📌 Commit e381065 has been approved by Mark-Simulacrum

@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 Jul 11, 2019
@bors
Copy link
Collaborator

bors commented Jul 11, 2019

⌛ Testing commit e381065 with merge 97b1128...

bors added a commit that referenced this pull request Jul 11, 2019
@bors
Auto merge of #62574 - petrochenkov:dcrate-40000, r=Mark-Simulacrum
97b1128 
pretty-print: Do not lose the `$crate` printing flag in `print_tt`

#62393 had this accidental mistake.

Fixes #62562
r? @Mark-Simulacrum
@bors
Copy link
Collaborator

bors commented Jul 11, 2019

☀️ Test successful - checks-azure, checks-travis, status-appveyor
Approved by: Mark-Simulacrum
Pushing 97b1128 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 11, 2019
@bors bors merged commit e381065 into rust-lang:master Jul 11, 2019
@alexcrichton alexcrichton mentioned this pull request Jul 11, 2019
Closed
SimonSapin added a commit to SimonSapin/rust that referenced this pull request Jul 11, 2019
@SimonSapin
Add serde to the cargotest test suite
471cb31 
This branch is based before rust-lang#62574,
so that rust-lang#62562 can be reproduced.
This should succeed when merged into `master`.
@SimonSapin SimonSapin mentioned this pull request Jul 11, 2019
Closed
@AlterionX AlterionX mentioned this pull request Jul 11, 2019
Closed
This was referenced Aug 25, 2019
Closed
Closed
@petrochenkov petrochenkov deleted the dcrate-40000 branch February 22, 2025 18:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels

merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

serde no longer builds with latest rustc (master)

5 participants

@petrochenkov @Mark-Simulacrum @bors @gnzlbg @rust-highfive