Add const generics to the HIR #58503

varkor · 2019-02-15T22:29:51Z

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

r? @eddyb

Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>

petrochenkov · 2019-02-16T06:13:06Z

src/librustc/hir/mod.rs

+#[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
+pub struct ConstArg {
+    pub value: AnonConst,
+    pub span: Span,


This span is identical to the span in body of AnonConst, is it viable to use it instead?
Other AnonConsts don't create extra spans during lowering as far as can I see.

(The whole ConstArg could be refactored away in that case.)

Ugh, I see GenericArg::span wants to work in isolation without any contexts.

Yeah, we went through the same thought process when this was implemented. If you can see a way to refactor this, I'd be all ears.

src/librustc_typeck/collect.rs

petrochenkov · 2019-02-16T06:33:20Z

LGTM, r=me modulo removing abort / adding lint test (#58503 (comment)).

I'll keep @eddyb assigned in case he wants to look.

varkor · 2019-02-16T14:48:04Z

@bors r=petrochenkov p=1

(Increasing priority because this unblocks other work.)

bors · 2019-02-16T14:48:04Z

📌 Commit 727e204 has been approved by petrochenkov

bors · 2019-02-17T00:54:13Z

⌛ Testing commit 727e204 with merge 3cdf81e0294cfe7414af2cae07bd3e82d1975058...

Centril · 2019-02-17T00:55:02Z

@bors retry

eddyb · 2019-02-17T05:33:46Z

src/librustc_metadata/encoder.rs

@@ -1684,6 +1707,11 @@ impl<'a, 'b, 'tcx> IndexBuilder<'a, 'b, 'tcx> {
                    let encode_info = IsolatedEncoder::encode_info_for_ty_param;
                    self.record(def_id, encode_info, (def_id, has_default));
                }
+                hir::GenericParamKind::Const { .. } => {
+                    let def_id = self.tcx.hir().local_def_id(param.id);
+                    let encode_info = IsolatedEncoder::encode_info_for_const_param;


Maybe open an issue about unifying the param encoding in metadata, the same way GenericParamDef has common fields?

Opened #58581.

bors · 2019-02-19T00:46:18Z

⌛ Testing commit 727e204 with merge 32471f7...

@yodaldevoid

Add const generics to the HIR Split out from #53645. cc @yodaldevoid r? @eddyb

bors · 2019-02-19T03:28:07Z

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

@eddyb

…tor, r=eddyb Refactor generic parameter encoder functions Addresses rust-lang#58503 (comment). r? @eddyb

@eddyb

…tor, r=eddyb Refactor generic parameter encoder functions Addresses rust-lang#58503 (comment). r? @eddyb

varkor and others added 9 commits February 15, 2019 22:28

Add Const kind to HIR

725ba96

Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>

Add pretty-printing for const generics

d44030d

Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>

Move const generic error from lowering to collect

9a5f7b1

Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>

Add Const kind to rustdoc

475f20c

Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>

Add E0111

ddf8811

Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>

Take Const into account in HIR

7f3c6d7

Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>

Drive-by cleanup

10602f1

Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>

Take Const into account with nonstandard style lint

2279907

Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>

Update tests

9cfdb80

Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>

rust-highfive assigned eddyb Feb 15, 2019

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

This comment has been minimized.

Sign in to view

varkor force-pushed the const-generics-hir branch from 14dfb4d to 0b4cd07 Compare February 15, 2019 23:33

Fix rebase issue

18ce997

varkor force-pushed the const-generics-hir branch from 0b4cd07 to 18ce997 Compare February 15, 2019 23:34

petrochenkov self-assigned this Feb 16, 2019

petrochenkov reviewed Feb 16, 2019

View reviewed changes

src/librustc_typeck/collect.rs Outdated Show resolved Hide resolved

petrochenkov removed their assignment Feb 16, 2019

varkor added 3 commits February 16, 2019 13:03

Check for Const param in collect

2a1b6c5

Don't abort early when collecting const generics

425fb58

Add a test for const parameter uppercase lint

727e204

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 16, 2019

rust-lang deleted a comment from rust-highfive Feb 17, 2019

crlf0710 mentioned this pull request Feb 17, 2019

The Genesis of Generic Germination #53645

Merged

eddyb reviewed Feb 17, 2019

View reviewed changes

bors added a commit that referenced this pull request Feb 19, 2019

Auto merge of #58503 - varkor:const-generics-hir, r=petrochenkov

32471f7

Add const generics to the HIR Split out from #53645. cc @yodaldevoid r? @eddyb

bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 19, 2019

bors merged commit 727e204 into rust-lang:master Feb 19, 2019

This was referenced Feb 19, 2019

Use derive macro for HashStable #56864

Merged

Allocate HIR on an arena #57173

Closed

Remove NodeId from some HIR nodes #58561

Merged

ghost mentioned this pull request Feb 19, 2019

Build Broken 2019-02-19 rust-lang/rust-clippy#3785

Closed

varkor deleted the const-generics-hir branch February 19, 2019 20:21

varkor mentioned this pull request Feb 19, 2019

Refactor generic parameter encoder functions #58581

Merged

Mark-Simulacrum mentioned this pull request Mar 2, 2019

Huge performance regression in rustdoc between 1/28 and 2/25 nightlies #58849

Closed

Centril added a commit to Centril/rust that referenced this pull request Mar 27, 2019

Rollup merge of rust-lang#58581 - varkor:const-generics-encoder-refac…

a76b61c

…tor, r=eddyb Refactor generic parameter encoder functions Addresses rust-lang#58503 (comment). r? @eddyb

Centril added a commit to Centril/rust that referenced this pull request Mar 28, 2019

Rollup merge of rust-lang#58581 - varkor:const-generics-encoder-refac…

5a90b66

…tor, r=eddyb Refactor generic parameter encoder functions Addresses rust-lang#58503 (comment). r? @eddyb

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 the HIR #58503

Add const generics to the HIR #58503

varkor commented Feb 15, 2019 •

edited

Loading

This comment has been minimized.

This comment has been minimized.

petrochenkov Feb 16, 2019

petrochenkov Feb 16, 2019

petrochenkov Feb 16, 2019

yodaldevoid Feb 16, 2019

petrochenkov commented Feb 16, 2019

varkor commented Feb 16, 2019

bors commented Feb 16, 2019

bors commented Feb 17, 2019

Centril commented Feb 17, 2019

eddyb Feb 17, 2019

varkor Feb 19, 2019

bors commented Feb 19, 2019

bors commented Feb 19, 2019

Add const generics to the HIR #58503

Add const generics to the HIR #58503

Conversation

varkor commented Feb 15, 2019 • edited Loading

This comment has been minimized.

This comment has been minimized.

petrochenkov Feb 16, 2019

Choose a reason for hiding this comment

petrochenkov Feb 16, 2019

Choose a reason for hiding this comment

petrochenkov Feb 16, 2019

Choose a reason for hiding this comment

yodaldevoid Feb 16, 2019

Choose a reason for hiding this comment

petrochenkov commented Feb 16, 2019

varkor commented Feb 16, 2019

bors commented Feb 16, 2019

bors commented Feb 17, 2019

Centril commented Feb 17, 2019

eddyb Feb 17, 2019

Choose a reason for hiding this comment

varkor Feb 19, 2019

Choose a reason for hiding this comment

bors commented Feb 19, 2019

bors commented Feb 19, 2019

varkor commented Feb 15, 2019 •

edited

Loading