Skip to content

rustc_target: pass contexts by reference, not value. - #55665

Merged
bors merged 1 commit into
rust-lang:masterfrom
eddyb:by-ref-layout-of
Nov 4, 2018
Merged

rustc_target: pass contexts by reference, not value.#55665
bors merged 1 commit into
rust-lang:masterfrom
eddyb:by-ref-layout-of

Conversation

@eddyb

@eddybeddyb commented Nov 3, 2018•
edited
Loading

Copy link
Copy Markdown
Contributor

LayoutOf now takes &self instead of self, and so does every method generic over a context that implements LayoutOf and/or other traits, like HasDataLayout, HasTyCtxt, etc.

Originally using by-value Copy types was relevant because TyCtxt was one of those types, but now TyCtxt::layout_of is separate from LayoutOf, and TyCtxt is not an often used layout context.

Passing these context by reference is a lot nicer for miri, which has self: &mut EvalContext, and needed f(&self) (that is, creating &&mut EvalContext references) for layout purposes.
Now, the &mut EvalContext can be passed to a function expecting &C, directly.

This should help with #54012 / #55627 (to not need where &'a T::Cx: LayoutOf bounds).

r? @nikomatsakis or @oli-obk or @nagisa cc @sunfishcode

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 3, 2018
oli-obk
oli-obk reviewed Nov 3, 2018
View reviewed changes
Comment threadsrc/librustc_lint/types.rs Outdated
Comment threadsrc/librustc_mir/hair/cx/mod.rs Outdated
Comment threadsrc/librustc_mir/interpret/cast.rs Outdated
@oli-obk

oli-obk commented Nov 3, 2018

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Nov 3, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit d42d783863bda3a192e32e7c89d7779b4a76b093 has been approved by oli-obk

@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 Nov 3, 2018
@bors

bors commented Nov 4, 2018

Copy link
Copy Markdown
Collaborator

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

@borsbors 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 Nov 4, 2018
@eddyb

eddyb commented Nov 4, 2018

Copy link
Copy Markdown
ContributorAuthor

@bors r=oli-obk p=1 (blocking #55627 which bitrots fast)

@bors

bors commented Nov 4, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit d00d42d has been approved by oli-obk

@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 Nov 4, 2018
@bors

bors commented Nov 4, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit d00d42d with merge e6c5cf9...

bors added a commit that referenced this pull request Nov 4, 2018
@bors
Auto merge of#55665- eddyb:by-ref-layout-of, r=oli-obk
e6c5cf9
rustc_target: pass contexts by reference, not value.
`LayoutOf` now takes `&self` instead of `self`, and so does every method generic over a context that implements `LayoutOf` and/or other traits, like `HasDataLayout`, `HasTyCtxt`, etc.
Originally using by-value `Copy` types was relevant because `TyCtxt` was one of those types, but now `TyCtxt::layout_of` is separate from `LayoutOf`, and `TyCtxt` is not an often used layout context.
Passing these context by reference is a lot nicer for miri, which has `self: &mut EvalContext`, and needed `f(&self)` (that is, creating `&&mut EvalContext` references) for layout purposes.
Now, the `&mut EvalContext` can be passed to a function expecting `&C`, directly.
This should help with #54012 / #55627 (to not need `where &'a T::Cx: LayoutOf` bounds).
r? @nikomatsakis or @oli-obk or @nagisa cc @sunfishcode
@bors

bors commented Nov 4, 2018

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: oli-obk
Pushing e6c5cf9 to master...

@bors
bors merged commit d00d42d into rust-lang:masterNov 4, 2018
@rust-highfive

rust-highfive commented Nov 4, 2018

Copy link
Copy Markdown
Contributor

📣 Toolstate changed by #55665!

Tested on commit e6c5cf9.
Direct link to PR: #55665

💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth@llogiq@mcarton@oli-obk, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth@llogiq@mcarton@oli-obk, @rust-lang/infra).
💔 rls on windows: test-pass → build-fail (cc @nrc@Xanewok, @rust-lang/infra).
💔 rls on linux: test-pass → build-fail (cc @nrc@Xanewok, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Nov 4, 2018
@rust-highfive
📣 Toolstate changed byrust-lang/rust#55665!
9978951
Tested on commit rust-lang/rust@e6c5cf9.
Direct link to PR: <rust-lang/rust#55665>
💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth@llogiq@mcarton@oli-obk, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth@llogiq@mcarton@oli-obk, @rust-lang/infra).
💔 rls on windows: test-pass → build-fail (cc @nrc@Xanewok, @rust-lang/infra).
💔 rls on linux: test-pass → build-fail (cc @nrc@Xanewok, @rust-lang/infra).
matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Nov 4, 2018
@matthiaskrgr
rustuprust-lang/rust#55665(pass contexts by reference)
3967016
@borsbors mentioned this pull request Nov 4, 2018
Merged
borsBot added a commit to rust-lang/rust-clippy that referenced this pull request Nov 4, 2018
@bors@matthiaskrgr
Merge#3411
d8b4269
3411: rustup rust-lang/rust#55665 (pass contexts by reference) r=matthiaskrgr a=matthiaskrgr
Co-authored-by: Matthias Krüger <matthias.krueger@famsik.de>
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 4, 2018
@matthiaskrgr
submodules: update clippy from71ec4fftod8b4269
1351b94
Fixes clippy toolstate.
Changes:
````
rustup rust-lang#55665 (pass contexts by reference)
Fix typo
Improve clippy_dev help text
RIIR update lints: Generate lint group registrations
Test clippy_dev on CI and fix test
RIIR update lints: Generate modules section
````
@eddyb
eddyb deleted the by-ref-layout-of branch November 4, 2018 23:22
bors added a commit that referenced this pull request Nov 5, 2018
@bors
Auto merge of#55681- matthiaskrgr:clippy, r=oli-obk
56ac2c4
submodules: update clippy from 71ec4ff to d8b4269
Fixes clippy toolstate.
Changes:
````
rustup #55665 (pass contexts by reference)
Fix typo
Improve clippy_dev help text
RIIR update lints: Generate lint group registrations
Test clippy_dev on CI and fix test
RIIR update lints: Generate modules section
````
flip1995 pushed a commit to flip1995/rust-clippy that referenced this pull request May 5, 2020
@matthiaskrgr
submodules: update clippy from71ec4fftod8b4269
b693dd7
Fixes clippy toolstate.
Changes:
````
rustup rust-lang/rust#55665 (pass contexts by reference)
Fix typo
Improve clippy_dev help text
RIIR update lints: Generate lint group registrations
Test clippy_dev on CI and fix test
RIIR update lints: Generate modules section
````
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oli-obkoli-obkoli-obk left review comments

Assignees

@nikomatsakisnikomatsakis

Labels

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.

5 participants

@eddyb@oli-obk@bors@rust-highfive@nikomatsakis