delegation: Support renaming, and async, const, extern "ABI" and C-variadic functions #122500

petrochenkov · 2024-03-14T16:44:24Z

Also allow delegating to functions with opaque types (impl Trait).
The delegation item will refer to the original opaque type from the callee, fresh opaque type won't be created, which seems like a reasonable behavior.
(Such delegation items will cause query cycles when used in trait impls, but it can be fixed later.)

Part of #118212.

rustbot · 2024-03-14T16:44:33Z

r? @estebank

rustbot has assigned @estebank.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

compiler-errors · 2024-03-14T16:51:57Z

The delegation item will refer to the original opaque type from the callee, fresh opaque type won't be created, which seems like a reasonable behavior.

Yeah, that sounds right. It doesn't really matter because a new body can't be provided anyways.

workingjubilee · 2024-03-22T18:23:25Z

pour one out for astconv.

@rustbot author

rustbot · 2024-03-25T15:18:25Z

HIR ty lowering was modified

cc @fmease

petrochenkov · 2024-03-25T15:19:50Z

@workingjubilee
Minor conflicts typically do not prevent reviews and do not require pre-review rebasing.
@rustbot ready

petrochenkov · 2024-04-04T12:20:39Z

ping @estebank, it's been 3 weeks.

fmease · 2024-04-04T17:04:30Z

I could review this within the next two days.

fmease

Thanks! Apologies for the super long delay. That shouldn't have happened.
Generally looks good. I have some small nitpicks.
After addressing them & a rebase, r=me.

compiler/rustc_ast_lowering/src/delegation.rs

fmease · 2024-04-23T16:47:02Z

compiler/rustc_resolve/src/late.rs

@@ -4712,12 +4713,13 @@ struct ItemInfoCollector<'a, 'b, 'tcx> {

 impl ItemInfoCollector<'_, '_, '_> {


(preexisting) The name of ItemInfoCollector is pretty nondescript considering that it's fn_delegation-specific. I feel like we should make that more clear. Not blocking.

tests/ui/delegation/fn-header.rs

compiler/rustc_ast_lowering/src/delegation.rs

Also allow `impl Trait` in delegated functions. The delegation item will refer to the original opaque type from the callee, fresh opaque type won't be created.

petrochenkov · 2024-04-23T20:09:56Z

@bors r=fmease

bors · 2024-04-23T20:09:59Z

📌 Commit 7b7c26f has been approved by fmease

It is now in the queue for this repository.

delegation: Support renaming, and async, const, extern "ABI" and C-variadic functions Also allow delegating to functions with opaque types (`impl Trait`). The delegation item will refer to the original opaque type from the callee, fresh opaque type won't be created, which seems like a reasonable behavior. (Such delegation items will cause query cycles when used in trait impls, but it can be fixed later.) Part of rust-lang#118212.

Rollup of 6 pull requests Successful merges: - rust-lang#122500 (delegation: Support renaming, and async, const, extern "ABI" and C-variadic functions) - rust-lang#123316 (Test `#[unix_sigpipe = "inherit"]` with both `SIG_DFL` and `SIG_IGN`) - rust-lang#124136 (Provide more context and suggestions in borrowck errors involving closures) - rust-lang#124280 (Port repr128-dwarf run-make test to rmake) - rust-lang#124282 (windows fill_utf16_buf: explain the expected return value) - rust-lang#124308 (Add diagnostic item for `std::iter::Enumerate`) r? `@ghost` `@rustbot` modify labels: rollup

delegation: Support renaming, and async, const, extern "ABI" and C-variadic functions Also allow delegating to functions with opaque types (`impl Trait`). The delegation item will refer to the original opaque type from the callee, fresh opaque type won't be created, which seems like a reasonable behavior. (Such delegation items will cause query cycles when used in trait impls, but it can be fixed later.) Part of rust-lang#118212.

Rollup of 5 pull requests Successful merges: - rust-lang#122500 (delegation: Support renaming, and async, const, extern "ABI" and C-variadic functions) - rust-lang#123316 (Test `#[unix_sigpipe = "inherit"]` with both `SIG_DFL` and `SIG_IGN`) - rust-lang#123794 (More DefineOpaqueTypes::Yes) - rust-lang#124282 (windows fill_utf16_buf: explain the expected return value) - rust-lang#124308 (Add diagnostic item for `std::iter::Enumerate`) Failed merges: - rust-lang#124136 (Provide more context and suggestions in borrowck errors involving closures) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2024-04-24T11:57:38Z

⌛ Testing commit 7b7c26f with merge 5557f8c...

bors · 2024-04-24T13:59:41Z

☀️ Test successful - checks-actions
Approved by: fmease
Pushing 5557f8c to master...

rust-timer · 2024-04-24T15:16:04Z

Finished benchmarking commit (5557f8c): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-2.7%	[-2.7%, -2.7%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-2.7%	[-2.7%, -2.7%]	1

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	3.1%	[3.0%, 3.5%]	4
Improvements ✅ (primary)	-2.6%	[-2.7%, -2.5%]	2
Improvements ✅ (secondary)	-1.9%	[-2.2%, -1.7%]	4
All ❌✅ (primary)	-2.6%	[-2.7%, -2.5%]	2

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 672.79s -> 674.062s (0.19%)
Artifact size: 315.46 MiB -> 316.12 MiB (0.21%)

rustbot assigned estebank Mar 14, 2024

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 Mar 14, 2024

This comment was marked as resolved.

Sign in to view

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 22, 2024

petrochenkov force-pushed the deleg branch from f0f0dae to 16d09fa Compare March 25, 2024 15:18

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 25, 2024

This comment was marked as resolved.

Sign in to view

fmease mentioned this pull request Apr 12, 2024

delegation: Implement list delegation #123413

Merged

fmease assigned fmease and unassigned estebank Apr 17, 2024

fmease approved these changes Apr 23, 2024

View reviewed changes

fmease added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 23, 2024

petrochenkov added 2 commits April 23, 2024 22:38

delegation: Support renaming

99b635e

delegation: Support async, const, extern "ABI" and C-variadic functions

7b7c26f

Also allow `impl Trait` in delegated functions. The delegation item will refer to the original opaque type from the callee, fresh opaque type won't be created.

petrochenkov force-pushed the deleg branch from 16d09fa to 7b7c26f Compare April 23, 2024 20:08

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 23, 2024

fmease mentioned this pull request Apr 24, 2024

Rollup of 6 pull requests #124316

Closed

fmease mentioned this pull request Apr 24, 2024

Rollup of 5 pull requests #124329

Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 24, 2024

bors merged commit 5557f8c into rust-lang:master Apr 24, 2024
13 checks passed

rustbot added this to the 1.79.0 milestone Apr 24, 2024

This was referenced Apr 24, 2024

ICE: late diagnostics: no entry found for key #124342

Closed

ICE: rustc_ast_lowering: no entry found for key #124347

Closed

fmease mentioned this pull request May 14, 2024

Tracking Issue for function delegation (fn_delegation, RFC 3530) #118212

Open

25 tasks

petrochenkov added the F-fn_delegation `#![feature(fn_delegation)]` label Jun 24, 2024

GrigorenkoPV mentioned this pull request Jul 24, 2024

ICE: delegation: index out of bounds #128119

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

delegation: Support renaming, and async, const, extern "ABI" and C-variadic functions #122500

delegation: Support renaming, and async, const, extern "ABI" and C-variadic functions #122500

petrochenkov commented Mar 14, 2024

rustbot commented Mar 14, 2024

compiler-errors commented Mar 14, 2024

This comment was marked as resolved.

workingjubilee commented Mar 22, 2024

rustbot commented Mar 25, 2024

petrochenkov commented Mar 25, 2024

This comment was marked as resolved.

petrochenkov commented Apr 4, 2024

fmease commented Apr 4, 2024

fmease left a comment •

edited

Loading

fmease Apr 23, 2024

petrochenkov commented Apr 23, 2024

bors commented Apr 23, 2024

bors commented Apr 24, 2024

bors commented Apr 24, 2024

rust-timer commented Apr 24, 2024

		@@ -4712,12 +4713,13 @@ struct ItemInfoCollector<'a, 'b, 'tcx> {

		impl ItemInfoCollector<'_, '_, '_> {

delegation: Support renaming, and async, const, extern "ABI" and C-variadic functions #122500

delegation: Support renaming, and async, const, extern "ABI" and C-variadic functions #122500

Conversation

petrochenkov commented Mar 14, 2024

rustbot commented Mar 14, 2024

compiler-errors commented Mar 14, 2024

This comment was marked as resolved.

workingjubilee commented Mar 22, 2024

rustbot commented Mar 25, 2024

petrochenkov commented Mar 25, 2024

This comment was marked as resolved.

petrochenkov commented Apr 4, 2024

fmease commented Apr 4, 2024

fmease left a comment • edited Loading

Choose a reason for hiding this comment

fmease Apr 23, 2024

Choose a reason for hiding this comment

petrochenkov commented Apr 23, 2024

bors commented Apr 23, 2024

bors commented Apr 24, 2024

bors commented Apr 24, 2024

rust-timer commented Apr 24, 2024

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

fmease left a comment •

edited

Loading