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.

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

fix: use BoundVars from current generic scope #13344

Merged
merged 1 commit into from
Oct 4, 2022

Conversation

lowr
Copy link
Contributor

@lowr lowr commented Oct 4, 2022

Fixup for #13335, addresses #13339 (comment)

Before the change in generic parameter order, BoundVars for trait reference didn't change whether you are in an impl's scope or in an associated item's scope. Now that item's generic params come before its parent's, we need to shift their indices when we are in an associated item's scope.

@lowr
Copy link
Contributor Author

lowr commented Oct 4, 2022

I ran analysis-stats on the four crates used in metrics and on std (no crash and no change in numbers), are there other crates I should ran it on?

@Veykril
Copy link
Member

Veykril commented Oct 4, 2022

I don't think so, thanks again!
@bors r+

@bors
Copy link
Contributor

bors commented Oct 4, 2022

📌 Commit ded3326 has been approved by Veykril

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Oct 4, 2022

⌛ Testing commit ded3326 with merge 52e2e8e...

bors added a commit that referenced this pull request Oct 4, 2022
fix: use `BoundVar`s from current generic scope

Fixup for #13335, addresses #13339 (comment)

Before the change in generic parameter order, `BoundVar`s for trait reference didn't change whether you are in an impl's scope or in an associated item's scope. Now that item's generic params come before its parent's, we need to shift their indices when we are in an associated item's scope.
@bors
Copy link
Contributor

bors commented Oct 4, 2022

☀️ Test successful - checks-actions
Approved by: Veykril
Pushing 52e2e8e to master...

@lnicola
Copy link
Member

lnicola commented Oct 4, 2022

Huh?

@bors retry

@bors
Copy link
Contributor

bors commented Oct 4, 2022

⌛ Testing commit ded3326 with merge d6ea986...

bors added a commit that referenced this pull request Oct 4, 2022
fix: use `BoundVar`s from current generic scope

Fixup for #13335, addresses #13339 (comment)

Before the change in generic parameter order, `BoundVar`s for trait reference didn't change whether you are in an impl's scope or in an associated item's scope. Now that item's generic params come before its parent's, we need to shift their indices when we are in an associated item's scope.
@Veykril
Copy link
Member

Veykril commented Oct 4, 2022

I believe this is due to me asking about the branch protection? https://rust-lang.zulipchat.com/#narrow/stream/242791-t-infra/topic/r-a.20branch.20protection

@bors
Copy link
Contributor

bors commented Oct 4, 2022

☀️ Test successful - checks-actions
Approved by: Veykril
Pushing d6ea986 to master...

@Veykril
Copy link
Member

Veykril commented Oct 4, 2022

Okay lets try after my approval now
@bors r+

@bors
Copy link
Contributor

bors commented Oct 4, 2022

💡 This pull request was already approved, no need to approve it again.

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.

@bors
Copy link
Contributor

bors commented Oct 4, 2022

📌 Commit ded3326 has been approved by Veykril

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Oct 4, 2022

⌛ Testing commit ded3326 with merge bf35441...

bors added a commit that referenced this pull request Oct 4, 2022
fix: use `BoundVar`s from current generic scope

Fixup for #13335, addresses #13339 (comment)

Before the change in generic parameter order, `BoundVar`s for trait reference didn't change whether you are in an impl's scope or in an associated item's scope. Now that item's generic params come before its parent's, we need to shift their indices when we are in an associated item's scope.
@lnicola
Copy link
Member

lnicola commented Oct 4, 2022

Maybe bors can't push to master now?

@bors
Copy link
Contributor

bors commented Oct 4, 2022

☀️ Test successful - checks-actions
Approved by: Veykril
Pushing bf35441 to master...

@Veykril
Copy link
Member

Veykril commented Oct 4, 2022

(it was manually granted permissions, lets sneak it by before the next sync)
@bors r+

@bors
Copy link
Contributor

bors commented Oct 4, 2022

💡 This pull request was already approved, no need to approve it again.

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.

@bors
Copy link
Contributor

bors commented Oct 4, 2022

📌 Commit ded3326 has been approved by Veykril

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Oct 4, 2022

⌛ Testing commit ded3326 with merge 476d043...

@bors
Copy link
Contributor

bors commented Oct 4, 2022

☀️ Test successful - checks-actions
Approved by: Veykril
Pushing 476d043 to master...

@bors bors merged commit 476d043 into rust-lang:master Oct 4, 2022
@lowr
Copy link
Contributor Author

lowr commented Oct 4, 2022

I'm pretty sure bors didn't like me breaking analysis-stats so bad 😭

Kidding, but I hope I fixed everything I broke!

@Veykril
Copy link
Member

Veykril commented Oct 4, 2022

It fixes everything we run at least, so we should have some decent coverage (only people doing type crimes will prove us wrong here now)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants