Skip to content

pretty.rs: Update Closure and Generator print - #77069

Merged
bors merged 2 commits into
rust-lang:masterfrom
sexxi-goose:closure_print_2
Sep 30, 2020
Merged

pretty.rs: Update Closure and Generator print #77069
bors merged 2 commits into
rust-lang:masterfrom
sexxi-goose:closure_print_2

Conversation

@arora-aman

@arora-amanarora-aman commented Sep 22, 2020

Copy link
Copy Markdown
Contributor

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 22, 2020
@arora-amanarora-aman mentioned this pull request Sep 23, 2020
Closed
davidtwco
davidtwco requested changes Sep 23, 2020
View reviewed changes

@davidtwcodavidtwco left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, some minor comments/inconsistencies that might be fine but I'd like to check.

Comment threadcompiler/rustc_middle/src/ty/print/pretty.rs Outdated
Comment threadcompiler/rustc_middle/src/ty/print/pretty.rs Outdated
Comment threadcompiler/rustc_middle/src/ty/print/pretty.rs Outdated
Comment threadcompiler/rustc_middle/src/ty/print/pretty.rs Outdated
Comment threadcompiler/rustc_middle/src/ty/print/pretty.rs Outdated
Comment threadcompiler/rustc_middle/src/ty/print/pretty.rs
}
if !self.tcx().sess.verbose() {
p!(write("generator"));
// FIXME(eddyb) should use `def_span`.

@davidtwcodavidtwcoSep 23, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of curiosity, did you try using def_span here?

@arora-amanarora-amanSep 23, 2020•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't try def_span, I guess I could've. I was mostly trying to keep changes minimal to non-verbose mode with this PR. Main motivation is to remove printing upvar_tys for non-verbose.

Comment threadcompiler/rustc_middle/src/ty/print/pretty.rs
arora-aman
arora-aman commented Sep 24, 2020
View reviewed changes
Comment threadcompiler/rustc_middle/src/ty/print/pretty.rs Outdated

@arora-amanarora-amanSep 24, 2020•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Won't need this check when rust-lang/project-rfc-2229#4 is implemented, because then the is_valid() check itself will fail because the tupled_upvar_tys will be an inference variable.

@bors

bors commented Sep 26, 2020

Copy link
Copy Markdown
Collaborator

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

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

arora-amanand others added 2 commits September 28, 2020 01:27
@arora-aman@null-sleep@logmosier
pretty.rs: Update Closure and Generator print
c923da0
Co-authored-by: Dhruv Jauhar <dhruvjhr@gmail.com>
Co-authored-by: Logan Mosier <logmosier@gmail.com>
@arora-aman@null-sleep@logmosier
Add tests for updated closure/generator printing
adda0cd
Co-authored-by: Dhruv Jauhar <dhruvjhr@gmail.com>
Co-authored-by: Logan Mosier <logmosier@gmail.com>
@arora-aman

arora-aman commented Sep 28, 2020

Copy link
Copy Markdown
ContributorAuthor

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

@arora-aman

arora-aman commented Sep 29, 2020

Copy link
Copy Markdown
ContributorAuthor

@davidtwco updated

davidtwco
davidtwco approved these changes Sep 29, 2020
View reviewed changes

@davidtwcodavidtwco left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@nikomatsakis

nikomatsakis commented Sep 29, 2020

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Sep 29, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit adda0cd has been approved by nikomatsakis

@borsbors 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 Sep 29, 2020
@bors

bors commented Sep 30, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit adda0cd with merge 6ac6c67...

@bors

bors commented Sep 30, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions, checks-azure
Approved by: nikomatsakis
Pushing 6ac6c67 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Sep 30, 2020
@bors
bors merged commit 6ac6c67 into rust-lang:masterSep 30, 2020
@rustbotrustbot added this to the 1.48.0 milestone Sep 30, 2020
@arora-amanarora-aman mentioned this pull request Sep 30, 2020
Closed
@arora-aman
arora-aman deleted the closure_print_2 branch September 30, 2020 05:32
@borsbors mentioned this pull request Sep 30, 2020
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nikomatsakisnikomatsakisnikomatsakis approved these changes
@davidtwcodavidtwcodavidtwco approved these changes

Assignees

@nikomatsakisnikomatsakis

Labels

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

Projects

None yet

Milestone

1.48.0

Development

Successfully merging this pull request may close these issues.

Update pretty.rs

6 participants

@arora-aman@bors@nikomatsakis@davidtwco@rust-highfive@rustbot