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 broken assertion in type_param #46722

Merged
merged 1 commit into from
Dec 16, 2017
Merged

Conversation

arielb1
Copy link
Contributor

@arielb1 arielb1 commented Dec 14, 2017

Nested generics (aka method generics) in trait methods don't have an
additional Self parameter in their own type parameter list (they have
a Self parameter in the parent generics), so don't try to check we're
correctly adjusting for it.

Fixes #46568.

r? @eddyb

Nested generics (aka method generics) in trait methods don't have an
*additional* Self parameter in their own type parameter list (they have
a Self parameter in the parent generics), so don't try to check we're
correctly adjusting for it.

Fixes rust-lang#46568.
@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 14, 2017
@eddyb
Copy link
Member

eddyb commented Dec 14, 2017

@bors r+

@bors
Copy link
Contributor

bors commented Dec 14, 2017

📌 Commit 2679944 has been approved by eddyb

@kennytm kennytm 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 Dec 14, 2017
@bors
Copy link
Contributor

bors commented Dec 16, 2017

⌛ Testing commit 2679944 with merge bdae618...

bors added a commit that referenced this pull request Dec 16, 2017
fix broken assertion in type_param

Nested generics (aka method generics) in trait methods don't have an
*additional* Self parameter in their own type parameter list (they have
a Self parameter in the parent generics), so don't try to check we're
correctly adjusting for it.

Fixes #46568.

r? @eddyb
@bors
Copy link
Contributor

bors commented Dec 16, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: eddyb
Pushing bdae618 to master...

@bors bors merged commit 2679944 into rust-lang:master Dec 16, 2017
cuviper added a commit to cuviper/rust that referenced this pull request May 8, 2023
This reverts rust-lang#46722, commit e0ab5d5.

Since rust-lang#111167, commit 10b69dd, we are
generating DWARF subprograms in a way that is meant to be more compatible
with LLVM's expectations, so hopefully we don't need this workaround
rewriting CUs anymore.
bors added a commit to rust-lang-ci/rust that referenced this pull request May 18, 2023
Remove the ThinLTO CU hack

This reverts rust-lang#46722, commit e0ab5d5.

Since rust-lang#111167, commit 10b69dd, we are
generating DWARF subprograms in a way that is meant to be more compatible
with LLVM's expectations, so hopefully we don't need this workaround
rewriting CUs anymore.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants