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.

Sign up for GitHub

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

Jump to bottom

Add const generics to the HIR #58503

Merged
merged 13 commits into from
Feb 19, 2019
Merged

Add const generics to the HIR #58503

merged 13 commits into from
Feb 19, 2019

Conversation

varkor
Copy link
Member

@varkor varkor commented Feb 15, 2019 •
edited
Loading

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

r? @eddyb

varkor and others added 9 commits February 15, 2019 22:28
@varkor @yodaldevoid
Add Const kind to HIR
725ba96 
Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>
@varkor @yodaldevoid
Add pretty-printing for const generics
d44030d 
Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>
@varkor @yodaldevoid
Move const generic error from lowering to collect
9a5f7b1 
Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>
@varkor @yodaldevoid
Add Const kind to rustdoc
475f20c 
Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>
@varkor @yodaldevoid
Add E0111
ddf8811 
Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>
@varkor @yodaldevoid
Take Const into account in HIR
7f3c6d7 
Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>
@varkor @yodaldevoid
Drive-by cleanup
10602f1 
Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>
@varkor @yodaldevoid
Take Const into account with nonstandard style lint
2279907 
Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>
@varkor @yodaldevoid
Update tests
9cfdb80 
Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 15, 2019
@rust-highfive

This comment has been minimized.

Sign in to view
@rust-highfive

This comment has been minimized.

Sign in to view
@varkor varkor force-pushed the const-generics-hir branch from 14dfb4d to 0b4cd07 Compare February 15, 2019 23:33
@varkor varkor force-pushed the const-generics-hir branch from 0b4cd07 to 18ce997 Compare February 15, 2019 23:34
@petrochenkov petrochenkov self-assigned this Feb 16, 2019
petrochenkov
petrochenkov reviewed Feb 16, 2019
View reviewed changes
src/librustc/hir/mod.rs
#[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
pub struct ConstArg {
pub value: AnonConst,
pub span: Span,
Copy link
Contributor

Choose a reason for hiding this comment

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

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.

Copy link
Contributor

Choose a reason for hiding this comment

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

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

Copy link
Contributor

Choose a reason for hiding this comment

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

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

Copy link
Contributor

Choose a reason for hiding this comment

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

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.

@petrochenkov
Copy link
Contributor

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

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

@petrochenkov petrochenkov removed their assignment Feb 16, 2019
@varkor
Copy link
Member Author

varkor commented Feb 16, 2019

@bors r=petrochenkov p=1

(Increasing priority because this unblocks other work.)

@bors
Copy link
Contributor

bors commented Feb 16, 2019

📌 Commit 727e204 has been approved by petrochenkov

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

bors commented Feb 17, 2019

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

@Centril
Copy link
Contributor

Centril commented Feb 17, 2019

@bors retry

@rust-lang rust-lang deleted a comment from rust-highfive Feb 17, 2019
@crlf0710 crlf0710 mentioned this pull request Feb 17, 2019
Merged
eddyb
eddyb reviewed Feb 17, 2019
View reviewed changes
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;
Copy link
Member

Choose a reason for hiding this comment

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

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

Copy link
Member Author

Choose a reason for hiding this comment

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

Opened #58581.

@bors
Copy link
Contributor

bors commented Feb 19, 2019

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

bors added a commit that referenced this pull request Feb 19, 2019
@bors
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
Copy link
Contributor

bors commented Feb 19, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 19, 2019
@bors bors merged commit 727e204 into rust-lang:master Feb 19, 2019
This was referenced Feb 19, 2019
Merged
Closed
Merged
@ghost ghost mentioned this pull request Feb 19, 2019
Closed
@varkor varkor deleted the const-generics-hir branch February 19, 2019 20:21
@varkor varkor mentioned this pull request Feb 19, 2019
Merged
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Mar 2, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Mar 27, 2019
@Centril
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
@Centril
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 varkor mentioned this pull request May 2, 2019
Closed
16 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

@yodaldevoid yodaldevoid yodaldevoid left review comments

@eddyb eddyb eddyb left review comments

Assignees

@eddyb eddyb

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@varkor @rust-highfive @petrochenkov @bors @Centril @eddyb @yodaldevoid