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.

Sign up for GitHub

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

Jump to bottom

Delegation: support generics in associated delegation items #126161

Merged
merged 2 commits into from
Sep 7, 2024
Merged

Delegation: support generics in associated delegation items #126161

merged 2 commits into from
Sep 7, 2024

Conversation

Bryanskiy
Copy link
Contributor

@Bryanskiy Bryanskiy commented Jun 8, 2024 •
edited
Loading

This is a continuation of #125929.

design

Generic parameters inheritance was implemented in all contexts. Generic arguments are not yet supported.

r? @petrochenkov

@rustbot 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 Jun 8, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jun 8, 2024

HIR ty lowering was modified

cc @fmease

@Bryanskiy Bryanskiy mentioned this pull request Jun 8, 2024
Merged
@petrochenkov
Copy link
Contributor

I think the support for inherent impls can be added to this PR as well.

@petrochenkov
Copy link
Contributor

Blocked on #125929.
@rustbot blocked

@rustbot rustbot added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 10, 2024
@petrochenkov petrochenkov added the F-fn_delegation `#![feature(fn_delegation)]` label Jun 24, 2024
@petrochenkov petrochenkov mentioned this pull request Jun 24, 2024
Open
25 tasks
@Bryanskiy Bryanskiy force-pushed the delegation-generics-4 branch from db39028 to 12fe21b Compare July 18, 2024 16:35
@Bryanskiy Bryanskiy changed the title Delegation: support delegation in generic trait impl's Delegation: support generics in associated delegation items Jul 18, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors

This comment was marked as resolved.

Sign in to view
@petrochenkov
Copy link
Contributor

#125929 has landed.
@rustbot author

@rustbot 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-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Jul 30, 2024
@Bryanskiy Bryanskiy force-pushed the delegation-generics-4 branch from 12fe21b to ca44fb0 Compare August 23, 2024 12:00
@Bryanskiy
Copy link
Contributor Author

@rustbot ready

@rustbot 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 Aug 23, 2024
petrochenkov
petrochenkov reviewed Aug 23, 2024
View reviewed changes
compiler/rustc_hir_analysis/src/collect/generics_of.rs Show resolved Hide resolved
compiler/rustc_hir_analysis/src/collect/predicates_of.rs Show resolved Hide resolved
compiler/rustc_middle/src/hir/map/mod.rs Outdated Show resolved Hide resolved
compiler/rustc_trait_selection/src/error_reporting/infer/need_type_info.rs Show resolved Hide resolved
compiler/rustc_hir_analysis/src/delegation.rs Outdated Show resolved Hide resolved
compiler/rustc_hir_analysis/src/delegation.rs Outdated Show resolved Hide resolved
compiler/rustc_hir_analysis/src/delegation.rs Outdated Show resolved Hide resolved
compiler/rustc_hir_analysis/src/delegation.rs Show resolved Hide resolved
compiler/rustc_hir_analysis/src/delegation.rs Show resolved Hide resolved
@petrochenkov petrochenkov 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 Aug 23, 2024
@Bryanskiy Bryanskiy force-pushed the delegation-generics-4 branch 2 times, most recently from 591d865 to beb7490 Compare August 27, 2024 16:23
@Bryanskiy
Copy link
Contributor Author

@rustbot ready

@rustbot 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 Aug 27, 2024
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 6, 2024
@petrochenkov
Copy link
Contributor

@bors retry

@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 Sep 7, 2024
@bors
Copy link
Contributor

bors commented Sep 7, 2024

⌛ Testing commit 588dce1 with merge 286b9d8...

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 7, 2024
@bors
Auto merge of rust-lang#126161 - Bryanskiy:delegation-generics-4, r=p…
286b9d8 
…etrochenkov

Delegation: support generics in associated delegation items

This is a continuation of rust-lang#125929.

[design](https://github.com/Bryanskiy/posts/blob/master/delegation%20in%20generic%20contexts.md)

Generic parameters inheritance was implemented in all contexts. Generic arguments are not yet supported.

r? `@petrochenkov`
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-msvc-ext failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
[RUSTC-TIMING] miri test:false 4.456
error: failed to remove file `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-tools\x86_64-pc-windows-msvc\release\miri.exe`

Caused by:
  Access is denied. (os error 5)
Command has failed. Rerun with -v to see more details.
  local time: Sat, Sep  7, 2024  9:08:45 AM
  network time: Sat, 07 Sep 2024 09:08:45 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

@bors
Copy link
Contributor

bors commented Sep 7, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 7, 2024
@petrochenkov
Copy link
Contributor

@bors retry

@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 Sep 7, 2024
@bors
Copy link
Contributor

bors commented Sep 7, 2024

⌛ Testing commit 588dce1 with merge a445d0a...

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 7, 2024
@bors
Auto merge of rust-lang#126161 - Bryanskiy:delegation-generics-4, r=p…
a445d0a 
…etrochenkov

Delegation: support generics in associated delegation items

This is a continuation of rust-lang#125929.

[design](https://github.com/Bryanskiy/posts/blob/master/delegation%20in%20generic%20contexts.md)

Generic parameters inheritance was implemented in all contexts. Generic arguments are not yet supported.

r? `@petrochenkov`
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-msvc-ext failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@bors
Copy link
Contributor

bors commented Sep 7, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 7, 2024
@petrochenkov
Copy link
Contributor

"failed to remove file" again.
@bors retry

@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 Sep 7, 2024
@bors
Copy link
Contributor

bors commented Sep 7, 2024

⌛ Testing commit 588dce1 with merge ec867f0...

@bors
Copy link
Contributor

bors commented Sep 7, 2024

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing ec867f0 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 7, 2024
@bors bors merged commit ec867f0 into rust-lang:master Sep 7, 2024
7 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Sep 7, 2024
This was referenced Sep 7, 2024
Merged
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (ec867f0): 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 (secondary 1.3%)

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)		 2.9% [2.1%, 3.8%] 3
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -3.7% [-3.7%, -3.7%] 1
All ❌✅ (primary) - - 0

Cycles

Results (primary 2.2%)

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)		 2.2% [2.2%, 2.2%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 2.2% [2.2%, 2.2%] 1

Binary size

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

Bootstrap: 757.755s -> 754.174s (-0.47%)
Artifact size: 341.04 MiB -> 341.04 MiB (0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

Assignees

@petrochenkov petrochenkov

Labels
F-fn_delegation `#![feature(fn_delegation)]` merged-by-bors This PR was explicitly merged by bors. 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
Milestone
1.83.0
Development

Successfully merging this pull request may close these issues.
6 participants
@Bryanskiy @rustbot @petrochenkov @rust-log-analyzer @bors @rust-timer