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

Create different inference variables for different defining uses of TAITs #86118

Merged
merged 18 commits into from
Jun 9, 2021
Merged

Create different inference variables for different defining uses of TAITs #86118

merged 18 commits into from
Jun 9, 2021

Conversation

spastorino
Copy link
Member

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 7, 2021
nikomatsakis
nikomatsakis approved these changes Jun 8, 2021
View reviewed changes
Copy link
Contributor

@nikomatsakis nikomatsakis left a comment

Choose a reason for hiding this comment

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

This is very nice :)

compiler/rustc_trait_selection/src/opaque_types.rs Show resolved Hide resolved
compiler/rustc_typeck/src/check/check.rs Outdated Show resolved Hide resolved
compiler/rustc_typeck/src/check/writeback.rs Outdated Show resolved Hide resolved
compiler/rustc_trait_selection/src/opaque_types.rs Outdated Show resolved Hide resolved
compiler/rustc_typeck/src/check/check.rs Outdated Show resolved Hide resolved
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jun 8, 2021

@nikomatsakis: 🔑 Insufficient privileges: Not in reviewers

@nikomatsakis
Copy link
Contributor

@rust-lang/infra huh?

@lqd
Copy link
Member

lqd commented Jun 8, 2021 •
edited
Loading

@nikomatsakis half of github is still down

@rust-log-analyzer

This comment has been minimized.

Sign in to view
nikomatsakis
nikomatsakis requested changes Jun 8, 2021
View reviewed changes
Copy link
Contributor

@nikomatsakis nikomatsakis left a comment

Choose a reason for hiding this comment

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

Left some style nits!

compiler/rustc_data_structures/src/vec_map.rs Outdated Show resolved Hide resolved
compiler/rustc_data_structures/src/vec_map.rs Outdated Show resolved Hide resolved
compiler/rustc_data_structures/src/vec_map.rs Outdated Show resolved Hide resolved
compiler/rustc_typeck/src/check/writeback.rs Outdated Show resolved Hide resolved
compiler/rustc_typeck/src/check/writeback.rs Outdated Show resolved Hide resolved
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jun 8, 2021

📌 Commit 7b1e1c7 has been approved by nikomatsakis

@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 Jun 8, 2021
@klensy
Copy link
Contributor

klensy commented Jun 8, 2021

This changes used data structures, so should(?) affect perf.

@nikomatsakis
Copy link
Contributor

nikomatsakis commented Jun 8, 2021 •
edited
Loading

@bors rollup=never

I am fairly confident this will not have an effect on perf, but it'd be good for any effect it MAY have to be isolated.

@bors
Copy link
Contributor

bors commented Jun 9, 2021

⌛ Testing commit 7b1e1c7 with merge c4b5406...

@bors
Copy link
Contributor

bors commented Jun 9, 2021

☀️ Test successful - checks-actions
Approved by: nikomatsakis
Pushing c4b5406 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 9, 2021
@bors bors merged commit c4b5406 into rust-lang:master Jun 9, 2021
@rustbot rustbot added this to the 1.54.0 milestone Jun 9, 2021
This was referenced Jun 10, 2021
Closed
Merged
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jun 21, 2021
@JohnTitor
Rollup merge of rust-lang#86248 - JohnTitor:issue-85113, r=Mark-Simul…
ac41056 
…acrum

Add a regression test for issue-85113

Fixed by rust-lang#86118, closes rust-lang#85113
@michaelwoerister michaelwoerister mentioned this pull request Jul 5, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nikomatsakis nikomatsakis nikomatsakis approved these changes

Assignees

@nikomatsakis nikomatsakis

Labels
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.
Projects
None yet
Milestone
1.54.0
Development

Successfully merging this pull request may close these issues.

Multiple defining uses of type alias impl trait in single function are not handled
8 participants
@spastorino @nikomatsakis @bors @lqd @rust-log-analyzer @klensy @rust-highfive @rustbot