.editorconfig

@@ -8,5 +8,8 @@ trim_trailing_whitespace = true
 [*.d]
 indent_style = tab
 
-[*.json]
+[*.{json,sdl}]
+
+[*.yml]
 indent_style = space
+indent_size = 2

.github/workflows/CI.yml

@@ -0,0 +1,85 @@
+name: CI
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  Test:
+    if: "!contains(github.event.head_commit.message, '[skip ci]')"
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-20.04
+          - windows-2019
+          - macos-10.15
+        d:
+          - "ldc-1.27.1"
+          - "dmd-2.097.2"
+        meson:
+          - 0.59.1
+        ninja:
+          - 1.10.2
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      # Cache
+      - name: Cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.dub
+            ~/AppData/Local/dub
+            ~/.cache/pip
+            ~/AppData/Local/pip/cache
+          key: "containers-cache-OS:${{ matrix.os }}-D:${{ matrix.d }}-${{ matrix.meson }}-${{ matrix.ninja }}-deps:${{ hashFiles('./meson.build') }}-${{ hashFiles('./dub.sdl') }}"
+
+      # Setup compilers and tools
+
+      - name: Setup D
+        uses: dlang-community/setup-dlang@v1
+        with:
+          compiler: ${{ matrix.d }}
+
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Setup Meson
+        run: pip install meson==${{ matrix.meson }}
+
+      - name: Setup Ninja
+        uses: aminya/install-cmake@new-versions-and-arch
+        with:
+          cmake: false
+          ninja: ${{ matrix.ninja }}
+
+      # Build and Test
+
+      - name: Build documentation
+        run: |
+          dub build --build=ddox
+          dub build --build=docs
+
+      - name: Build
+        run: |
+          meson setup ./build
+          meson compile -C ./build
+
+      - name: Install gcc-multilib
+        if: contains(matrix.os, 'ubuntu')
+        run: sudo apt-get install -y gcc-multilib
+
+      - name: Make Test
+        run: |
+          make -B -C test/
+
+      # TODO it fails to run the UnrolledList test on ldc
+      - name: Dub Test
+        run: |
+          dub test

.gitignore

@@ -21,4 +21,4 @@ __test__*__
 .directory
 *.userprefs
 .vscode
-emsi_containers-test-unittest
+build/

README.md

@@ -3,9 +3,6 @@ Containers [![CI status](https://travis-ci.org/dlang-community/containers.svg?br
 
 Containers backed by std.experimental.allocator
 
-# Dependencies
-Run `git submodule update --init --recursive` after cloning this repository.
-
 # Documentation
 Documentation is available at http://dlang-community.github.io/containers/index.html
 

dub.sdl

@@ -0,0 +1,10 @@
+name "emsi_containers"
+description "Containers that use Phobos' experimental allocators"
+homepage "https://github.com/dlang-community/containers"
+authors "EMSI" "DLang Community"
+license "BSL-1.0"
+targetPath "build"
+buildType "unittest" {
+	versions "emsi_containers_unittest"
+	buildOptions "debugMode" "debugInfo" "unittests"
+}

meson.build

@@ -1,14 +1,11 @@
 project('dcontainers', 'd',
-    meson_version: '>=0.44',
+    meson_version: '>=0.52',
     license: 'BSL-1.0',
     version: '0.8.0'
 )
 
 project_soversion = '0'
 
-pkgc = import('pkgconfig')
-allocator_dep = dependency('stdx-allocator', version: '>= 2.77', fallback: ['stdx-allocator', 'allocator_dep'])
-
 #
 # Sources
 #
@@ -33,24 +30,22 @@ dcontainers_src = [
     'src/containers/unrolledlist.d'
 ]
 
+dc = meson.get_compiler('d')
 src_dir = include_directories('src/')
 
 #
 # Targets
 #
-dcontainers_lib = library('dcontainers',
+dcontainers_lib = static_library('dcontainers',
         [dcontainers_src],
         include_directories: [src_dir],
         install: true,
-        version: meson.project_version(),
-        soversion: project_soversion,
-        dependencies: [allocator_dep]
 )
 
+pkgc = import('pkgconfig')
 pkgc.generate(name: 'dcontainers',
               libraries: [dcontainers_lib],
               subdirs: 'd/containers',
-              requires: ['stdx-allocator'],
               version: meson.project_version(),
               description: 'Containers backed by std.experimental.allocator.'
 )
@@ -59,20 +54,30 @@ pkgc.generate(name: 'dcontainers',
 dcontainers_dep = declare_dependency(
     link_with: [dcontainers_lib],
     include_directories: [src_dir],
-    dependencies: [allocator_dep]
 )
 
 #
 # Tests
 #
+if dc.get_id() == 'gcc'
+    test_link_args = []
+    test_main_file = configure_file(capture: true,
+                                    command: ['echo', 'int main(string[] args) { return 0; }'],
+                                    output: 'unittest_main.d'
+	)
+else
+    test_link_args = ['-main']
+    test_main_file = []
+endif
+
 dcontainers_test_exe = executable('test_dcontainers',
     [dcontainers_src,
     'test/compile_test.d',
-    'test/external_allocator_test.d'],
+    'test/external_allocator_test.d',
+    test_main_file],
     include_directories: [src_dir],
-    dependencies: [allocator_dep],
     d_unittest: true,
-    link_args: '-main'
+    link_args: test_link_args
 )
 test('test_dcontainers', dcontainers_test_exe)
 

src/containers/cyclicbuffer.d

@@ -8,7 +8,7 @@
 module containers.cyclicbuffer;
 
 private import core.exception : onRangeError;
-private import stdx.allocator.mallocator : Mallocator;
+private import std.experimental.allocator.mallocator : Mallocator;
 private import std.range.primitives : empty, front, back, popFront, popBack;
 private import containers.internal.node : shouldAddGCRange;
 
@@ -26,7 +26,7 @@ struct CyclicBuffer(T, Allocator = Mallocator, bool supportGC = shouldAddGCRange
 	@disable this(this);
 
 	private import std.conv : emplace;
-	private import stdx.allocator.common : stateSize;
+	private import std.experimental.allocator.common : stateSize;
 	private import std.traits : isImplicitlyConvertible, hasElaborateDestructor;
 
 	static if (stateSize!Allocator != 0)
@@ -40,9 +40,10 @@ struct CyclicBuffer(T, Allocator = Mallocator, bool supportGC = shouldAddGCRange
 		this(Allocator allocator) nothrow pure @safe @nogc
 		in
 		{
-			assert(allocator !is null, "Allocator must not be null");
+			static if (is(typeof(allocator is null)))
+				assert(allocator !is null, "Allocator must not be null");
 		}
-		body
+		do
 		{
 			this.allocator = allocator;
 		}
@@ -226,23 +227,23 @@ struct CyclicBuffer(T, Allocator = Mallocator, bool supportGC = shouldAddGCRange
 	auto ref front(this This)() nothrow pure @property @safe
 	{
 		version (assert) if (empty) onRangeError();
-		alias ET = ContainerElementType!(This, T);
+		alias ET = ContainerElementType!(This, T, true);
 		return cast(ET) storage[start];
 	}
 
 	/// Accesses to the item at the end of the buffer.
 	auto ref back(this This)() nothrow pure @property @safe
 	{
 		version (assert) if (empty) onRangeError();
-		alias ET = ContainerElementType!(This, T);
+		alias ET = ContainerElementType!(This, T, true);
 		return cast(ET) storage[end];
 	}
 
 	/// buffer[i]
 	auto ref opIndex(this This)(size_t i) nothrow pure @safe
 	{
 		version (assert) if (i >= length) onRangeError();
-		alias ET = ContainerElementType!(This, T);
+		alias ET = ContainerElementType!(This, T, true);
 		return cast(ET) storage[(start + i) % $];
 	}
 
@@ -449,8 +450,8 @@ private:
 version(emsi_containers_unittest) private
 {
 	import std.algorithm.comparison : equal;
-	import stdx.allocator.gc_allocator : GCAllocator;
-	import stdx.allocator.building_blocks.free_list : FreeList;
+	import std.experimental.allocator.gc_allocator : GCAllocator;
+	import std.experimental.allocator.building_blocks.free_list : FreeList;
 	import std.range : iota, lockstep, StoppingPolicy;
 
 	struct S
@@ -549,27 +550,27 @@ version(emsi_containers_unittest) unittest
 
 version(emsi_containers_unittest) unittest
 {
-	int a = 0;
+	int* a = new int;
 	{
 		CyclicBuffer!S b;
 		{
-			S s = { &a };
+			S s = { a };
 			foreach (i; 0 .. 5)
 				b.insertBack(s);
-			assert(a == 5);
+			assert(*a == 5);
 			foreach (i; 0 .. 5)
-				b.insertBack(S(&a));
-			assert(a == 10);
+				b.insertBack(S(a));
+			assert(*a == 10);
 			foreach (i; 0 .. 5)
 			{
 				b.removeBack();
 				b.removeFront();
 			}
-			assert(a == 20);
+			assert(*a == 20);
 		}
-		assert(a == 21);
+		assert(*a == 21);
 	}
-	assert(a == 21);
+	assert(*a == 21);
 }
 
 version(emsi_containers_unittest) unittest
@@ -678,26 +679,26 @@ version(emsi_containers_unittest) unittest
 
 version(emsi_containers_unittest) unittest
 {
-	int a = 0;
+	int* a = new int;
 	{
 		CyclicBuffer!S b;
 		foreach (i; 0 .. 5)
-			b.insertBack(S(&a));
-		assert(a == 5);
+			b.insertBack(S(a));
+		assert(*a == 5);
 	}
-	assert(a == 10);
-	a = 0;
+	assert(*a == 10);
+	*a = 0;
 	{
 		CyclicBuffer!S b;
 		foreach (i; 0 .. 4)
-			b.insertBack(S(&a));
-		assert(a == 4);
+			b.insertBack(S(a));
+		assert(*a == 4);
 		b.removeFront();
-		assert(a == 5);
-		b.insertBack(S(&a));
-		assert(a == 6);
+		assert(*a == 5);
+		b.insertBack(S(a));
+		assert(*a == 6);
 	}
-	assert(a == 10);
+	assert(*a == 10);
 }
 
 version(emsi_containers_unittest) unittest