Skip to content

Add const generics to the HIR - #58503

Merged
bors merged 13 commits into
rust-lang:masterfrom
varkor:const-generics-hir
Feb 19, 2019
Merged

Add const generics to the HIR#58503
bors merged 13 commits into
rust-lang:masterfrom
varkor:const-generics-hir

Conversation

@varkor

@varkorvarkor commented Feb 15, 2019•
edited
Loading

Copy link
Copy Markdown
Contributor

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

r? @eddyb

varkorand 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-highfiverust-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
@petrochenkovpetrochenkov self-assigned this Feb 16, 2019
petrochenkov
petrochenkov reviewed Feb 16, 2019
View reviewed changes
Comment threadsrc/librustc/hir/mod.rs
#[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
pub struct ConstArg {
pub value: AnonConst,
pub span: Span,

@petrochenkovpetrochenkovFeb 16, 2019

Copy link
Copy Markdown
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.

@petrochenkovpetrochenkovFeb 16, 2019

Copy link
Copy Markdown
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.)

@petrochenkovpetrochenkovFeb 16, 2019

Copy link
Copy Markdown
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.

@yodaldevoidyodaldevoidFeb 16, 2019

Copy link
Copy Markdown
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
petrochenkov reviewed Feb 16, 2019
View reviewed changes
Comment threadsrc/librustc_typeck/collect.rs Outdated
@petrochenkov

petrochenkov commented Feb 16, 2019

Copy link
Copy Markdown
Contributor

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

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

@petrochenkovpetrochenkov removed their assignment Feb 16, 2019
@varkor

varkor commented Feb 16, 2019

Copy link
Copy Markdown
ContributorAuthor

@bors r=petrochenkov p=1

(Increasing priority because this unblocks other work.)

@bors

bors commented Feb 16, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 727e204 has been approved by petrochenkov

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

bors commented Feb 17, 2019

Copy link
Copy Markdown
Collaborator

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

@Centril

Centril commented Feb 17, 2019

Copy link
Copy Markdown
Contributor

@bors retry

@rust-langrust-lang deleted a comment from rust-highfiveFeb 17, 2019
@crlf0710crlf0710 mentioned this pull request Feb 17, 2019
Merged
eddyb
eddyb reviewed Feb 17, 2019
View reviewed changes
Comment threadsrc/librustc_metadata/encoder.rs
}
hir::GenericParamKind::Const { .. } => {
let def_id = self.tcx.hir().local_def_id(param.id);
let encode_info = IsolatedEncoder::encode_info_for_const_param;

@eddybeddybFeb 17, 2019

Copy link
Copy Markdown
Contributor

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?

@varkorvarkorFeb 19, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Opened #58581.

@bors

bors commented Feb 19, 2019

Copy link
Copy Markdown
Collaborator

⌛ 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

bors commented Feb 19, 2019

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Feb 19, 2019
@bors
bors merged commit 727e204 into rust-lang:masterFeb 19, 2019
This was referenced Feb 19, 2019
Merged
Closed
Merged
@ghostghost mentioned this pull request Feb 19, 2019
Closed
@varkor
varkor deleted the const-generics-hir branch February 19, 2019 20:21
@varkorvarkor mentioned this pull request Feb 19, 2019
Merged
@Mark-SimulacrumMark-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 ofrust-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 ofrust-lang#58581- varkor:const-generics-encoder-refac…
5a90b66
…tor, r=eddyb
Refactor generic parameter encoder functions
Addresses rust-lang#58503 (comment).
r? @eddyb
@varkorvarkor mentioned this pull request May 2, 2019
Closed
16 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@petrochenkovpetrochenkovpetrochenkov left review comments
+2 more reviewers
@eddybeddybeddyb left review comments
@yodaldevoidyodaldevoidyodaldevoid left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@eddybeddyb

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@rust-highfive@petrochenkov@bors@Centril@eddyb@yodaldevoid