diff options
| author | bors <bors@rust-lang.org> | 2017-12-14 15:37:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-12-14 15:37:39 +0000 |
| commit | 2974104276265858d74733d7ebcca1d3347fd34e (patch) | |
| tree | 3095c0f81251260b751ccc6c6fe855ba116339a4 /src/libstd/sys | |
| parent | 8624ea51172c8a86d5c7c47d740be65a3a9efbc6 (diff) | |
| parent | 7a2bff7f1a253f6f3d713c153d651f4d52038be5 (diff) | |
Auto merge of #45002 - oli-obk:miri, r=eddyb
Validate miri against the HIR const evaluator r? @eddyb cc @alexcrichton @arielb1 @RalfJung The interesting parts are the last few functions in `librustc_const_eval/eval.rs` * We warn if miri produces an error while HIR const eval does not. * We warn if miri produces a value that does not match the value produced by HIR const eval * if miri succeeds and HIR const eval fails, nothing is emitted, but we still return the HIR error * if both error, nothing is emitted and the HIR const eval error is returned So there are no actual changes, except that miri is forced to produce the same values as the old const eval. * This does **not** touch the const evaluator in trans at all. That will come in a future PR. * This does **not** cause any code to compile that didn't compile before. That will also come in the future It would be great if someone could start a crater run if travis passes
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/redox/fast_thread_local.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/redox/fast_thread_local.rs b/src/libstd/sys/redox/fast_thread_local.rs index 9f0eee024d5..6a007e98827 100644 --- a/src/libstd/sys/redox/fast_thread_local.rs +++ b/src/libstd/sys/redox/fast_thread_local.rs @@ -81,7 +81,7 @@ pub unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern fn(*mut u8)) { unsafe extern fn run_dtors(mut ptr: *mut u8) { while !ptr.is_null() { let list: Box<List> = Box::from_raw(ptr as *mut List); - for &(ptr, dtor) in list.iter() { + for (ptr, dtor) in list.into_iter() { dtor(ptr); } ptr = DTORS.get(); |
