Fix ICE with struct ctors and const generics.#60839
Merged
bors merged 1 commit intorust-lang:masterfrom May 30, 2019
Merged
Conversation
rust-highfive
added
the
S-waiting-on-review
varkor
reviewed
May 14, 2019
varkor
reviewed
May 14, 2019
varkor
reviewed
May 14, 2019
varkor
approved these changes
May 14, 2019
varkor
added
S-blocked
Contributor
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
davidtwco
force-pushed
the
const-generics-struct-ctor
branch
from
6e04be0 to
b21b9c3
Compare
Member
Author
|
I've force-pushed some changes, resolving the review feedback. This will still fail CI on the expected test. |
Contributor
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
Contributor
|
With #60742 merged, this should no longer be blocked. |
This commit fixes a ICE where struct constructors were resulting in an ICE with const generics. Previously, a `match` in `type_of` did not have an arm for the `DefKind::Ctor` resolutions and therefore would assume that the type did not have generics.
davidtwco
force-pushed
the
const-generics-struct-ctor
branch
from
b21b9c3 to
41aaf7b
Compare
Member
Author
|
I've pushed a version rebased atop #60742 which was merged, this should now pass CI. |
Contributor
|
r=me once Travis passes. |
Contributor
|
Travis passed, this should be ready to roll. |
Contributor
|
@bors r+ |
Collaborator
|
📌 Commit 41aaf7b has been approved by |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
May 30, 2019
…r, r=varkor Fix ICE with struct ctors and const generics. Fixes rust-lang#60818. r? @varkor
Centril
added a commit
to Centril/rust
that referenced
this pull request
May 30, 2019
…r, r=varkor Fix ICE with struct ctors and const generics. Fixes rust-lang#60818. r? @varkor
bors
added a commit
that referenced
this pull request
May 30, 2019
Rollup of 11 pull requests Successful merges: - #60802 (upgrade rustdoc's `pulldown-cmark` to 0.5.2) - #60839 (Fix ICE with struct ctors and const generics.) - #60850 (Stabilize RefCell::try_borrow_unguarded) - #61231 (Fix linkage diagnostic so it doesn't ICE for external crates) - #61244 (Box::into_vec: use Box::into_raw instead of mem::forget) - #61279 (implicit `Option`-returning doctests) - #61280 (Revert "Disable solaris target since toolchain no longer builds") - #61284 (Update all s3 URLs used on CI with subdomains) - #61321 (libsyntax: introduce 'fn is_keyword_ahead(dist, keywords)'.) - #61322 (ci: display more debug information in the init_repo script) - #61333 (Fix ICE with APIT in a function with a const parameter) Failed merges: - #61304 (Speed up Azure CI installing Windows dependencies) r? @ghost
bors
added a commit
that referenced
this pull request
May 30, 2019
Rollup of 11 pull requests Successful merges: - #60802 (upgrade rustdoc's `pulldown-cmark` to 0.5.2) - #60839 (Fix ICE with struct ctors and const generics.) - #60850 (Stabilize RefCell::try_borrow_unguarded) - #61231 (Fix linkage diagnostic so it doesn't ICE for external crates) - #61244 (Box::into_vec: use Box::into_raw instead of mem::forget) - #61279 (implicit `Option`-returning doctests) - #61280 (Revert "Disable solaris target since toolchain no longer builds") - #61284 (Update all s3 URLs used on CI with subdomains) - #61321 (libsyntax: introduce 'fn is_keyword_ahead(dist, keywords)'.) - #61322 (ci: display more debug information in the init_repo script) - #61333 (Fix ICE with APIT in a function with a const parameter) Failed merges: - #61304 (Speed up Azure CI installing Windows dependencies) r? @ghost
16 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #60818.
r? @varkor