Skip to content

Replace the &'tcx List<Ty<'tcx>> in TyKind::Tuple with SubstsRef<'tcx> - #60292

Merged
bors merged 3 commits into
rust-lang:masterfrom
varkor:ty-tuple-substs
Apr 27, 2019
Merged

Replace the &'tcx List<Ty<'tcx>> in TyKind::Tuple with SubstsRef<'tcx>#60292
bors merged 3 commits into
rust-lang:masterfrom
varkor:ty-tuple-substs

Conversation

@varkor

Copy link
Copy Markdown
Contributor

Part of the suggested refactoring for #42340. As expected, this is a little messy, because there are many places that the components of tuples are expected to be types, rather than arbitrary kinds. However, it should open up the way for a refactoring of TyS itself.

r? @nikomatsakis

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 25, 2019
@bors

bors commented Apr 26, 2019

Copy link
Copy Markdown
Collaborator

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

@nikomatsakis

Copy link
Copy Markdown
Contributor

r=me once rebased

@nikomatsakisnikomatsakis added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 26, 2019
@varkor

Copy link
Copy Markdown
ContributorAuthor

@bors r=nikomatsakis

@bors

bors commented Apr 26, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit a3470c6 has been approved by nikomatsakis

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 26, 2019
Centril added a commit to Centril/rust that referenced this pull request Apr 27, 2019
Replace the `&'tcx List<Ty<'tcx>>` in `TyKind::Tuple` with `SubstsRef<'tcx>`
Part of the suggested refactoring for rust-lang#42340. As expected, this is a little messy, because there are many places that the components of tuples are expected to be types, rather than arbitrary kinds. However, it should open up the way for a refactoring of `TyS` itself.
r? @nikomatsakis
@CentrilCentril mentioned this pull request Apr 27, 2019
Centril added a commit to Centril/rust that referenced this pull request Apr 27, 2019
Replace the `&'tcx List<Ty<'tcx>>` in `TyKind::Tuple` with `SubstsRef<'tcx>`
Part of the suggested refactoring for rust-lang#42340. As expected, this is a little messy, because there are many places that the components of tuples are expected to be types, rather than arbitrary kinds. However, it should open up the way for a refactoring of `TyS` itself.
r? @nikomatsakis
@CentrilCentril mentioned this pull request Apr 27, 2019
Centril added a commit to Centril/rust that referenced this pull request Apr 27, 2019
Replace the `&'tcx List<Ty<'tcx>>` in `TyKind::Tuple` with `SubstsRef<'tcx>`
Part of the suggested refactoring for rust-lang#42340. As expected, this is a little messy, because there are many places that the components of tuples are expected to be types, rather than arbitrary kinds. However, it should open up the way for a refactoring of `TyS` itself.
r? @nikomatsakis
@CentrilCentril mentioned this pull request Apr 27, 2019
bors added a commit that referenced this pull request Apr 27, 2019
Rollup of 5 pull requests
Successful merges:
- #60292 (Replace the `&'tcx List<Ty<'tcx>>` in `TyKind::Tuple` with `SubstsRef<'tcx>`)
- #60307 (Make "Implementations on Foreign Types" items in sidebar link to specific impls)
- #60309 (Add 1.34.1 release notes)
- #60315 (bootstrap: use correct version numbers for llvm-tools and lldb)
- #60316 (Use "capacity" as parameter name in with_capacity() methods)
Failed merges:
r? @ghost
@bors
bors merged commit a3470c6 into rust-lang:masterApr 27, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: 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.

4 participants

@varkor@bors@nikomatsakis@rust-highfive