Skip to content

Add const generics to the AST - #58191

Merged
bors merged 28 commits into
rust-lang:masterfrom
varkor:const-generics-ast
Feb 8, 2019
Merged

Add const generics to the AST#58191
bors merged 28 commits into
rust-lang:masterfrom
varkor:const-generics-ast

Conversation

@varkor

@varkorvarkor commented Feb 5, 2019•
edited
Loading

Copy link
Copy Markdown
Contributor

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-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 5, 2019
eddyb
eddyb reviewed Feb 5, 2019
View reviewed changes
Comment threadsrc/librustc_save_analysis/sig.rs Outdated
@eddyb

eddyb commented Feb 5, 2019

Copy link
Copy Markdown
Contributor

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

@rust-highfive

This comment has been minimized.

Sign in to view
@rust-highfive

This comment has been minimized.

Sign in to view
@bors

bors commented Feb 6, 2019

Copy link
Copy Markdown
Collaborator

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

petrochenkov
petrochenkov reviewed Feb 6, 2019
View reviewed changes
Comment threadsrc/test/ui/issues/issue-20616-3.rs Outdated
petrochenkov
petrochenkov reviewed Feb 6, 2019
View reviewed changes
Comment threadsrc/libsyntax/parse/parser.rs Outdated
petrochenkov
petrochenkov reviewed Feb 6, 2019
View reviewed changes
Comment threadsrc/libsyntax/parse/parser.rs Outdated
petrochenkov
petrochenkov reviewed Feb 6, 2019
View reviewed changes
Comment threadsrc/libsyntax/parse/parser.rs Outdated
petrochenkov
petrochenkov reviewed Feb 6, 2019
View reviewed changes
Comment threadsrc/libsyntax/parse/parser.rs Outdated
petrochenkov
petrochenkov reviewed Feb 6, 2019
View reviewed changes
Comment threadsrc/libsyntax/parse/parser.rs Outdated
petrochenkov
petrochenkov reviewed Feb 6, 2019
View reviewed changes
Comment threadsrc/libsyntax/parse/parser.rs Outdated
petrochenkov
petrochenkov reviewed Feb 6, 2019
View reviewed changes
Comment threadsrc/librustc_resolve/lib.rs Outdated
petrochenkov
petrochenkov reviewed Feb 6, 2019
View reviewed changes
Comment threadsrc/librustc_resolve/lib.rs Outdated
petrochenkov
petrochenkov reviewed Feb 6, 2019
View reviewed changes
Comment threadsrc/librustc_resolve/lib.rs Outdated
@petrochenkov

petrochenkov commented Feb 6, 2019

Copy link
Copy Markdown
Contributor

Reviewed.

@petrochenkovpetrochenkov 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

bors commented Feb 7, 2019

Copy link
Copy Markdown
Collaborator

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

@rust-highfive

This comment has been minimized.

Sign in to view
petrochenkov
petrochenkov reviewed Feb 7, 2019
View reviewed changes
Comment threadsrc/libsyntax/parse/token.rs Outdated
petrochenkov
petrochenkov reviewed Feb 7, 2019
View reviewed changes
Comment threadsrc/libsyntax/parse/parser.rs Outdated
petrochenkov
petrochenkov reviewed Feb 7, 2019
View reviewed changes
Comment threadsrc/librustc_resolve/lib.rs Outdated
@bors

bors commented Feb 8, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit f2fe71c with merge 8716dd57aa1479389df1fda43caeb7d1eb1ae600...

@crlf0710crlf0710 mentioned this pull request Feb 8, 2019
Merged
@bors

bors commented Feb 8, 2019

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-travis

@rust-highfive

rust-highfive commented Feb 8, 2019

Copy link
Copy Markdown
Contributor

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)

@borsbors 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

kennytm commented Feb 8, 2019•
edited
Loading

Copy link
Copy Markdown
Member

@bors retry p=88

@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-review Status: Awaiting review from the assignee but also interested parties. labels Feb 8, 2019
@bors

bors commented Feb 8, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit f2fe71c with merge 43e04fb...

bors added a commit that referenced this pull request Feb 8, 2019
@bors
Auto merge of#58191- varkor:const-generics-ast, r=petrochenkov
43e04fb
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

bors commented Feb 8, 2019

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Feb 8, 2019
@bors
bors merged commit f2fe71c into rust-lang:masterFeb 8, 2019
@borsbors mentioned this pull request Feb 8, 2019
Closed
@varkor
varkor deleted the const-generics-ast branch February 8, 2019 15:22
@varkorvarkor mentioned this pull request Feb 8, 2019
Closed
@h-michaelh-michael mentioned this pull request Feb 9, 2019
Merged
bors added a commit to rust-lang/rust-clippy that referenced this pull request Feb 9, 2019
@bors
Auto merge of#3750- h-michael:const-params, r=phansch
35e2e1b
Fix failing build (adding new Hir::Def type ConstParam)
solves: #3749
related with:
- https://travis-ci.com/rust-lang/rust-clippy/jobs/176480646
- rust-lang/rust#58191
- rust-lang/rust@29f7206#diff-c1e317a81486d937bbfc6edca1dee92aR55
@phanschphansch mentioned this pull request Feb 10, 2019
Merged
@topecongirotopecongiro mentioned this pull request Feb 11, 2019
Closed
@ZhangHanDongZhangHanDong mentioned this pull request Feb 12, 2019
Open
@davidtwcodavidtwco mentioned this pull request Mar 30, 2019
Closed
@varkorvarkor mentioned this pull request May 2, 2019
Closed
16 tasks
This was referenced Jun 28, 2019
Open
Open
ehuss added a commit to ehuss/reference that referenced this pull request Jan 6, 2021
@ehuss
Update grammar for order of parameters/arguments.
8511cf4
Generic param order restriction was changed in rust-lang/rust#58191.
Generic argument order restriction was changed in rust-lang/rust#70261.
`for` lifetime argument restriction was changed in rust-lang/rust#48326.
Generic parameter parsing: https://github.com/rust-lang/rust/blob/206ee1eea3467fd1d7f1efdbeafe27880897bb2c/compiler/rustc_parse/src/parser/generics.rs#L83-L153
Generic argument parsing: https://github.com/rust-lang/rust/blob/17eec1433c69972844dd228b5fe801f218e118c3/compiler/rustc_parse/src/parser/path.rs#L395-L413
`for` argument parsing: https://github.com/rust-lang/rust/blob/206ee1eea3467fd1d7f1efdbeafe27880897bb2c/compiler/rustc_parse/src/parser/ty.rs#L724-L736Fixesrust-lang#785
@ehussehuss mentioned this pull request Jan 6, 2021
Merged
wsh pushed a commit to wsh/rust-reference that referenced this pull request Jan 17, 2021
@ehuss@wsh
Update grammar for order of parameters/arguments.
d79ee62
Generic param order restriction was changed in rust-lang/rust#58191.
Generic argument order restriction was changed in rust-lang/rust#70261.
`for` lifetime argument restriction was changed in rust-lang/rust#48326.
Generic parameter parsing: https://github.com/rust-lang/rust/blob/206ee1eea3467fd1d7f1efdbeafe27880897bb2c/compiler/rustc_parse/src/parser/generics.rs#L83-L153
Generic argument parsing: https://github.com/rust-lang/rust/blob/17eec1433c69972844dd228b5fe801f218e118c3/compiler/rustc_parse/src/parser/path.rs#L395-L413
`for` argument parsing: https://github.com/rust-lang/rust/blob/206ee1eea3467fd1d7f1efdbeafe27880897bb2c/compiler/rustc_parse/src/parser/ty.rs#L724-L736Fixesrust-lang#785
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@petrochenkovpetrochenkovpetrochenkov left review comments
+1 more reviewer
@eddybeddybeddyb left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@petrochenkovpetrochenkov

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@varkor@eddyb@rust-highfive@bors@petrochenkov@Mark-Simulacrum@kennytm