Fix doc tests

Update CI matrix to combine different features Signed-off-by: Tin Švagelj <[email protected]>
Caellian · Mar 22, 2024 · 3b147a8 · 3b147a8
1 parent 4a02aab
commit 3b147a8
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 49 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,26 +3,38 @@ name: ci
 on:
   pull_request:
   push:
-    branches:
-      - master
 
 env:
   CARGO_TERM_COLOR: always
 
 jobs:
   test:
-    runs-on: ubuntu-latest
     strategy:
       matrix:
-        include:
-          - rust: stable # stable, std
-            features: ""
-          - rust: stable # stable, no_std
-            features: --features no_std
-          - rust: nightly # nightly, std
-            features: --features ptr_metadata,allocator_api
-          - rust: nightly # nightly, no_std
-            features: --features ptr_metadata,error_in_core,allocator_api,no_std
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        rust: ["stable", "nightly"]
+        feature_no_std: [true, false]
+        feature_debug: [true, false]
+        feature_unsafe_impl: [true, false]
+        feature_ptr_metadata: [true, false]
+        feature_error_in_core: [true, false]
+        feature_allocator_api: [true, false]
+        exclude:
+          - rust: stable
+            ptr_metadata: true
+          - rust: stable
+            error_in_core: true
+          - rust: stable
+            allocator_api: true
+          - rust: nightly
+            ptr_metadata: false
+          - rust: nightly
+            error_in_core: false
+          - rust: nightly
+            allocator_api: false
+    runs-on: ${{ matrix.os }}
+    name: |
+      test - ${{ matrix.os }}; ${{ matrix.rust }} rust; features: join(matrix.feature_*, ',') }}
     env:
       RUST_BACKTRACE: 1 # Emit backtraces on panics.
     steps:
@@ -32,10 +44,20 @@ jobs:
           toolchain: ${{ matrix.rust }}
           profile: minimal
           override: true
-      - run: cargo test ${{ matrix.features }} --verbose
+      - run: |
+          echo "FEATURES=
+          ${{ (matrix.feature_no_std == true && "no_std,") || "" }}
+          ${{ (matrix.feature_debug == true && "debug,") || "" }}
+          ${{ (matrix.feature_unsafe_impl == true && "unsafe_impl,") || "" }}
+          ${{ (matrix.feature_ptr_metadata == true && "ptr_metadata,") || "" }}
+          ${{ (matrix.feature_error_in_core == true && "error_in_core,") || "" }}
+          ${{ (matrix.feature_allocator_api == true && "allocator_api,") || "" }}
+          " >> $GITHUB_ENV
+      - run: cargo test --no-default-features --features=${{ env.FEATURES }} --verbose
 
   lint:
     runs-on: ubuntu-latest
+    needs: test
     steps:
       - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
@@ -48,11 +70,15 @@ jobs:
 
   miri:
     runs-on: ubuntu-latest
+    needs: test
     steps:
       - uses: actions/checkout@v3
       - name: Install Miri
-        run: |
-          rustup toolchain install nightly --component miri
-          rustup override set nightly
-          cargo miri setup
-      - run: cargo miri test --all-features --verbose
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly
+          profile: minimal
+          components: miri
+          override: true
+      - run: cargo miri setup
+      - run: cargo miri test --all-features --verbose --color=always
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "rust-analyzer.check.features": "all",
+}
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,20 +9,23 @@ keywords = ["memory", "contiguous", "storage", "container", "nostd"]
 categories = ["data-structures", "memory-management", "no-std"]
 repository = "https://github.com/Caellian/contiguous_mem"
 
+[[example]]
+name = "game_loading"
+path = "examples/game_loading.rs"
+required-features = ["unsafe_impl"]
+
 [[example]]
 name = "ptr_metadata"
 path = "examples/ptr_metadata.rs"
 required-features = ["ptr_metadata"]
 
+[[example]]
+name = "unsafe_impl"
+path = "examples/unsafe_impl.rs"
+required-features = ["unsafe_impl"]
+
 [features]
-default = [
-    "no_std",
-    "unsafe_impl",
-    "debug",
-    "ptr_metadata",
-    "error_in_core",
-    "allocator_api",
-]
+default = ["unsafe_impl", "debug"]
 
 no_std = [] # No-std support
 debug = []  # Enable debug attributes

diff --git a/src/lib.rs b/src/lib.rs
@@ -67,7 +67,7 @@ impl<Impl: ImplDetails<DefaultMemoryManager>> ContiguousMemory<Impl> {
     /// # #![allow(unused_mut)]
     /// use contiguous_mem::ContiguousMemory;
     ///
-    /// let mut storage = ContiguousMemory::new();
+    /// let mut storage: ContiguousMemory = ContiguousMemory::new();
     /// ```
     pub fn new() -> Self {
         Self {
@@ -93,7 +93,7 @@ impl<Impl: ImplDetails<DefaultMemoryManager>> ContiguousMemory<Impl> {
     /// # #![allow(unused_mut)]
     /// use contiguous_mem::ContiguousMemory;
     ///
-    /// let mut storage = ContiguousMemory::with_capacity(1024);
+    /// let mut storage: ContiguousMemory = ContiguousMemory::with_capacity(1024);
     /// # assert_eq!(storage.capacity(), 1024);
     /// # assert_eq!(storage.align(), core::mem::align_of::<usize>());
     /// ```
@@ -124,7 +124,7 @@ impl<Impl: ImplDetails<DefaultMemoryManager>> ContiguousMemory<Impl> {
     /// use core::alloc::Layout;
     /// use contiguous_mem::ContiguousMemory;
     ///
-    /// let mut storage = ContiguousMemory::with_layout(
+    /// let mut storage: ContiguousMemory = ContiguousMemory::with_layout(
     ///     Layout::from_size_align(512, align_of::<u32>()).unwrap()
     /// );
     /// # assert_eq!(storage.capacity(), 512);
@@ -151,7 +151,7 @@ impl<Impl: ImplDetails<A>, A: ManageMemory> ContiguousMemory<Impl, A> {
     /// use contiguous_mem::ContiguousMemory;
     /// use contiguous_mem::memory::DefaultMemoryManager;
     ///
-    /// let mut storage = ContiguousMemory::with_alloc(
+    /// let mut storage: ContiguousMemory = ContiguousMemory::with_alloc(
     ///     DefaultMemoryManager
     /// );
     /// # assert_eq!(storage.capacity(), 0);
@@ -181,7 +181,7 @@ impl<Impl: ImplDetails<A>, A: ManageMemory> ContiguousMemory<Impl, A> {
     /// use contiguous_mem::ContiguousMemory;
     /// use contiguous_mem::memory::DefaultMemoryManager;
     ///
-    /// let mut storage = ContiguousMemory::with_capacity_and_alloc(
+    /// let mut storage: ContiguousMemory = ContiguousMemory::with_capacity_and_alloc(
     ///     256,
     ///     DefaultMemoryManager
     /// );
@@ -218,7 +218,7 @@ impl<Impl: ImplDetails<A>, A: ManageMemory> ContiguousMemory<Impl, A> {
     /// use contiguous_mem::ContiguousMemory;
     /// use contiguous_mem::memory::DefaultMemoryManager;
     ///
-    /// let mut storage = ContiguousMemory::with_layout_and_alloc(
+    /// let mut storage: ContiguousMemory = ContiguousMemory::with_layout_and_alloc(
     ///     Layout::from_size_align(0, align_of::<u32>()).unwrap(),
     ///     DefaultMemoryManager
     /// );
@@ -234,17 +234,17 @@ impl<Impl: ImplDetails<A>, A: ManageMemory> ContiguousMemory<Impl, A> {
         }
     }
 
-    /// Returns the base address of the allocated memory.
+    /// Returns the [`MemoryBase`] of the container.
     ///
     /// # Examples
     /// ```
     /// use contiguous_mem::ContiguousMemory;
     ///
-    /// let mut s = ContiguousMemory::new();
-    /// assert_eq!(s.base(), None);
+    /// let mut s: ContiguousMemory = ContiguousMemory::new();
+    /// assert!(!s.base().is_allocated());
     ///
     /// let r = s.push(6);
-    /// assert_eq!(s.base().is_some(), true);
+    /// assert!(s.base().is_allocated());
     /// ```
     pub fn base(&self) -> MemoryBase {
         *ReadableInner::read(&self.inner.base).expect("can't read base")
@@ -258,7 +258,7 @@ impl<Impl: ImplDetails<A>, A: ManageMemory> ContiguousMemory<Impl, A> {
     /// use core::ptr::null;
     /// use contiguous_mem::ContiguousMemory;
     ///
-    /// let mut s = ContiguousMemory::new();
+    /// let mut s: ContiguousMemory = ContiguousMemory::new();
     /// assert_eq!(s.base_ptr(), null());
     ///
     /// let r = s.push(3);
@@ -279,7 +279,7 @@ impl<Impl: ImplDetails<A>, A: ManageMemory> ContiguousMemory<Impl, A> {
     /// ```
     /// use contiguous_mem::ContiguousMemory;
     ///
-    /// let mut s = ContiguousMemory::new();
+    /// let mut s: ContiguousMemory = ContiguousMemory::new();
     /// assert_eq!(s.capacity(), 0);
     ///
     /// let r1 = s.push(1u8);
@@ -305,7 +305,7 @@ impl<Impl: ImplDetails<A>, A: ManageMemory> ContiguousMemory<Impl, A> {
     /// ```
     /// use contiguous_mem::ContiguousMemory;
     ///
-    /// let mut s = ContiguousMemory::new();
+    /// let mut s: ContiguousMemory = ContiguousMemory::new();
     /// assert_eq!(s.size(), 0);
     ///
     /// let r1 = s.push(1u8);
@@ -335,7 +335,7 @@ impl<Impl: ImplDetails<A>, A: ManageMemory> ContiguousMemory<Impl, A> {
     /// use core::mem::align_of;
     /// use contiguous_mem::ContiguousMemory;
     ///
-    /// let mut s = ContiguousMemory::new();
+    /// let mut s: ContiguousMemory = ContiguousMemory::new();
     /// assert_eq!(s.align(), align_of::<usize>());
     /// ```
     #[inline]
@@ -351,7 +351,7 @@ impl<Impl: ImplDetails<A>, A: ManageMemory> ContiguousMemory<Impl, A> {
     /// use core::mem::align_of;
     /// use contiguous_mem::ContiguousMemory;
     ///
-    /// let mut s = ContiguousMemory::new();
+    /// let mut s: ContiguousMemory = ContiguousMemory::new();
     /// assert_eq!(
     ///     s.layout(),
     ///     Layout::from_size_align(0, align_of::<usize>()).unwrap()
@@ -373,7 +373,7 @@ impl<Impl: ImplDetails<A>, A: ManageMemory> ContiguousMemory<Impl, A> {
     /// ```
     /// use contiguous_mem::ContiguousMemory;
     ///
-    /// let mut s = ContiguousMemory::new();
+    /// let mut s: ContiguousMemory = ContiguousMemory::new();
     /// assert_eq!(s.can_push_t::<u32>(), false);
     ///
     /// let r1 = s.push(1u32);
@@ -398,7 +398,7 @@ impl<Impl: ImplDetails<A>, A: ManageMemory> ContiguousMemory<Impl, A> {
     /// use core::alloc::Layout;
     /// use contiguous_mem::ContiguousMemory;
     ///
-    /// let mut s = ContiguousMemory::new();
+    /// let mut s: ContiguousMemory = ContiguousMemory::new();
     ///
     /// let r1 = s.push([0u32; 4]);
     ///
@@ -430,7 +430,7 @@ impl<Impl: ImplDetails<A>, A: ManageMemory> ContiguousMemory<Impl, A> {
     /// ```
     /// use contiguous_mem::ContiguousMemory;
     ///
-    /// let mut s = ContiguousMemory::with_capacity(4);
+    /// let mut s: ContiguousMemory = ContiguousMemory::with_capacity(4);
     /// assert_eq!(s.capacity(), 4);
     /// assert_eq!(s.size(), 0);
     ///
@@ -462,7 +462,7 @@ impl<Impl: ImplDetails<A>, A: ManageMemory> ContiguousMemory<Impl, A> {
     /// ```
     /// use contiguous_mem::ContiguousMemory;
     ///
-    /// let mut s = ContiguousMemory::new();
+    /// let mut s: ContiguousMemory = ContiguousMemory::new();
     ///
     /// assert!(s.try_grow_to(1024).is_ok());
     ///
@@ -620,7 +620,7 @@ impl<Impl: ImplDetails<A>, A: ManageMemory> ContiguousMemory<Impl, A> {
     /// ```
     /// use contiguous_mem::ContiguousMemory;
     ///
-    /// let mut s = ContiguousMemory::with_capacity(4);
+    /// let mut s: ContiguousMemory = ContiguousMemory::with_capacity(4);
     /// assert_eq!(s.capacity(), 4);
     ///
     /// let r = s.push(1u32);
@@ -657,7 +657,7 @@ impl<Impl: ImplDetails<A>, A: ManageMemory> ContiguousMemory<Impl, A> {
     /// ```
     /// use contiguous_mem::ContiguousMemory;
     ///
-    /// let mut s = ContiguousMemory::new();
+    /// let mut s: ContiguousMemory = ContiguousMemory::new();
     ///
     /// assert!(s.try_reserve_exact(1024).is_ok());
     /// assert_eq!(s.capacity(), 1024);
@@ -879,13 +879,13 @@ impl<Impl: ImplDetails<A>, A: ManageMemory> ContiguousMemory<Impl, A> {
     /// # use contiguous_mem::memory::DefaultMemoryManager;
     /// # use core::alloc::Layout;
     /// # use core::mem;
-    /// # let mut storage = ContiguousMemory::new();
+    /// # let mut storage: ContiguousMemory = ContiguousMemory::new();
     /// let value = vec!["ignore", "drop", "for", "me"];
     /// let erased = &value as *const Vec<&str> as *const ();
     /// let layout = Layout::new::<Vec<&str>>();
     ///
     /// // Reference type arguments must be fully specified.
-    /// let stored: CERef<Vec<&str>, DefaultMemoryManager> = unsafe {
+    /// let stored: EntryRef<Vec<&str>, DefaultMemoryManager> = unsafe {
     ///     mem::transmute(storage.push_raw(erased, layout))
     /// };
     /// ```