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

Add const generics to the AST #58191

Merged
merged 28 commits into from
Feb 8, 2019
Merged

Conversation

varkor
Copy link
Member

@varkor varkor commented Feb 5, 2019

This is mostly split out from #53645 in an effort to make progress merging const generics piecewise instead of in one go. This work is a collaborative effort with @yodaldevoid.

cc @petrochenkov

r? @eddyb

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 5, 2019
@eddyb
Copy link
Member

eddyb commented Feb 5, 2019

r? @petrochenkov (r=me after all concerns are dealt with)

@rust-highfive rust-highfive assigned petrochenkov and unassigned eddyb Feb 5, 2019
@rust-highfive

This comment has been minimized.

@rust-highfive

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Feb 6, 2019

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

@petrochenkov
Copy link
Contributor

Reviewed.

@petrochenkov petrochenkov 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 Feb 6, 2019
@bors
Copy link
Contributor

bors commented Feb 7, 2019

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

@rust-highfive

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Feb 8, 2019

⌛ Testing commit f2fe71c with merge 8716dd57aa1479389df1fda43caeb7d1eb1ae600...

@bors
Copy link
Contributor

bors commented Feb 8, 2019

💔 Test failed - checks-travis

@rust-highfive
Copy link
Collaborator

The job dist-x86_64-apple of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
[00:03:48]       Memory: 8 GB
[00:03:48]       Boot ROM Version: VMW71.00V.7581552.B64.1801142334
[00:03:48]       Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
[00:03:48]       SMC Version (system): 2.8f0
[00:03:48]       Serial Number (system): VMOWGC9ivnQ3
[00:03:48] 
[00:03:48] hw.ncpu: 4
[00:03:48] hw.byteorder: 1234
[00:03:48] hw.memsize: 8589934592
---
[02:49:20] travis_time:end:stage2-cargo-miri:start=1549599597009705000,finish=1549599597664836000,duration=655131000

[02:49:20] [TIMING] ToolBuild { compiler: Compiler { stage: 2, host: "x86_64-apple-darwin" }, target: "x86_64-apple-darwin", tool: "cargo-miri", path: "src/tools/miri", mode: ToolRustc, is_optional_tool: true, source_type: Submodule, extra_features: [] } -- 0.687
[02:49:21] [TIMING] Miri { stage: 2, target: "x86_64-apple-darwin" } -- 1.412
The job exceeded the maximum time limit for jobs, and has been terminated.

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 @TimNN. (Feature Requests)

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 8, 2019
@kennytm
Copy link
Member

kennytm commented Feb 8, 2019

@bors retry p=88

@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 Feb 8, 2019
@bors
Copy link
Contributor

bors commented Feb 8, 2019

⌛ Testing commit f2fe71c with merge 43e04fb...

bors added a commit that referenced this pull request Feb 8, 2019
Add const generics to the AST

This is mostly split out from #53645 in an effort to make progress merging const generics piecewise instead of in one go.

cc @yodaldevoid, @petrochenkov

r? @eddyb
@bors
Copy link
Contributor

bors commented Feb 8, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: petrochenkov
Pushing 43e04fb to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 8, 2019
@bors bors merged commit f2fe71c into rust-lang:master Feb 8, 2019
@varkor varkor deleted the const-generics-ast branch February 8, 2019 15:22
bors added a commit to rust-lang/rust-clippy that referenced this pull request Feb 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

7 participants