Auto merge of #2150 - RalfJung:rustup, r=RalfJung

Rustup In particular, this contains rust-lang/rust#97219. Miri support for actually erroring on misuse of `ptr::invalid` will happen later. Also move some more tests to better locations.
rust-lang · May 23, 2022 · 31fb32e · 31fb32e
2 parents 8f01d86 + 460a013
commit 31fb32e
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 1 deletion.
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-22ee39504a702f75485582d02060495a01254de1
+9e2f65586366b731f13a10021c5191a664f4adc2
diff --git a/tests/compile-fail/null_pointer_deref.rs → ...l/dangling_pointers/null_pointer_deref.rs b/tests/compile-fail/null_pointer_deref.rs → ...l/dangling_pointers/null_pointer_deref.rs
diff --git a/tests/compile-fail/null_pointer_deref_zst.rs → ...ngling_pointers/null_pointer_deref_zst.rs b/tests/compile-fail/null_pointer_deref_zst.rs → ...ngling_pointers/null_pointer_deref_zst.rs
diff --git a/tests/compile-fail/null_pointer_write.rs → ...l/dangling_pointers/null_pointer_write.rs b/tests/compile-fail/null_pointer_write.rs → ...l/dangling_pointers/null_pointer_write.rs
diff --git a/tests/compile-fail/null_pointer_write_zst.rs → ...ngling_pointers/null_pointer_write_zst.rs b/tests/compile-fail/null_pointer_write_zst.rs → ...ngling_pointers/null_pointer_write_zst.rs
diff --git a/tests/compile-fail/ptr_int_unexposed.rs → ...pile-fail/provenance/ptr_int_unexposed.rs b/tests/compile-fail/ptr_int_unexposed.rs → ...pile-fail/provenance/ptr_int_unexposed.rs
diff --git a/tests/compile-fail/ptr_legacy_provenance.rs → ...-fail/provenance/ptr_legacy_provenance.rs b/tests/compile-fail/ptr_legacy_provenance.rs → ...-fail/provenance/ptr_legacy_provenance.rs
diff --git a/.../compile-fail/strict-provenance-offset.rs → ...il/provenance/strict-provenance-offset.rs b/.../compile-fail/strict-provenance-offset.rs → ...il/provenance/strict-provenance-offset.rs
diff --git a/...mpile-fail/strict_provenance_transmute.rs → ...provenance/strict_provenance_transmute.rs b/...mpile-fail/strict_provenance_transmute.rs → ...provenance/strict_provenance_transmute.rs
diff --git a/...mpile-fail/ptr_integer_array_transmute.rs → ...l/validity/ptr_integer_array_transmute.rs b/...mpile-fail/ptr_integer_array_transmute.rs → ...l/validity/ptr_integer_array_transmute.rs
diff --git a/tests/compile-fail/too-big-slice.rs → tests/compile-fail/validity/too-big-slice.rs b/tests/compile-fail/too-big-slice.rs → tests/compile-fail/validity/too-big-slice.rs
diff --git a/tests/compile-fail/too-big-unsized.rs → .../compile-fail/validity/too-big-unsized.rs b/tests/compile-fail/too-big-unsized.rs → .../compile-fail/validity/too-big-unsized.rs