Merge pull request #116 from bluss/maybe-uninit-for-0.5

Update ArrayString to use union and prepare for 0.5
bluss · Dec 18, 2018 · 345d420 · 345d420
2 parents 7496a5f + 74745a9
commit 345d420
Show file tree

Hide file tree

Showing 6 changed files with 152 additions and 72 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,43 +4,42 @@ env:
   - FEATURES='serde-1'
 matrix:
   include:
-    - rust: 1.20.0
-    - rust: stable
-      env:
-        - NODEFAULT=1
-        - NODROP_FEATURES='use_needs_drop'
-    - rust: 1.22.1
+    - rust: 1.24.1
       env:
       - FEATURES='array-sizes-33-128 array-sizes-129-255'
+    - rust: stable
+    - rust: stable
+      env:
+      - FEATURES='serde-1'
     - rust: stable
       env:
       - FEATURES='array-sizes-33-128 array-sizes-129-255'
     - rust: beta
     - rust: nightly
       env:
-        - NODEFAULT=1
-        - ARRAYVECTEST_ENSURE_UNION=1
+      - ARRAYVECTEST_ENSURE_UNION=1
     - rust: nightly
       env:
-      - NODROP_FEATURES='use_needs_drop'
+      - FEATURES='serde'
       - ARRAYVECTEST_ENSURE_UNION=1
     - rust: nightly
       env:
-      - FEATURES='serde use_union'
-      - NODROP_FEATURES='use_union'
+      - FEATURES='serde-1'
       - ARRAYVECTEST_ENSURE_UNION=1
+    - rust: nightly
+      env:
+      - FEATURES='array-sizes-33-128 array-sizes-129-255'
 branches:
   only:
     - master
     - 0.4
 script:
   - |
-      ([ ! -z "$NODROP_FEATURES" ] || cargo build --verbose --features "$FEATURES") &&
-      ([ "$NODEFAULT" != 1 ] || cargo build --verbose --no-default-features) &&
-      ([ ! -z "$NODROP_FEATURES" ] || cargo test --verbose --features "$FEATURES") &&
-      ([ ! -z "$NODROP_FEATURES" ] || cargo test --release --verbose --features "$FEATURES") &&
-      ([ ! -z "$NODROP_FEATURES" ] || cargo bench --verbose --features "$FEATURES" -- --test) &&
-      ([ ! -z "$NODROP_FEATURES" ] || cargo doc --verbose --features "$FEATURES") &&
-      ([ "$NODEFAULT" != 1 ] || cargo build --verbose --manifest-path=nodrop/Cargo.toml --no-default-features) &&
-      cargo test --verbose --manifest-path=nodrop/Cargo.toml --features "$NODROP_FEATURES" &&
-      cargo bench --verbose --manifest-path=nodrop/Cargo.toml --features "$NODROP_FEATURES" -- --test
+      cargo build -v --no-default-features &&
+      cargo build -v --features "$FEATURES" &&
+      cargo test -v --features "$FEATURES" &&
+      cargo test -v --release --features "$FEATURES" &&
+      cargo bench -v --features "$FEATURES" --no-run &&
+      cargo doc -v --features "$FEATURES" &&
+      cargo build -v --manifest-path=nodrop/Cargo.toml &&
+      cargo test -v --manifest-path=nodrop/Cargo.toml
diff --git a/Cargo.toml b/Cargo.toml
@@ -44,9 +44,6 @@ serde-1 = ["serde"]
 array-sizes-33-128 = []
 array-sizes-129-255 = []
 
-# has no effect
-use_union = []
-
 [package.metadata.docs.rs]
 features = ["serde-1"]
 

diff --git a/src/array.rs b/src/array.rs
@@ -15,14 +15,14 @@
 pub unsafe trait Array {
     /// The array’s element type
     type Item;
+    /// The smallest type that can index and tell the length of the array.
     #[doc(hidden)]
-    /// The smallest index type that indexes the array.
     type Index: Index;
+    /// The array's element capacity
+    const CAPACITY: usize;
     #[doc(hidden)]
     fn as_ptr(&self) -> *const Self::Item;
     #[doc(hidden)]
-    fn as_mut_ptr(&mut self) -> *mut Self::Item;
-    #[doc(hidden)]
     fn capacity() -> usize;
 }
 
@@ -91,14 +91,12 @@ macro_rules! fix_array_impl {
         unsafe impl<T> Array for [T; $len] {
             type Item = T;
             type Index = $index_type;
+            const CAPACITY: usize = $len;
             #[doc(hidden)]
             #[inline(always)]
             fn as_ptr(&self) -> *const T { self as *const _ as *const _ }
             #[doc(hidden)]
             #[inline(always)]
-            fn as_mut_ptr(&mut self) -> *mut T { self as *mut _ as *mut _}
-            #[doc(hidden)]
-            #[inline(always)]
             fn capacity() -> usize { $len }
         }
     )