Merge branch '0.4' into master

* 0.4: 0.4.11 TEST: Update tests for new MaybeUninit usage FEAT: Use stable MaybeUninit when we can (feature detected)
2019-07-10 17:51:59 +02:00
parent 76e89544a5 9792502792
commit e68c0c7b48
7 changed files with 74 additions and 13 deletions
@@ -635,10 +635,8 @@ fn test_sizes_129_255() {


 #[test]
-fn test_nightly_uses_maybe_uninit() {
-    if option_env!("ARRAYVECTEST_ENSURE_UNION").map(|s| !s.is_empty()).unwrap_or(false) {
-        assert!(cfg!(has_manually_drop_in_union));
-        type ByteArray = ArrayVec<[u8; 4]>;
-        assert!(mem::size_of::<ByteArray>() == 5);
+fn test_newish_stable_uses_maybe_uninit() {
+    if option_env!("ARRAYVECTEST_ENSURE_MAYBEUNINIT").map(|s| !s.is_empty()).unwrap_or(false) {
+        assert!(cfg!(has_stable_maybe_uninit));
    }
 }