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

Rename LayoutDetails to just Layout. #69700

Merged
merged 1 commit into from
Mar 26, 2020
Merged

Rename LayoutDetails to just Layout. #69700

merged 1 commit into from
Mar 26, 2020

Conversation

anyska
Copy link
Contributor

@anyska anyska commented Mar 4, 2020

No description provided.

@rust-highfive
Copy link
Collaborator

r? @petrochenkov

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 4, 2020
@anyska anyska mentioned this pull request Mar 4, 2020
Merged
@Dylan-DPC-zz
Copy link

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 4, 2020

📌 Commit 6804664 has been approved by Dylan-DPC

@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 Mar 4, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Mar 4, 2020
@Dylan-DPC
Rollup merge of rust-lang#69700 - anyska:layout-details-rename, r=Dyl…
cdfbb70 
…an-DPC

Rename LayoutDetails to just Layout.
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Mar 4, 2020
Closed
@petrochenkov
Copy link
Contributor

r? @eddyb

@rust-highfive rust-highfive assigned eddyb and unassigned petrochenkov Mar 4, 2020
@eddyb
Copy link
Member

eddyb commented Mar 4, 2020

(I've suggested this rename, FWIW)
cc @nagisa @RalfJung

@RalfJung
Copy link
Member

RalfJung commented Mar 4, 2020

Seems reasonable, though I somewhat expected a bit more bikeshed (UCG had a lot of bikeshed about this.^^) abi is in some sense not typically part of the "memory layout", after all.

@Dylan-DPC-zz
Copy link

@bors r-

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 4, 2020
@eddyb
Copy link
Member

eddyb commented Mar 4, 2020

abi is in some sense not typically part of the "memory layout", after all.

Fair, although this doesn't change the Layout part of LayoutDetails, only removes the now unnecessary Details suffix (IIRC, there used to be an enum Layout that is now gone).

@RalfJung
Copy link
Member

RalfJung commented Mar 4, 2020

Fair, although this doesn't change the Layout part of LayoutDetails, only removes the now unnecessary Details suffix

Yeah, that's why I agree the rename makes sense. What happens in Miri is a bit annoying, but not terrible. We could rename our field to tal (for TyAndLayout), but... uh^^

@nagisa
Copy link
Member

nagisa commented Mar 9, 2020

I don’t particularly care either way about this. On one hand its less typing. On the other its more shuffle.

@bors
Copy link
Contributor

bors commented Mar 10, 2020

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

@bors
Copy link
Contributor

bors commented Mar 19, 2020

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

@oli-obk
Copy link
Contributor

oli-obk commented Mar 25, 2020

r? @oli-obk

@oli-obk oli-obk mentioned this pull request Mar 25, 2020
Closed
@oli-obk
Copy link
Contributor

oli-obk commented Mar 25, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Mar 25, 2020

📌 Commit 0f7840b has been approved by oli-obk

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 25, 2020
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Mar 25, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 25, 2020
@bors
Auto merge of rust-lang#70412 - Dylan-DPC:rollup-yuq2mfy, r=Dylan-DPC
e4519e2 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#69700 (Rename LayoutDetails to just Layout.)
 - rust-lang#70392 (Make x.py compatible with python 3.8.)
 - rust-lang#70406 (Clean up E0458 explanation)
 - rust-lang#70407 (Avoid tagging as I-nominated on toolstate breakage)
 - rust-lang#70409 (gitignore: allow target to be a symlink)

Failed merges:

 - rust-lang#70375 (avoid catching InterpError)

r? @ghost
@bors bors merged commit 818da9e into rust-lang:master Mar 26, 2020
@anyska anyska deleted the layout-details-rename branch March 27, 2020 17:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oli-obk oli-obk oli-obk left review comments

@RalfJung RalfJung RalfJung left review comments

@eddyb eddyb eddyb left review comments

Assignees

@oli-obk oli-obk

Labels
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.
9 participants
@anyska @rust-highfive @Dylan-DPC-zz @bors @petrochenkov @eddyb @RalfJung @nagisa @oli-obk