/rust

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.

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

Fixes and cleanups #58000

Merged
merged 11 commits into from Jan 31, 2019
+77 −45

Conversation

Reviewers

@RalfJung RalfJung

Assignees

@nikomatsakis nikomatsakis

Labels
S-waiting-on-bors
Projects
None yet
Milestone
No milestone
7 participants
@oli-obk @rust-highfive @RalfJung @bors @pietroalbini @kennytm @nikomatsakis
@oli-obk
Copy link
Contributor

oli-obk commented Jan 30, 2019

Address the points raised in https://github.com/rust-lang/rust/pull/57677/files by @eddyb and @RalfJung

@rust-highfive rust-highfive assigned nikomatsakis Jan 30, 2019

@rust-highfive

This comment has been minimized.

Sign in to view
Copy link
Collaborator

rust-highfive commented Jan 30, 2019

r? @nikomatsakis

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

@rust-highfive rust-highfive added the S-waiting-on-review label Jan 30, 2019

@oli-obk
Eliminate an unwrap
Loading status checks…
5aa713e
@RalfJung

RalfJung reviewed Jan 30, 2019
View changes

src/librustc_mir/interpret/eval_context.rs Outdated
// 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> {

This comment has been minimized.

Sign in to view
Copy link
@RalfJung

RalfJung Jan 30, 2019

Member

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

RalfJung reviewed Jan 30, 2019
View changes

Show resolved Hide resolved src/librustc_mir/interpret/snapshot.rs Outdated
@RalfJung

RalfJung reviewed Jan 30, 2019
View changes

src/librustc_mir/interpret/snapshot.rs Outdated
type Item = LocalValue<(), AllocIdSnapshot<'a>>;

fn snapshot(&self, ctx: &'a Ctx) -> Self::Item {
self.state.snapshot(ctx)

This comment has been minimized.

Sign in to view
Copy link
@RalfJung

RalfJung Jan 30, 2019

Member

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?

This comment has been minimized.

Sign in to view
Copy link
@oli-obk

oli-obk Jan 30, 2019

Author Contributor

nope, it's a very simple macro with no support for lifetimes or so

This comment has been minimized.

Sign in to view
Copy link
@oli-obk

oli-obk Jan 30, 2019

Author Contributor

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

RalfJung approved these changes Jan 30, 2019
View changes

@RalfJung

This comment has been minimized.

Sign in to view
Copy link
Member

RalfJung commented Jan 30, 2019

@bors r+
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Jan 30, 2019

📌 Commit 8c26c59 has been approved by RalfJung

@bors bors added S-waiting-on-bors and removed S-waiting-on-review labels Jan 30, 2019

Centril added a commit to Centril/rust that referenced this pull request Jan 30, 2019

@Centril
Rollup merge of rust-lang#58000 - oli-obk:fixes_and_cleanups, r=RalfJung 
Fixes and cleanups

Address the points raised in https://github.com/rust-lang/rust/pull/57677/files by @eddyb and @RalfJung
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
b4cc10a

Centril added a commit to Centril/rust that referenced this pull request Jan 30, 2019

@Centril
Rollup merge of rust-lang#58000 - oli-obk:fixes_and_cleanups, r=RalfJung 
Fixes and cleanups

Address the points raised in https://github.com/rust-lang/rust/pull/57677/files by @eddyb and @RalfJung
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
6b58344

@Centril Centril referenced this pull request Jan 30, 2019

Closed

Rollup of 12 pull requests #58014

bors added a commit that referenced this pull request Jan 30, 2019

@bors
Auto merge of #58014 - Centril:rollup, r=Centril 
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)
 - #57987 (Fix some AArch64 typos)
 - #57999 (Add MOVBE x86 CPU feature)
 - #58000 (Fixes and cleanups)
 - #58007 (Don't panic when accessing enum variant ctor using `Self` in match)
 - #58008 (Pass correct arguments to places_conflict)

Failed merges:

r? @ghost
Loading status checks…
cc70cf9

Centril added a commit to Centril/rust that referenced this pull request Jan 31, 2019

@Centril
Rollup merge of rust-lang#58000 - oli-obk:fixes_and_cleanups, r=RalfJung 
Fixes and cleanups

Address the points raised in https://github.com/rust-lang/rust/pull/57677/files by @eddyb and @RalfJung
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
880f633

@Centril Centril referenced this pull request Jan 31, 2019

Merged

Rollup of 12 pull requests #58016

bors added a commit that referenced this pull request Jan 31, 2019

@bors
Auto merge of #58016 - Centril:rollup, r=Centril 
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
Loading status checks…
f40aaa6

@bors bors merged commit 8c26c59 into rust-lang:master Jan 31, 2019

@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Jan 31, 2019

⌛️ Testing commit 8c26c59 with merge f40aaa6...
@pietroalbini

This comment has been minimized.

Sign in to view
Copy link
Member

pietroalbini commented Feb 7, 2019

@bors retry
@kennytm

This comment has been minimized.

Sign in to view
Copy link
Member

kennytm commented Feb 7, 2019

@bors r- retry

@bors bors added S-waiting-on-author and removed S-waiting-on-bors labels Feb 7, 2019

@kennytm kennytm added S-waiting-on-bors and removed S-waiting-on-author labels Feb 7, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment