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 TyLayout to TyAndLayout. #69702

Merged
merged 1 commit into from
Mar 29, 2020
Merged

Rename TyLayout to TyAndLayout. #69702

merged 1 commit into from
Mar 29, 2020

Conversation

anyska
Copy link
Contributor

@anyska anyska commented Mar 4, 2020 •
edited
Loading

No description provided.

@rust-highfive
Copy link
Collaborator

r? @ecstatic-morse

(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
@ecstatic-morse
Copy link
Contributor

I think I'm missing some context here. Was this discussed somewhere?

r? @RalfJung

@RalfJung
Copy link
Member

RalfJung commented Mar 4, 2020

@eddyb mentioned this to me as a possibility, but I thought you might want to call this Abi instead or so... like, I expected some more bikeshedding.^^

r? @eddyb for now

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

eddyb commented Mar 4, 2020

I think I'm missing some context here. Was this discussed somewhere?

Sorry, I suggested it without making an issue, similar to #69700.

but I thought you might want to call this Abi instead or so... like, I expected some more bikeshedding.^^

There's already a type named Abi, so that would have to be renamed first (which I'm not sure I want in the first place), but I agree we could use some bikeshedding.

Main reason I find TyAndLayout a slight improvement over TyLayout is that it's more truthful to this being first and foremost a (Ty, &Layout) pair, with some extra APIs.
When I originally called it TyLayout I was trying to keep it short, but in retrospect it wasn't worth it.

cc @oli-obk @nagisa @hanna-kruppe @bjorn3

@nagisa
Copy link
Member

nagisa commented Mar 9, 2020

TyAndLayout does indeed make much more sense given what the type is. TyLayout immediately reads as a "type layout", but that’s really Layout.

@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 11, 2020

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

@Dylan-DPC-zz Dylan-DPC-zz 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 Mar 21, 2020
@Dylan-DPC-zz
Copy link

@anyska if you can resolve these conflicts, we can get it reviewed :)

@anyska anyska force-pushed the tylayout-rename branch 2 times, most recently from b7406db to 7f87af1 Compare March 23, 2020 12:05
@bors
Copy link
Contributor

bors commented Mar 24, 2020

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

@oli-obk
Copy link
Contributor

oli-obk commented Mar 25, 2020

r? @oli-obk

@rust-highfive rust-highfive assigned oli-obk and unassigned eddyb Mar 25, 2020
@oli-obk
Copy link
Contributor

oli-obk commented Mar 29, 2020

@bors r+

Thanks!

@bors
Copy link
Contributor

bors commented Mar 29, 2020

📌 Commit 50d2c3a 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 29, 2020
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Mar 29, 2020
Merged
@bors
Copy link
Contributor

bors commented Mar 29, 2020

⌛ Testing commit 50d2c3a with merge 92f74183ee3d70c9b4854be5614316c09f75cbbd...

@Dylan-DPC-zz
Copy link

@bors retry (yield)

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 29, 2020
@bors
Auto merge of rust-lang#70544 - Dylan-DPC:rollup-pj86j17, r=Dylan-DPC
699f83f 
Rollup of 4 pull requests

Successful merges:

 - rust-lang#69702 (Rename TyLayout to TyAndLayout.)
 - rust-lang#70539 (add test for 62220)
 - rust-lang#70540 (#[link]: mention wasm_import_module instead of cfg)
 - rust-lang#70541 (prohibit_generics: update has_err for consts)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Mar 29, 2020

⌛ Testing commit 50d2c3a with merge 699f83f...

@bors bors merged commit d009ce4 into rust-lang:master Mar 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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 @ecstatic-morse @RalfJung @eddyb @nagisa @bors @Dylan-DPC-zz @oli-obk