diff options
| author | bors <bors@rust-lang.org> | 2024-01-18 05:15:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-01-18 05:15:25 +0000 |
| commit | 2457c028c907b43511445677fe39b2dbf679a0cf (patch) | |
| tree | 5e3b28d3feeb4a2a7b37ce237a2a1c749df0316e /compiler/rustc_middle/src | |
| parent | 6ae4cfbbb080cafea7f6be48ce47678ee057352c (diff) | |
| parent | 99a8b6aa67f7b4cc23ba4c9e709f4f57cb8a5137 (diff) | |
| download | rust-2457c028c907b43511445677fe39b2dbf679a0cf.tar.gz rust-2457c028c907b43511445677fe39b2dbf679a0cf.zip | |
Auto merge of #120068 - matthiaskrgr:rollup-vxugut5, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - #115291 (Save liveness results for DestinationPropagation) - #119855 (Enable Static Builds for FreeBSD) - #119975 (Don't ICE if TAIT-defining fn contains a closure with `_` in return type) - #120001 (Consistently unset RUSTC_BOOTSTRAP when compiling bootstrap) - #120020 (Gracefully handle missing typeck information if typeck errored) - #120031 (Construct closure type eagerly) - #120032 (Fix `rustc_abi` build on stable) - #120039 (pat_analysis: Don't rely on contiguous `VariantId`s outside of rustc) - #120044 (Fix typo in comments (in_place_collect)) - #120056 (Use FnOnceOutput instead of FnOnce where expected) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_middle/src')
| -rw-r--r-- | compiler/rustc_middle/src/ty/print/pretty.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_middle/src/ty/print/pretty.rs b/compiler/rustc_middle/src/ty/print/pretty.rs index 6c9000c45f6..4028de27cae 100644 --- a/compiler/rustc_middle/src/ty/print/pretty.rs +++ b/compiler/rustc_middle/src/ty/print/pretty.rs @@ -1013,7 +1013,7 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write { .extend( // Group the return ty with its def id, if we had one. entry.return_ty.map(|ty| { - (tcx.require_lang_item(LangItem::FnOnce, None), ty) + (tcx.require_lang_item(LangItem::FnOnceOutput, None), ty) }), ); } |