Update to rustc changes #1402
Merged
Update to rustc changes #1402
Conversation
This file contains 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
RalfJung
reviewed
May 8, 2020
src/diagnostics.rs
Outdated
| @@ -48,7 +48,7 @@ pub enum NonHaltingDiagnostic { | |||
| /// Emit a custom diagnostic without going through the miri-engine machinery | |||
| pub fn report_error<'tcx, 'mir>( | |||
| ecx: &InterpCx<'mir, 'tcx, Evaluator<'mir, 'tcx>>, | |||
| mut e: InterpErrorInfo<'tcx>, | |||
| e: InterpErrorInfo<'tcx>, | |||
There was a problem hiding this comment.
i probably didn't rebase enough. This PR will need to get rebased anyway, it'll go away then.
RalfJung
force-pushed
the
alloc_map_unlock
branch
from
ef336e7 to
4f06197
Compare
|
@bors r+ |
|
📌 Commit 4f06197 has been approved by |
|
☀️ Test successful - checks-travis, status-appveyor |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
changes needed once rust-lang/rust#71508 gets merged