Fixes and cleanups #58000
Merged
Fixes and cleanups #58000
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
| (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive added the S-waiting-on-review 
RalfJung reviewed Jan 30, 2019
| // State of a local variable | ||
| /// State of a local variable including a memoized layout | ||
| #[derive(Clone, PartialEq, Eq)] | ||
| pub struct LocalValue<'tcx, Tag=(), Id=AllocId> { |
There was a problem hiding this comment.
Nit: I think swapping the names LocalValue and LocalState is nicer. The layout stuff looks much more state-y than value-y to me.
RalfJung reviewed Jan 30, 2019
RalfJung reviewed Jan 30, 2019
| type Item = LocalValue<(), AllocIdSnapshot<'a>>; | ||
| | ||
| fn snapshot(&self, ctx: &'a Ctx) -> Self::Item { | ||
| self.state.snapshot(ctx) |
There was a problem hiding this comment.
We otherwise follow the pattern to use LocalState { state, layout: _ } = self to make sure we revisit this when new fields get added.
impl_snapshot_for! doesn't work?
There was a problem hiding this comment.
nope, it's a very simple macro with no support for lifetimes or so
There was a problem hiding this comment.
Done and opened rust-lang/rust-clippy#3724 to make sure we take care of this issue once and for all at some point
RalfJung approved these changes Jan 30, 2019
| @bors r+ |
| 📌 Commit 8c26c59 has been approved by |
bors added S-waiting-on-bors Centril added a commit to Centril/rust that referenced this pull request Jan 30, 2019
Fixes and cleanups Address the points raised in https://github.com/rust-lang/rust/pull/57677/files by @eddyb and @RalfJung
Centril added a commit to Centril/rust that referenced this pull request Jan 30, 2019
Fixes and cleanups Address the points raised in https://github.com/rust-lang/rust/pull/57677/files by @eddyb and @RalfJung
Centril added a commit to Centril/rust that referenced this pull request Jan 31, 2019
Fixes and cleanups Address the points raised in https://github.com/rust-lang/rust/pull/57677/files by @eddyb and @RalfJung
bors added a commit that referenced this pull request Jan 31, 2019
Rollup of 12 pull requests Successful merges: - #57008 (suggest `|` when `,` founds in invalid match value) - #57106 (Mark str::trim.* functions as #[must_use].) - #57920 (use `SOURCE_DATE_EPOCH` for man page time if set) - #57934 (Introduce into_raw_non_null on Rc and Arc) - #57971 (SGX target: improve panic & exit handling) - #57980 (Add the edition guide to the bookshelf) - #57984 (Improve bug message in check_ty) - #57999 (Add MOVBE x86 CPU feature) - #58000 (Fixes and cleanups) - #58005 (update docs for fix_start/end_matches) - #58007 (Don't panic when accessing enum variant ctor using `Self` in match) - #58008 (Pass correct arguments to places_conflict) Failed merges: r? @ghost
| @bors retry |
| @bors r- retry |
bors added S-waiting-on-author 
kennytm added S-waiting-on-bors 
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
Address the points raised in https://github.com/rust-lang/rust/pull/57677/files by @eddyb and @RalfJung