Add const generics to ty (and transitive dependencies) #58583

varkor · 2019-02-20T01:24:26Z

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

src/librustc/ty/subst.rs

src/test/ui/const-generics/const-expression-parameter.rs

bors · 2019-02-21T00:21:13Z

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

oli-obk

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

src/librustc_mir/monomorphize/collector.rs

Co-Authored-By: Gabriel Smith <[email protected]>

Centril · 2019-03-06T19:25:42Z

@bors retry

bors · 2019-03-06T19:25:54Z

⌛ Testing commit de4478a with merge 8df8213...

@yodaldevoid

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 · 2019-03-06T22:26:49Z

💔 Test failed - checks-travis

rust-highfive · 2019-03-06T22:26:50Z

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)

Centril · 2019-03-06T22:28:04Z

@bors retry

bors · 2019-03-06T22:28:17Z

⌛ Testing commit de4478a with merge 2a9ce18be766200170f6af7c038b0964c75a8e14...

pietroalbini · 2019-03-06T22:31:24Z

@bors retry

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

bors · 2019-03-06T22:34:21Z

⌛ Testing commit de4478a with merge 947aa2e7a5022d819974d4e932092e0e985402a2...

pietroalbini · 2019-03-06T22:34:33Z

@bors retry

bors · 2019-03-07T00:27:16Z

⌛ Testing commit de4478a with merge 88f755f...

@yodaldevoid

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 · 2019-03-07T03:28:49Z

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

src/librustc_mir/monomorphize/collector.rs

rust-highfive assigned eddyb Feb 20, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 20, 2019

varkor mentioned this pull request Feb 20, 2019

The Genesis of Generic Germination #53645

Merged

oli-obk reviewed Feb 20, 2019

View reviewed changes

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

varkor mentioned this pull request Mar 2, 2019

let a: Vec<&str, "aaa"> = Vec::new(); emits internal compiler error #58811

Closed

oli-obk requested changes Mar 5, 2019

View reviewed changes

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

Add Const generic param to ty

62f23c2

Co-Authored-By: Gabriel Smith <[email protected]>

Add ParamConst

11c31bb

Co-Authored-By: Gabriel Smith <[email protected]>

Add ConstVid

a36d386

Co-Authored-By: Gabriel Smith <[email protected]>

Add InferConst

8cbbbaa

Co-Authored-By: Gabriel Smith <[email protected]>

Add type_flags helper methods to consts

386e9fb

Co-Authored-By: Gabriel Smith <[email protected]>

Use non_erasable_generics for codegen

2ce19ae

Co-Authored-By: Gabriel Smith <[email protected]>

Take const generics into account when monomorphising

691d054

Co-Authored-By: Gabriel Smith <[email protected]>

Add const kind and UnpackedKind::Const

1ebc858

Co-Authored-By: Gabriel Smith <[email protected]>

Add ConstValue::Param and ConstValue::Infer

7f2a4f7

Co-Authored-By: Gabriel Smith <[email protected]>

Add type constraints from const parameters

f7f60ee

Co-Authored-By: Gabriel Smith <[email protected]>

Update diagnostics to include const parameters

73a6df6

Co-Authored-By: Gabriel Smith <[email protected]>

Implement Hash for new types

9a9aa5b

Co-Authored-By: Gabriel Smith <[email protected]>

Stub methods in infer

63b7572

Co-Authored-By: Gabriel Smith <[email protected]>

Take const into account in context

29c272d

Co-Authored-By: Gabriel Smith <[email protected]>

Add const type flags

cbf5d22

Co-Authored-By: Gabriel Smith <[email protected]>

Pretty printing for const generics

0d1c9c0

Co-Authored-By: Gabriel Smith <[email protected]>

Make a lazy const from a const param

f761c41

Co-Authored-By: Gabriel Smith <[email protected]>

Add ast_const_to_const

f7cd97f

Co-Authored-By: Gabriel Smith <[email protected]>

Refactor compare_method

a8361eb

Co-Authored-By: Gabriel Smith <[email protected]>

Implement wfcheck for const parameters

3001ae7

Co-Authored-By: Gabriel Smith <[email protected]>

Implement collect for const parameters

eb2b8be

Co-Authored-By: Gabriel Smith <[email protected]>

Stub rustdoc const generics implementations

fc0fbe8

Co-Authored-By: Gabriel Smith <[email protected]>

Add HAS_CT_INFER

133e776

Co-Authored-By: Gabriel Smith <[email protected]>

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

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 added the merged-by-bors This PR was explicitly merged by bors. label Mar 7, 2019

bors merged commit de4478a into rust-lang:master Mar 7, 2019

This was referenced Mar 7, 2019

overhaul unused doc comments lint #57882

Merged

HirIdification: almost there #58915

Merged

eddyb reviewed Mar 13, 2019

View reviewed changes

src/librustc_mir/monomorphize/collector.rs Show resolved Hide resolved

eddyb reviewed Mar 13, 2019

View reviewed changes

src/librustc_mir/monomorphize/collector.rs Show resolved Hide resolved

eddyb reviewed Mar 13, 2019

View reviewed changes

src/librustc_mir/monomorphize/collector.rs Show resolved Hide resolved

varkor deleted the const-generics-ty branch April 17, 2019 22:12

varkor mentioned this pull request May 2, 2019

Tracking issue for const generics (RFC 2000) #44580

Closed

16 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add const generics to ty (and transitive dependencies) #58583

Add const generics to ty (and transitive dependencies) #58583

varkor commented Feb 20, 2019

bors commented Feb 21, 2019

oli-obk left a comment

Centril commented Mar 6, 2019

bors commented Mar 6, 2019

bors commented Mar 6, 2019

rust-highfive commented Mar 6, 2019

Centril commented Mar 6, 2019

bors commented Mar 6, 2019

pietroalbini commented Mar 6, 2019

bors commented Mar 6, 2019

pietroalbini commented Mar 6, 2019

bors commented Mar 7, 2019

bors commented Mar 7, 2019

Add const generics to ty (and transitive dependencies) #58583

Add const generics to ty (and transitive dependencies) #58583

Conversation

varkor commented Feb 20, 2019

bors commented Feb 21, 2019

oli-obk left a comment

Choose a reason for hiding this comment

Centril commented Mar 6, 2019

bors commented Mar 6, 2019

bors commented Mar 6, 2019

rust-highfive commented Mar 6, 2019

Centril commented Mar 6, 2019

bors commented Mar 6, 2019

pietroalbini commented Mar 6, 2019

bors commented Mar 6, 2019

pietroalbini commented Mar 6, 2019

bors commented Mar 7, 2019

bors commented Mar 7, 2019