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 InterpretCx -> InterpCx #62173

Merged
merged 1 commit into from
Jul 4, 2019
Merged

rename InterpretCx -> InterpCx #62173

merged 1 commit into from
Jul 4, 2019

Conversation

RalfJung
Copy link
Member

That's more consistent with InterpResult and InterpError.

r? @oli-obk

@RalfJung
rename InterpretCx -> InterpCx
fc918a3 
That's more consistent with InterpResult and InterpError.
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 27, 2019
@oli-obk
Copy link
Contributor

oli-obk commented Jun 27, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Jun 27, 2019

📌 Commit fc918a3 has been approved by oli-obk

@bors
Copy link
Contributor

bors commented Jun 27, 2019

🌲 The tree is currently closed for pull requests below priority 999, this pull request will be tested once the tree is reopened

@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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 27, 2019
@RalfJung
Copy link
Member Author

RalfJung commented Jun 28, 2019 •
edited
Loading

@bors rollup=never (breaks Miri)

@RalfJung
Copy link
Member Author

Looks very much like the Miri update will land first, so let's avoid wasting CI time.

@bors r-

@bors bors 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 Jun 28, 2019
@RalfJung RalfJung mentioned this pull request Jun 29, 2019
Closed
@RalfJung
Copy link
Member Author

RalfJung commented Jul 2, 2019

It's just 4h until it's Wednesday UTC, I feel confident this will not land fast enough to cause problems and I want to stop having to remember.^^

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Jul 2, 2019

📌 Commit fc918a3 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 Jul 2, 2019
@RalfJung
Copy link
Member Author

RalfJung commented Jul 2, 2019

@bors rollup-

@RalfJung
Copy link
Member Author

RalfJung commented Jul 3, 2019

@bors rollup

Centril added a commit to Centril/rust that referenced this pull request Jul 3, 2019
@Centril
Rollup merge of rust-lang#62173 - RalfJung:miri-interp, r=oli-obk
bfd789f 
rename InterpretCx -> InterpCx

That's more consistent with InterpResult and InterpError.

r? @oli-obk
@Centril Centril mentioned this pull request Jul 3, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Jul 3, 2019
@Centril
Rollup merge of rust-lang#62173 - RalfJung:miri-interp, r=oli-obk
b34b0f7 
rename InterpretCx -> InterpCx

That's more consistent with InterpResult and InterpError.

r? @oli-obk
@Centril Centril mentioned this pull request Jul 3, 2019
Closed
bors added a commit that referenced this pull request Jul 3, 2019
@bors
Auto merge of #62354 - Centril:rollup-04ya07k, r=Centril
430069f 
Rollup of 17 pull requests

Successful merges:

 - #62039 (Remove needless lifetimes (rustc))
 - #62153 (Update the `rust-installer` submodule)
 - #62173 (rename InterpretCx -> InterpCx)
 - #62240 (wfcheck: resolve the type-vars in `AdtField` types)
 - #62249 (Use mem::take instead of mem::replace with default)
 - #62252 (Update mem::replace example to not be identical to mem::take)
 - #62258 (syntax: Unsupport `foo! bar { ... }` macros in the parser)
 - #62268 (Clean up inherent_impls)
 - #62287 (Use link attributes on extern "C" blocks with llvm-libuwind)
 - #62295 (miri realloc: do not require giving old size+align)
 - #62297 (refactor check_for_substitution)
 - #62316 (When possible without changing semantics, implement Iterator::last in terms of DoubleEndedIterator::next_back for types in liballoc and libcore.)
 - #62317 (Migrate `compile-pass` annotations to `build-pass`)
 - #62337 (Fix bucket in CPU usage script)
 - #62344 (simplify Option::get_or_insert)
 - #62346 (enable a few more tests in Miri and update the comment for others)
 - #62351 (remove bogus example from drop_in_place)

Failed merges:

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Jul 3, 2019
@Centril
Rollup merge of rust-lang#62173 - RalfJung:miri-interp, r=oli-obk
740d5bd 
rename InterpretCx -> InterpCx

That's more consistent with InterpResult and InterpError.

r? @oli-obk
@Centril Centril mentioned this pull request Jul 3, 2019
Merged
bors added a commit that referenced this pull request Jul 3, 2019
@bors
Auto merge of #62355 - Centril:rollup-xnxtcgm, r=Centril
b43eb42 
Rollup of 16 pull requests

Successful merges:

 - #62039 (Remove needless lifetimes (rustc))
 - #62173 (rename InterpretCx -> InterpCx)
 - #62240 (wfcheck: resolve the type-vars in `AdtField` types)
 - #62249 (Use mem::take instead of mem::replace with default)
 - #62252 (Update mem::replace example to not be identical to mem::take)
 - #62258 (syntax: Unsupport `foo! bar { ... }` macros in the parser)
 - #62268 (Clean up inherent_impls)
 - #62287 (Use link attributes on extern "C" blocks with llvm-libuwind)
 - #62295 (miri realloc: do not require giving old size+align)
 - #62297 (refactor check_for_substitution)
 - #62316 (When possible without changing semantics, implement Iterator::last in terms of DoubleEndedIterator::next_back for types in liballoc and libcore.)
 - #62317 (Migrate `compile-pass` annotations to `build-pass`)
 - #62337 (Fix bucket in CPU usage script)
 - #62344 (simplify Option::get_or_insert)
 - #62346 (enable a few more tests in Miri and update the comment for others)
 - #62351 (remove bogus example from drop_in_place)

Failed merges:

r? @ghost
@bors bors merged commit fc918a3 into rust-lang:master Jul 4, 2019
@RalfJung RalfJung deleted the miri-interp branch July 6, 2019 08:05
@ghost
Copy link

ghost commented Jul 10, 2019 •
edited by ghost
Loading

miri still broken?!
or maybe not, it's just that rust thinks miri is at commit
commit d2df509 (HEAD)
Date: Mon Jul 1 12:31:57 2019 +0000

I see it's fixed in miri rust-lang/miri@1729965

now if only I can tell rust to use a newer commit hmm... ok this worked: config.toml set submodules = false then in rust/src/tools/miri git checkout master; git pull then recompile rust via ./x.py ...
11 minutes 48 seconds more and rust is install-ed

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.
4 participants
@RalfJung @oli-obk @bors @rust-highfive