Skip to content

The Genesis of Generic Germination - #53645

Merged
bors merged 8 commits into
rust-lang:masterfrom
varkor:const-generics-redux
May 6, 2019
Merged

The Genesis of Generic Germination#53645
bors merged 8 commits into
rust-lang:masterfrom
varkor:const-generics-redux

Conversation

@varkor

Copy link
Copy Markdown
Contributor

Long had its coming been foretold: a collaborative effort with @yodaldevoid, set in motion by @jplatte, to beget a new Kind: one of a very different Sort to those that come before it. Amidst promises of ineffable powers previously thought unobtainable, few dared believe that the prophecies were true. But as they gazed upon that which claimed to be the Beginning, a few gentle sparks of hope fluttered deep within. It was not Time yet. But it was a Sign. And maybe, for some, that was enough.

There's a long way to go, but we're at the point where we would benefit from GitHub's reviewing capabilities.

r? @eddyb

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 23, 2018
@rust-highfive

This comment has been minimized.

@bors

bors commented Aug 24, 2018

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #53662) made this pull request unmergeable. Please resolve the merge conflicts.

@kennytm

Copy link
Copy Markdown
Member

(Somehow I read the title as "Genesis of Germanic Germination" and thought why we're adding i18n into rustc itself 😐)

@petrochenkovpetrochenkov self-assigned this Aug 28, 2018
Comment threadsrc/librustc/hir/mod.rs
Comment threadsrc/libsyntax/parse/parser.rs Outdated
Comment threadsrc/libsyntax/parse/parser.rs Outdated
Comment threadsrc/libsyntax/parse/parser.rs Outdated
Comment threadsrc/libsyntax/parse/parser.rs Outdated
// parsing problem. Either mark all const args with const (or
// something else, it doesn't really matter) or merge const args
// and type args together at the AST level and separate them
// later on, probably when lowering to the HIR.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

If S<MY_CONST> is supposed to work, then it can use same approach as identifiers in patterns.
In AST it's PatKind::Ident, but in HIR it's turned into a proper pattern based on resolution, for const arguments it would be something like ast::GenericArg::Ident.
I agree this is not necessary to do in this PR though.

Comment threadsrc/libsyntax/parse/parser.rs Outdated
Comment threadsrc/libsyntax/parse/token.rs
@petrochenkovpetrochenkov removed their assignment Sep 1, 2018
@varkor

Copy link
Copy Markdown
ContributorAuthor

(Note for triage: I'm going to get around to addressing these comments and hopefully fixing the existing crashes soon.)

@TimNNTimNN 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 Sep 11, 2018
@TimNN

Copy link
Copy Markdown
Contributor

Ping from triage! Since it's been I while, I was wondering if you could give us a small update on the status of this PR?

@varkor

Copy link
Copy Markdown
ContributorAuthor

I'm going to start investigating the ICE again soon (been busier than I expected). I think @eddyb's going to be leaving some comments soon as well.

@TimNN

Copy link
Copy Markdown
Contributor

Ping from triage! Since it's been I while, I was wondering if you could give us a small update on the status of this PR?

@varkor

Copy link
Copy Markdown
ContributorAuthor

I've made progress in my local branch since last time, though not quite ready to push. I think a full review will be unlikely before the 2018 edition though, as things are getting busy close to the deadline.

@varkor
varkorforce-pushed the const-generics-redux branch from f0bae41 to bfc4b41CompareOctober 16, 2018 22:49
@TimNN

Copy link
Copy Markdown
Contributor

@vakor: Thanks for the update!

@TimNNTimNN added the A-allocators Area: Custom and system allocators label Oct 30, 2018
varkorand others added 4 commits May 6, 2019 13:55
Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>
Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>
Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>
Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>
@varkor
varkorforce-pushed the const-generics-redux branch from ed69aa2 to 32965a7CompareMay 6, 2019 13:20
@varkorvarkor changed the title [WIP] The Genesis of Generic GerminationThe Genesis of Generic GerminationMay 6, 2019
@varkor

Copy link
Copy Markdown
ContributorAuthor

I've resolved several remaining FIXMEs. Let's leave it there and resolve the remaining issues in separate pull requests.

r? @eddyb

Comment threadsrc/librustc/infer/canonical/query_response.rs Outdated
Comment threadsrc/librustc/infer/canonical/query_response.rs Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This whole infrastructure should be rewritten to use ty::print, can you open an issue about that?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Opened #60582.

@mark-i-m

Copy link
Copy Markdown
Contributor

But as they gazed upon that which claimed to be the Beginning,

it was rebased, the inevitable conclusion of all epic journeys in the land of git. And thus concluded the Genesis of Generic Germination.

varkorand others added 2 commits May 6, 2019 14:58
Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>
@varkor
varkorforce-pushed the const-generics-redux branch from 32965a7 to 9a2772aCompareMay 6, 2019 14:07
@eddyb

eddyb commented May 6, 2019

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented May 6, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 9a2772a has been approved by eddyb

@borsbors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 6, 2019
@bors

bors commented May 6, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 9a2772a with merge a19cf18...

bors added a commit that referenced this pull request May 6, 2019
The Genesis of Generic Germination
*Long had its coming been foretold: a collaborative effort with @yodaldevoid, set in motion by @jplatte, to beget a new Kind: one of a very different Sort to those that come before it. Amidst promises of ineffable powers previously thought unobtainable, few dared believe that the prophecies were true. But as they gazed upon that which claimed to be the Beginning, a few gentle sparks of hope fluttered deep within. It was not Time yet. But it was a Sign. And maybe, for some, that was enough.*
There's a long way to go, but we're at the point where we would benefit from GitHub's reviewing capabilities.
r? @eddyb
@bors

bors commented May 6, 2019

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label May 6, 2019
@bors
bors merged commit 9a2772a into rust-lang:masterMay 6, 2019
@rust-highfive

Copy link
Copy Markdown
Contributor

📣 Toolstate changed by #53645!

Tested on commit a19cf18.
Direct link to PR: #53645

💔 rls on windows: test-pass → test-fail (cc @Xanewok, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request May 6, 2019
Tested on commit rust-lang/rust@a19cf18.
Direct link to PR: <rust-lang/rust#53645>
💔 rls on windows: test-pass → test-fail (cc @Xanewok, @rust-lang/infra).
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: 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.

20 participants

@varkor@rust-highfive@bors@kennytm@TimNN@andreytkachenko@eddyb@Mark-Simulacrum@nikomatsakis@XAMPPRocky@felix91gr@mark-i-m@Dylan-DPC-zz@petrochenkov@yodaldevoid@lifeforfun@crlf0710@leonardo-m@lovesegfault@oli-obk