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.

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

Initialize MemoryExtra with StdRng #799

Merged
merged 10 commits into from
Jul 6, 2019
Merged

Initialize MemoryExtra with StdRng #799

merged 10 commits into from
Jul 6, 2019

Conversation

RalfJung
Copy link
Member

We need this in a local branch for an synchronous rustc update.

bors added a commit that referenced this pull request Jun 29, 2019
some lib.rs refactoring

Taken out of #799 so that we can land it now and resolve merge conflicts instead of dragging them along.

Splits lib.rs into machine.rs for the machine state and trait impl, and eval.rs for the main evaluator loop and setting up the initial stack frame.
@RalfJung RalfJung changed the title Initialize MemoryExtra with StdRng, and some lib.rs refactoring Initialize MemoryExtra with StdRng Jun 29, 2019
@RalfJung RalfJung closed this Jun 29, 2019
@RalfJung RalfJung reopened this Jun 29, 2019
@bors
Copy link
Contributor

bors commented Jun 29, 2019

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

@RalfJung RalfJung added the S-blocked-on-rust Status: Blocked on landing a Rust PR label Jun 30, 2019
@bors
Copy link
Contributor

bors commented Jul 3, 2019

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

@RalfJung RalfJung removed the S-blocked-on-rust Status: Blocked on landing a Rust PR label Jul 6, 2019
@RalfJung
Copy link
Member Author

RalfJung commented Jul 6, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Jul 6, 2019

📌 Commit ba8728c has been approved by RalfJung

@bors
Copy link
Contributor

bors commented Jul 6, 2019

⌛ Testing commit ba8728c with merge cb09fab...

bors added a commit that referenced this pull request Jul 6, 2019
Initialize MemoryExtra with StdRng

We need this in a local branch for an synchronous rustc update.
@bors
Copy link
Contributor

bors commented Jul 6, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: RalfJung
Pushing cb09fab to master...

@bors bors merged commit ba8728c into master Jul 6, 2019
@RalfJung RalfJung deleted the rustup branch July 6, 2019 08:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants