Pretty print async fn sugar in opaques and trait bounds #132911

compiler-errors · 2024-11-11T17:43:19Z

sudo r? fmease

rustbot · 2024-11-11T17:43:34Z

Could not assign reviewer from: fmease.
User(s) fmease are either the PR author, already assigned, or on vacation, and there are no other candidates.
Use r? to specify someone else to assign.

compiler-errors · 2024-11-11T17:44:04Z

compiler/rustc_middle/src/ty/print/pretty.rs

-                let generics = tcx.generics_of(trait_ref.def_id);
-                let own_args = generics.own_args_no_defaults(tcx, trait_ref.args);
-
-                match (entry.return_ty, own_args[0].expect_ty()) {


I have noooooooOOoOooooooo idea wtf was going on here lmao

Unfortunately, something about this part was load-bearing, cf. #133597

compiler-errors · 2024-11-11T17:44:50Z

compiler/rustc_middle/src/ty/print/pretty.rs

@@ -1230,51 +1206,48 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write {
    /// traits map or fn_traits map, depending on if the trait is in the Fn* family of traits.
    fn insert_trait_and_projection(


I'm pretty disappointed with how sensitive to bound var renumbering this is... but 🤷

compiler-errors · 2024-11-11T17:46:15Z

compiler/rustc_middle/src/ty/print/pretty.rs

+            if let Some(return_ty) = entry.return_ty {
+                self.wrap_binder(&bound_args, |args, cx| {
+                    define_scoped_cx!(cx);
+                    p!(write("{}", tcx.item_name(trait_def_id)));


we could very easily start making this print like async Fn in the future.

fmease

Thanks, one small suggestion

fmease · 2024-11-21T09:11:01Z

compiler/rustc_middle/src/ty/print/pretty.rs

@@ -1007,24 +1007,22 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write {
                    }

                    self.insert_trait_and_projection(
-                        trait_ref,
-                        pred.polarity,
+                        bound_predicate.rebind(pred),


As a nice consequence, now the

let trait_ref = bound_predicate.rebind(pred.trait_ref); // ... if tcx.is_lang_item(trait_ref.def_id(), LangItem::Sized) {

a few lines above can be simplified to

// ... if tcx.is_lang_item(pred.def_id(), LangItem::Sized) {

(GH doesn't let me comment directly on those lines)

fmease · 2024-11-22T03:23:09Z

Then r=me @bors rollup

compiler-errors · 2024-11-22T17:17:45Z

@bors r=fmease rollup

bors · 2024-11-22T17:17:47Z

📌 Commit 4c53ad5 has been approved by fmease

It is now in the queue for this repository.

…fmease Pretty print async fn sugar in opaques and trait bounds sudo r? fmease

…mpiler-errors Rollup of 8 pull requests Successful merges: - rust-lang#131505 (use `confstr(_CS_DARWIN_USER_TEMP_DIR, ...)` as a `TMPDIR` fallback on Darwin) - rust-lang#131859 (Update TRPL to add new Chapter 17: Async and Await) - rust-lang#132090 (Stop being so bail-y in candidate assembly) - rust-lang#132597 (btree: don't leak value if destructor of key panics) - rust-lang#132911 (Pretty print async fn sugar in opaques and trait bounds) - rust-lang#133159 (Don't allow `-Zunstable-options` to take a value ) - rust-lang#133247 (Reduce integer `Display` implementation size) - rust-lang#133286 (Re-delay a resolve `bug` related to `Self`-ctor in patterns) Failed merges: - rust-lang#133215 (Fix missing submodule in `./x vendor`) r? `@ghost` `@rustbot` modify labels: rollup

…mpiler-errors Rollup of 8 pull requests Successful merges: - rust-lang#132090 (Stop being so bail-y in candidate assembly) - rust-lang#132658 (Detect const in pattern with typo) - rust-lang#132911 (Pretty print async fn sugar in opaques and trait bounds) - rust-lang#133102 (aarch64 softfloat target: always pass floats in int registers) - rust-lang#133159 (Don't allow `-Zunstable-options` to take a value ) - rust-lang#133208 (generate-copyright: Now generates a library file too.) - rust-lang#133215 (Fix missing submodule in `./x vendor`) - rust-lang#133264 (implement OsString::truncate) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#132911 - compiler-errors:async-fn-sugar, r=fmease Pretty print async fn sugar in opaques and trait bounds sudo r? fmease

fmease · 2024-11-29T07:02:21Z

compiler/rustc_middle/src/ty/print/pretty.rs

+                traits.insert(
+                    bound_args.map_bound(|args| ty::TraitPredicate {
+                        polarity: ty::PredicatePolarity::Positive,
+                        trait_ref: ty::TraitRef::new(tcx, trait_def_id, [Ty::new_tup(tcx, args)]),


Ah, this is missing the self ty.

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Nov 11, 2024

compiler-errors assigned fmease Nov 11, 2024

compiler-errors commented Nov 11, 2024

View reviewed changes

compiler-errors force-pushed the async-fn-sugar branch from 89b92c5 to d617f18 Compare November 11, 2024 17:45

compiler-errors commented Nov 11, 2024

View reviewed changes

compiler-errors force-pushed the async-fn-sugar branch from d617f18 to d460ffc Compare November 21, 2024 01:42

fmease approved these changes Nov 22, 2024

View reviewed changes

Simplify logic a bit

7540306

compiler-errors force-pushed the async-fn-sugar branch from d460ffc to f79ab27 Compare November 22, 2024 16:41

This comment has been minimized.

Sign in to view

Pretty print AsyncFn traits too

4c53ad5

compiler-errors force-pushed the async-fn-sugar branch from f79ab27 to 4c53ad5 Compare November 22, 2024 16:55

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 Nov 22, 2024

compiler-errors added a commit to compiler-errors/rust that referenced this pull request Nov 22, 2024

Rollup merge of rust-lang#132911 - compiler-errors:async-fn-sugar, r=…

348333d

…fmease Pretty print async fn sugar in opaques and trait bounds sudo r? fmease

compiler-errors mentioned this pull request Nov 22, 2024

Rollup of 8 pull requests #133350

Closed

compiler-errors mentioned this pull request Nov 23, 2024

Rollup of 8 pull requests #133360

Merged

bors merged commit 2a94e1c into rust-lang:master Nov 23, 2024
6 checks passed

rustbot added this to the 1.85.0 milestone Nov 23, 2024

rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 23, 2024

Unrolled build for rust-lang#132911

a446053

Rollup merge of rust-lang#132911 - compiler-errors:async-fn-sugar, r=fmease Pretty print async fn sugar in opaques and trait bounds sudo r? fmease

jieyouxu mentioned this pull request Nov 29, 2024

ICE: range end index 2 out of range for slice of length 1 #133597

Open

fmease reviewed Nov 29, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pretty print async fn sugar in opaques and trait bounds #132911

Pretty print async fn sugar in opaques and trait bounds #132911

compiler-errors commented Nov 11, 2024 •

edited

Loading

rustbot commented Nov 11, 2024

compiler-errors Nov 11, 2024

jieyouxu Nov 29, 2024

compiler-errors Nov 11, 2024

compiler-errors Nov 11, 2024

fmease left a comment

fmease Nov 21, 2024 •

edited

Loading

fmease commented Nov 22, 2024

This comment has been minimized.

compiler-errors commented Nov 22, 2024

bors commented Nov 22, 2024

fmease Nov 29, 2024 •

edited

Loading

		@@ -1230,51 +1206,48 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write {
		/// traits map or fn_traits map, depending on if the trait is in the Fn* family of traits.
		fn insert_trait_and_projection(

Pretty print async fn sugar in opaques and trait bounds #132911

Pretty print async fn sugar in opaques and trait bounds #132911

Conversation

compiler-errors commented Nov 11, 2024 • edited Loading

rustbot commented Nov 11, 2024

compiler-errors Nov 11, 2024

Choose a reason for hiding this comment

jieyouxu Nov 29, 2024

Choose a reason for hiding this comment

compiler-errors Nov 11, 2024

Choose a reason for hiding this comment

compiler-errors Nov 11, 2024

Choose a reason for hiding this comment

fmease left a comment

Choose a reason for hiding this comment

fmease Nov 21, 2024 • edited Loading

Choose a reason for hiding this comment

fmease commented Nov 22, 2024

This comment has been minimized.

compiler-errors commented Nov 22, 2024

bors commented Nov 22, 2024

fmease Nov 29, 2024 • edited Loading

Choose a reason for hiding this comment

compiler-errors commented Nov 11, 2024 •

edited

Loading

fmease Nov 21, 2024 •

edited

Loading

fmease Nov 29, 2024 •

edited

Loading