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 ty (and transitive dependencies) #58583

Merged
merged 34 commits into from
Mar 7, 2019

Conversation

varkor
Copy link
Member

@varkor varkor commented Feb 20, 2019

Split out from #53645. This work is a collaborative effort with @yodaldevoid.

There are a number of stubs. Some I plan to leave for the next PRs (e.g. infer and rustdoc). Others I can either fix up in this PR, or as follow ups (which would avoid the time-consuming rebasing).

It was a little hard to split this up, as so much depends on ty and friends. Apologies for the large diff.

r? @eddyb

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 20, 2019
src/librustc/ty/subst.rs Show resolved Hide resolved
src/librustc/ty/subst.rs Show resolved Hide resolved
src/test/ui/const-generics/const-expression-parameter.rs Outdated Show resolved Hide resolved
@bors
Copy link
Contributor

bors commented Feb 21, 2019

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

Copy link
Contributor

@oli-obk oli-obk left a comment

Choose a reason for hiding this comment

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

I think a bunch of the Evaluated handlings are "wrong" (in the sense that we could panic or delay_span_bug in the unevaluated case instead of just producing some value or skipping the value), but it's probably going to lead to weird diagnostics at worst and can be addressed together with the folding LazyConst back into ty::Const

can you rebase the PR? I'll try to re-review it fast before it bitrots again.

r? @oli-obk

src/librustc_mir/interpret/operand.rs Outdated Show resolved Hide resolved
src/librustc_mir/monomorphize/collector.rs Outdated Show resolved Hide resolved
varkor and others added 23 commits March 5, 2019 22:07
Co-Authored-By: Gabriel Smith <[email protected]>
Co-Authored-By: Gabriel Smith <[email protected]>
Co-Authored-By: Gabriel Smith <[email protected]>
Co-Authored-By: Gabriel Smith <[email protected]>
Co-Authored-By: Gabriel Smith <[email protected]>
Co-Authored-By: Gabriel Smith <[email protected]>
Co-Authored-By: Gabriel Smith <[email protected]>
Co-Authored-By: Gabriel Smith <[email protected]>
Co-Authored-By: Gabriel Smith <[email protected]>
Co-Authored-By: Gabriel Smith <[email protected]>
@Centril
Copy link
Contributor

Centril commented Mar 6, 2019

@bors retry

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

bors commented Mar 6, 2019

⌛ Testing commit de4478a with merge 8df8213...

bors added a commit that referenced this pull request Mar 6, 2019
Add const generics to ty (and transitive dependencies)

Split out from #53645. This work is a collaborative effort with @yodaldevoid.

There are a number of stubs. Some I plan to leave for the next PRs (e.g. `infer` and `rustdoc`). Others I can either fix up in this PR, or as follow ups (which would avoid the time-consuming rebasing).

It was a little hard to split this up, as so much depends on ty and friends. Apologies for the large diff.

r? @eddyb
@bors
Copy link
Contributor

bors commented Mar 6, 2019

💔 Test failed - checks-travis

@rust-highfive
Copy link
Collaborator

The job i686-gnu 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.
[02:57:14] [RUSTC-TIMING] parking_lot_core test:false 3.258
[02:57:14]    Compiling parking_lot v0.7.1
[02:57:16] [RUSTC-TIMING] parking_lot test:false 1.772
[02:57:16]    Compiling rustdoc v0.0.0 (/checkout/src/librustdoc)
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 Mar 6, 2019
@Centril
Copy link
Contributor

Centril commented Mar 6, 2019

@bors retry

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

bors commented Mar 6, 2019

⌛ Testing commit de4478a with merge 2a9ce18be766200170f6af7c038b0964c75a8e14...

@pietroalbini
Copy link
Member

@bors retry

You're not gonna land anyway, so...

@bors
Copy link
Contributor

bors commented Mar 6, 2019

⌛ Testing commit de4478a with merge 947aa2e7a5022d819974d4e932092e0e985402a2...

@pietroalbini
Copy link
Member

@bors retry

@bors
Copy link
Contributor

bors commented Mar 7, 2019

⌛ Testing commit de4478a with merge 88f755f...

bors added a commit that referenced this pull request Mar 7, 2019
Add const generics to ty (and transitive dependencies)

Split out from #53645. This work is a collaborative effort with @yodaldevoid.

There are a number of stubs. Some I plan to leave for the next PRs (e.g. `infer` and `rustdoc`). Others I can either fix up in this PR, or as follow ups (which would avoid the time-consuming rebasing).

It was a little hard to split this up, as so much depends on ty and friends. Apologies for the large diff.

r? @eddyb
@bors
Copy link
Contributor

bors commented Mar 7, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk
Pushing 88f755f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 7, 2019
@bors bors merged commit de4478a into rust-lang:master Mar 7, 2019
@varkor varkor deleted the const-generics-ty branch April 17, 2019 22:12
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.

8 participants