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

Print return-position impl Trait in trait verbosely if -Zverbose #102904

Merged
merged 1 commit into from
Oct 13, 2022

Conversation

compiler-errors
Copy link
Member

Makes the behavior a bit closer to regular impl Trait printing

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Oct 10, 2022
@rust-highfive
Copy link
Collaborator

r? @fee1-dead

(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 Oct 10, 2022
@@ -637,7 +637,9 @@ pub trait PrettyPrinter<'tcx>:
p!(print_def_path(def_id, &[]));
}
ty::Projection(ref data) => {
if self.tcx().def_kind(data.item_def_id) == DefKind::ImplTraitPlaceholder {
if self.tcx().def_kind(data.item_def_id) == DefKind::ImplTraitPlaceholder
&& !(self.tcx().sess.verbose() || NO_QUERIES.with(|q| q.get()))
Copy link
Contributor

Choose a reason for hiding this comment

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

As def_kind is a query, should the test be reversed to short-circuit it?
Otherwise r=me.

@compiler-errors
Copy link
Member Author

@bors r=cjgillot

@bors
Copy link
Contributor

bors commented Oct 13, 2022

📌 Commit 61f0973 has been approved by cjgillot

It is now in the queue for this repository.

@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 Oct 13, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 13, 2022
Rollup of 6 pull requests

Successful merges:

 - rust-lang#102765 (Suggest `==` to the first expr which has `ExprKind::Assign` kind)
 - rust-lang#102854 (openbsd: don't reallocate a guard page on the stack.)
 - rust-lang#102904 (Print return-position `impl Trait` in trait verbosely if `-Zverbose`)
 - rust-lang#102947 (Sort elaborated existential predicates in `object_ty_for_trait`)
 - rust-lang#102956 (Use `full_res` instead of `expect_full_res`)
 - rust-lang#102999 (Delay `is_intrinsic` query until after we've determined the callee is a function)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit dbff6a9 into rust-lang:master Oct 13, 2022
@rustbot rustbot added this to the 1.66.0 milestone Oct 13, 2022
@compiler-errors compiler-errors deleted the rpitit-verbosely branch November 2, 2022 02:54
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. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants