Combine dependencies and dependencies-linux

Platform dependencies aren't supported according to the dub documentation, that states: "this setting does not support platform suffixes". dub test with dub 1.34.0 produces a warning: "dependencies-linux: Key is not a valid member of this section. Did you mean: dependencies" Then the build fails because it cannot find modules defined in the dependency.
Merge remote-tracking branch 'n8sh/DMD_2.105'
2023-09-25 18:35:33 +02:00 · 2023-09-23 17:22:27 +02:00 · 2023-09-23 16:16:33 +02:00 · 2023-09-22 16:08:24 -04:00 · 2023-09-22 16:07:59 -04:00 · 2023-09-22 15:43:36 -04:00
125 changed files with 6515 additions and 15910 deletions
--- a/.gitignore
+++ b/.gitignore
@ -9,7 +9,7 @@ dub.selections.json

 __test__*__
 __test__*__.core
-/tanya-test-*
+tanya-*test-*
 /dub_platform_probe[_-]*

 /docs/
--- a/.travis.yml
+++ b/.travis.yml
@ -1,61 +0,0 @@
-sudo: false
-
-os:
- linux
- osx
-
-language: d
-
-d:
- dmd-2.083.1
- dmd-2.082.1
-
-env:
-  global:
-  - LATEST=2.083.1
-
-  matrix:
-  - ARCH=x86_64
-  - ARCH=x86
-
-matrix:
-  include:
-  - name: D-Scanner
-    d: dmd-$LATEST
-    env: DSCANNER=0.5.11
-    os: linux
-  - name: DDoc
-    d: dmd-$LATEST
-    env: DDOC=true
-    os: linux
-  allow_failures:
-  - name: D-Scanner
-    d: dmd-$LATEST
-    env: DSCANNER=0.5.11
-    os: linux
-
-addons:
-  apt:
-    packages:
-    - gcc-multilib
-
-before_script:
- if [ "`$DC --version | head -n 1 | grep v$LATEST`" ] &&
-     [ -z "$DSCANNER$DDOC" ]; then
-    export UNITTEST="unittest-cov";
-  fi
-
-script:
- if [ -n "$DDOC" ]; then
-    dub build -b ddox --compiler=$DC;
-  elif [ -z "$DSCANNER" ]; then
-    dub test -b ${UNITTEST:-unittest} --arch=$ARCH --compiler=$DC;
-  else
-    dub fetch dscanner --version=$DSCANNER;
-
-    FILES=$(find source -type f);
-    dub run dscanner -- --styleCheck $FILES;
-  fi
-
-after_success:
- test "$UNITTEST" && bash <(curl -s https://codecov.io/bash)
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@ -1,5 +0,0 @@
-# Contributor Code of Conduct
-
-This project adheres to No Code of Conduct.  We are all adults.  We accept anyone's contributions.  Nothing else matters.
-
-For more information please visit the [No Code of Conduct](https://github.com/domgetter/NCoC) homepage.
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,107 +0,0 @@
-
-# Contributing
-
-Tanya is a project in active development, therefore any help is appreciated. Thank you for considering contributing
-to it, feel welcome.
-These guidelines describe ways to get started.
-
-
-## Ways to get involved
-
-* **Reporting a problem**: [Report](https://github.com/caraus-ecms/tanya/issues) bugs and usage problems you
-encounter.
-* **Fixing issues**: [The bug tracker](https://github.com/caraus-ecms/tanya/issues) contains a list of issues you
-can work on.
-* **Documentation**: You can improve API documentation by correcting grammar errors, completing existing texts and
-writing new ones, or providing usage examples.
-* **Testing**: Test coverage is important for a library. Writing tests is not only helpful, but is also a great way
-to get a feel for how tanya works.
-* **Adding new features**: Tanya is a growing library. If you think some feature is missing, you can suggest
-and implement this.
-
-
-## Opening an issue
-
-If you have found a bug, an error, have some question, or suggestion,
-[Open an issue](https://github.com/caraus-ecms/tanya/issues). I'll try to answer as soon as I can. There is also a
-list of open issues that mirror the current development process and progress. If you're looking for a challenge, just
-pick an issue you are interested in and start working on it. Fill free to comment on the issue to get more
-information.
-
-You can also look at the [milestones](https://github.com/Dlackware/gnome/milestones) to see what is planned for a
-specific release.
-
-
-## Contribution process
-
-### Creating a pull request
-
-I accept GitHub pull requests. Creating a pull request is like sending a patch with the suggested change.
-First you have to [fork](https://guides.github.com/activities/forking/) the repository. Clone your fork locally
-with `git clone` and create a new branch where you want to work. For example:
-
-```shell
-git checkout -b bugfix-x
-```
-Commit your changes to your fork:
-
-```shell
-git commit -m "Fix X"
-git push -u origin bugfix-x
-```
-
-After that if you visit your fork on GitHub, GitHub will suggest to create pull request. Just follow the steps
-described on GitHub to finish the process. See
-[Using Pull Requests](https://help.github.com/articles/about-pull-requests/) for more information.
-
-Please ensure that your fork is even with the upstream (original) repository. If not, you have to rebase your branch
-on upstream/master before submitting the pull request. See [Syncing a fork](https://help.github.com/articles/syncing-a-fork/) for a
-step-by-step guide.
-
-### Fixing a bug
-
-Add a unit test that demonstrates the bug along with a short description or link to the original bug.
-
-### Adding new features
-
-* Use Ddoc to document the feature.
-* Add some unit tests to prevent bugs.
-* [Documented D unit tests](https://dlang.org/spec/ddoc.html#using_ddoc_to_generate_examples) go into the documentation and can be used as an usage
-example. These tests should be readable and not complicated since they demonstrate how the feature is supposed to work.
-* More advanced tests should be put into a separate not documented unittest block.
-
-### Writing unit tests
-
-```d
-///
-unittest
-{
-    // A documented unit test has three slashes in front of it.
-}
-
-// Issue ##: https://github.com/caraus-ecms/tanya/issues/##.
-unittest
-{
-    // Not documented unit test may still have a description.
-}
-```
-
-### Style guide
-
-Make sure your changes follow [The D Style](https://dlang.org/dstyle.html) (including
-[Additional Requirements for Phobos](https://dlang.org/dstyle.html#phobos)).
-
-You can also use [dscanner](https://github.com/dlang-community/D-Scanner) to test the new code against the
-most guidlines. The root of this repository contains
-[dscanner.ini](https://github.com/caraus-ecms/tanya/blob/master/dscanner.ini), configuration file with settings for an
-automatic style check. Just go to the top-level directory and issue (this assumes `dscanner` is installed in your
-system):
-
-```shell
-dscanner --styleCheck source
-```
-
-## Questions and suggestions
-
-* [Open an issue](https://github.com/caraus-ecms/tanya/issues)
-* [Send an email](mailto:info@caraus.de)
--- a/README.md
+++ b/README.md
@ -1,11 +1,8 @@
 # Tanya

-[![Build Status](https://travis-ci.com/caraus-ecms/tanya.svg?branch=master)](https://travis-ci.com/caraus-ecms/tanya)
-[![Build status](https://ci.appveyor.com/api/projects/status/djkmverdfsylc7ti/branch/master?svg=true)](https://ci.appveyor.com/project/belka-ew/tanya/branch/master)
-[![codecov](https://codecov.io/gh/caraus-ecms/tanya/branch/master/graph/badge.svg)](https://codecov.io/gh/caraus-ecms/tanya)
 [![Dub version](https://img.shields.io/dub/v/tanya.svg)](https://code.dlang.org/packages/tanya)
 [![Dub downloads](https://img.shields.io/dub/dt/tanya.svg)](https://code.dlang.org/packages/tanya)
-[![License](https://img.shields.io/badge/license-MPL_2.0-blue.svg)](https://raw.githubusercontent.com/caraus-ecms/tanya/master/LICENSE)
+[![License: MPL 2.0](https://img.shields.io/badge/license-MPL_2.0-blue.svg)](https://opensource.org/licenses/MPL-2.0)

 Tanya is a general purpose library for D programming language.

@ -15,26 +12,19 @@ Garbage Collector heap. Everything in the library is usable in @nogc code.
 Tanya provides data structures and utilities to facilitate painless systems
 programming in D.

-* [API Documentation](https://docs.caraus.io/tanya)
-* [Contribution guidelines](CONTRIBUTING.md)
-
+- [API Documentation](https://docs.caraus.tech/tanya)

 ## Overview

 Tanya consists of the following packages and (top-level) modules:

 * `algorithm`: Collection of generic algorithms.
-* `async`: Event loop (epoll, kqueue and IOCP).
 * `bitmanip`: Bit manipulation.
 * `container`: Queue, Array, Singly and doubly linked lists, Buffers, UTF-8
 string, Set, Hash table.
 * `conv`: This module provides functions for converting between different
 types.
-* `encoding`: This package provides tools to work with text encodings.
-* `exception`: Common exceptions and errors.
 * `format`: Formatting and conversion functions.
-* `functional`: Functions that manipulate other functions and their argument
-lists.
 * `hash`: Hash algorithms.
 * `math`: Arbitrary precision integer and a set of functions.
 * `memory`: Tools for manual memory management (allocators, smart pointers).
@ -43,9 +33,6 @@ type information at compile-time, to transform from one type to another. It has
 also different algorithms for iterating, searching and modifying template
 arguments.
 * `net`: URL-Parsing, network programming.
-* `network`: Socket implementation. `network` is currently under rework.
-After finishing the new socket implementation will land in the `net` package and
-`network` will be deprecated.
 * `os`: Platform-independent interfaces to operating system functionality.
 * `range`: Generic functions and templates for D ranges.
 * `test`: Test suite for unittest-blocks.
@ -173,27 +160,9 @@ parameter is used)

 ### Supported compilers

-| DMD     | GCC             |
-|:-------:|:---------------:|
-| 2.083.1 | gdc-8 (2.081.2) |
-| 2.082.1 | gdc-7 (2.081.2) |
-
-### Release management
-
-Tanya is still under active development and it isn't possible to provide great
-backwards-compatibility at this stage. This won't change until 1.0.0. Almost
-every release contains new features or API changes alongside bug fixes. Thus:
-
- Patch releases add new functionality and bug fixes in a backwards-compatible
-manner
-
- Minor releases contain API breakages
-
- Major release number is always the same: `0.x.x`
-
-Deprecated functionality is where possible marked as such before getting
-removed. It is left in the library for one release: If 0.8.1 deprecates some
-feature, it is removed in the next release: 0.9.0.
+| DMD     | GCC       |
+|:-------:|:---------:|
+| 2.100.0 | 12.1      |

 ## Further characteristics

@ -214,4 +183,4 @@ aren't supported
 ## Feedback

 Any feedback about your experience with tanya would be greatly appreciated. Feel free to
-[contact me](mailto:info@caraus.de).
+[contact me](mailto:belka@caraus.de).
--- a/appveyor.yml
+++ b/appveyor.yml
@ -1,54 +0,0 @@
-platform: x64
-os: Visual Studio 2015
-
-environment:
-  matrix:
-    - DC: dmd
-      DVersion: 2.083.1
-      arch: x64
-    - DC: dmd
-      DVersion: 2.083.1
-      arch: x86
-    - DC: dmd
-      DVersion: 2.082.1
-      arch: x64
-    - DC: dmd
-      DVersion: 2.082.1
-      arch: x86
-
-skip_tags: true
-
-install:
-  - ps: function SetUpDCompiler
-        {
-          $env:toolchain = "msvc";
-          $version = $env:DVersion;
-          Invoke-WebRequest "http://downloads.dlang.org/releases/2.x/$($version)/dmd.$($version).windows.7z" -OutFile "c:\dmd.7z";
-          echo "finished.";
-          pushd c:\\;
-          7z x dmd.7z > $null;
-          popd;
-        }
-  - ps: SetUpDCompiler
-
-before_build:
-  - ps: if($env:arch -eq "x86"){
-          $env:compilersetupargs = "x86";
-          $env:Darch = "x86_mscoff";
-        }
-        elseif($env:arch -eq "x64"){
-          $env:compilersetupargs = "amd64";
-          $env:Darch = "x86_64";
-        }
-  - ps: $env:PATH += ";C:\dmd2\windows\bin;";
-  - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall" %compilersetupargs%
-
-build_script:
-  - echo dummy build script - dont remove me
-
-test_script:
-  - echo %Darch%
-  - echo %PATH%
-  - 'dub --version'
-  - '%DC% --version'
-  - dub test -b unittest --arch=%Darch% --compiler=%DC%
--- a/arch/build.ninja
+++ b/arch/build.ninja
@ -1,14 +0,0 @@
-rule gas
-  command = gcc -c $in -o $out
-
-rule archive
-  command = ar rcs $out $in
-
-build abs.o: gas x64/linux/math/abs.S
-build log.o: gas x64/linux/math/log.S
-build equal.o: gas x64/linux/memory/equal.S
-build fill.o: gas x64/linux/memory/fill.S
-build copy.o: gas x64/linux/memory/copy.S
-build syscall.o: gas x64/linux/syscall.S
-
-build tanya.a: archive syscall.o copy.o fill.o equal.o log.o abs.o
--- a/arch/x64/linux/concurrency/thread.S
+++ b/arch/x64/linux/concurrency/thread.S
@ -1,8 +0,0 @@
-	.text
-
-	.globl thrd_current
-	.type thrd_current, @function
-
-thrd_current:
-	mov %fs:0, %rax
-	ret
--- a/arch/x64/linux/math/abs.S
+++ b/arch/x64/linux/math/abs.S
@ -1,35 +0,0 @@
-	.text
-
-
-// fabsf.
-	.globl _D5tanya4math8nbtheory4fabsFNaNbNiNffZf
-	.type _D5tanya4math8nbtheory4fabsFNaNbNiNffZf, @function
-
-_D5tanya4math8nbtheory4fabsFNaNbNiNffZf:
-	mov $0x7fffffff, %eax
-	movq %rax, %xmm1
-	andpd %xmm1, %xmm0
-	ret
-
-
-// fabs.
-	.globl _D5tanya4math8nbtheory4fabsFNaNbNiNfdZd
-	.type _D5tanya4math8nbtheory4fabsFNaNbNiNfdZd, @function
-
-_D5tanya4math8nbtheory4fabsFNaNbNiNfdZd:
-	mov $0x7fffffffffffffff, %rax
-	movq %rax, %xmm1
-	andpd %xmm1, %xmm0
-	ret
-
-
-// fabsl.
-	.globl _D5tanya4math8nbtheory4fabsFNaNbNiNfeZe
-	.type _D5tanya4math8nbtheory4fabsFNaNbNiNfeZe, @function
-
-// Load the parameter from the stack onto FP stack, execute 'fabs' instruction
-// The result is returned in ST0.
-_D5tanya4math8nbtheory4fabsFNaNbNiNfeZe:
-	fldt 0x8(%rsp)
-	fabs
-	ret
--- a/arch/x64/linux/math/log.S
+++ b/arch/x64/linux/math/log.S
@ -1,48 +0,0 @@
-	.text
-
-
-// logf.
-	.globl _D5tanya4math8nbtheory4logfFNaNbNiNffZf
-	.type _D5tanya4math8nbtheory4logfFNaNbNiNffZf, @function
-
-_D5tanya4math8nbtheory4logfFNaNbNiNffZf:
-	movss %xmm0, -4(%rsp) // Put the argument onto the stack
-
-	fldln2 // Put lb(e) onto the FPU stack
-	flds -4(%rsp) // Put a float onto the FPU stack
-	fyl2x // %st1 * lb(%st0)
-
-	 // The result is on the FPU stack, but returned in %xmm0
-	fstps -4(%rsp)
-	movss -4(%rsp), %xmm0
-
-	ret
-
-
-// log.
-	.globl _D5tanya4math8nbtheory3logFNaNbNiNfdZd
-	.type _D5tanya4math8nbtheory3logFNaNbNiNfdZd, @function
-
-_D5tanya4math8nbtheory3logFNaNbNiNfdZd:
-	movsd %xmm0, -8(%rsp) // Put the argument onto the stack
-
-	fldln2 // Put lb(e) onto the FPU stack
-	fldl -8(%rsp) // Put a double onto the FPU stack
-	fyl2x // %st1 * lb(%st0)
-
-	 // The result is on the FPU stack, but returned in %xmm0
-	fstpl -8(%rsp)
-	movsd -8(%rsp), %xmm0
-
-	ret
-
-
-// logl.
-	.globl _D5tanya4math8nbtheory4loglFNaNbNiNfeZe
-	.type _D5tanya4math8nbtheory4loglFNaNbNiNfeZe, @function
-
-_D5tanya4math8nbtheory4loglFNaNbNiNfeZe:
-	fldln2 // Put lb(e) onto the FPU stack
-	fldt 8(%rsp) // Put the argument onto the FPU stack
-	fyl2x // %st1 * lb(%st0)
-	ret
--- a/arch/x64/linux/memory/copy.S
+++ b/arch/x64/linux/memory/copy.S
@ -1,67 +0,0 @@
-	.text
-
-/*
- * copyMemory.
- *
- * rdi - source length
- * rsi - source data.
- * rdx - target length.
- * rcx - target data.
- */
-	.globl _D5tanya6memory2op10copyMemoryFNaNbNixAvAvZv
-	.type _D5tanya6memory2op10copyMemoryFNaNbNixAvAvZv, @function
-
-_D5tanya6memory2op10copyMemoryFNaNbNixAvAvZv:
-		mov %rdi, %rdx
-		mov %rcx, %rdi
-
-		cmp  $0x08, %rdx
-		jc aligned_1
-		test $0x07, %edi
-		jz aligned_8
-
-	naligned:
-		movsb
-		dec  %rdx
-		test $0x07, %edi
-		jnz naligned
-
-	aligned_8:
-		mov %rdx,  %rcx
-		shr $0x03, %rcx
-		rep movsq
-		and $0x07, %edx
-		jz end
-
-	aligned_1:
-		// Write the remaining bytes
-		mov %rdx, %rcx
-		rep movsb
-
-	end:
-		ret
-
-/*
- * moveMemory.
- *
- * rdi - source length
- * rsi - source data.
- * rdx - target length.
- * rcx - target data.
- */
-	.globl _D5tanya6memory2op10moveMemoryFNaNbNixAvAvZv
-	.type _D5tanya6memory2op10moveMemoryFNaNbNixAvAvZv, @function
-
-_D5tanya6memory2op10moveMemoryFNaNbNixAvAvZv:
-		mov %rdi, %rdx
-
-		lea -1(%rdx, %rsi), %rsi
-		lea -1(%rdx, %rcx), %rdi
-		mov %rdx, %rcx
-
-		std // Set the direction flag
-
-		rep movsb
-
-		cld // Clear the direction flag
-		ret
--- a/arch/x64/linux/memory/equal.S
+++ b/arch/x64/linux/memory/equal.S
@ -1,59 +0,0 @@
-	.text
-
-/*
- * equalMemory.
- *
- * rdi - r1 length
- * rsi - r1 data.
- * rdx - r2 length.
- * rcx - r2 data.
- */
-	.globl _D5tanya6memory2op11equalMemoryFNaNbNixAvxQdZb
-	.type _D5tanya6memory2op11equalMemoryFNaNbNixAvxQdZb, @function
-_D5tanya6memory2op11equalMemoryFNaNbNixAvxQdZb:
-		// Compare the lengths
-		cmp %rdx, %rdi
-		jne not_equal
-
-		mov %rcx, %rdi
-
-		// Check if we're aligned
-		cmp $0x08, %rdx
-		jc aligned_1
-		test $0x07, %edi
-		jz aligned_8
-
-	naligned:
-		cmpsb
-		jne not_equal
-
-		dec %rdx
-		test $0x07, %edi
-		jnz naligned
-
-	aligned_8:
-		mov %rdx,  %rcx
-		shr $0x03, %rcx
-
-		repe cmpsq
-		jne not_equal
-
-		and $0x07, %edx
-		jz equal
-
-	aligned_1: // Compare the remaining bytes
-		mov %rdx, %rcx
-		cmp $0x0, %rcx
-
-		repe cmpsb
-		jne not_equal
-
-	equal:
-		mov $0x01, %rax // Return 1
-		jmp end
-
-	not_equal:
-		xor %rax, %rax // Return 0
-
-	end:
-		ret
--- a/arch/x64/linux/memory/fill.S
+++ b/arch/x64/linux/memory/fill.S
@ -1,160 +0,0 @@
-	.text
-
-/*
- * fillMemory.
- *
- * rdi - length.
- * rsi - pointer.
- * rdx - value filled with a byte.
- */
-	.globl _D5tanya6memory2op10fillMemoryFNaNbNiAvmZv
-	.type _D5tanya6memory2op10fillMemoryFNaNbNiAvmZv, @function
-
-_D5tanya6memory2op10fillMemoryFNaNbNiAvmZv:
-		// Check for zero length
-		test    %rdi, %rdi
-		jz end
-
-		mov     %rdi, %rax
-		mov     %rsi, %r8
-
-		movq    %rdx,  %xmm0
-		movlhps %xmm0, %xmm0
-
-		// Check if the pointer is aligned to a 16-byte boundary
-		and     $-0x10, %r8
-
-		// Compute the number of misaligned bytes
-		mov  %rsi, %r9
-		sub  %r8,  %r9
-
-		test %r9,  %r9
-		jz aligned
-
-		// Get the number of bytes to be written until we are aligned
-		mov $0x10, %rcx
-		sub %r9,   %rcx
-
-		mov %rsi,  %r8
-
-		// If the length is less than the number of misaligned bytes,
-		// write one byte at a time and exit
-		cmp %rax, %rcx
-		jg aligned_1
-
-	naligned:
-		mov %dl, (%r8) // Write a byte
-
-		// Advance the pointer. Decrease the total number of bytes
-		// and the misaligned ones
-		inc %r8
-		dec %rcx
-		dec %rax
-
-		// Checks if we are aligned
-		test %rcx, %rcx
-		jnz naligned
-
-	aligned:
-		// Checks if we're done writing bytes
-		test %rax, %rax
-		jz end
-
-		// Write 1 byte at a time
-		cmp $8, %rax
-		jl aligned_1
-
-		// Write 8 bytes at a time
-		cmp $16, %rax
-		jl aligned_8
-
-		// Write 16 bytes at a time
-		cmp $32, %rax
-		jl aligned_16
-
-		// Write 32 bytes at a time
-		cmp $64, %rax
-		jl aligned_32
-
-	aligned_64:
-		movdqa %xmm0, (%r8)
-		movdqa %xmm0, 16(%r8)
-		movdqa %xmm0, 32(%r8)
-		movdqa %xmm0, 48(%r8)
-
-		add $64, %r8
-		sub $64, %rax
-
-		cmp $64, %rax
-		jge aligned_64
-
-		// Checks if we're done writing bytes
-		test %rax, %rax
-		jz end
-
-		// Write 1 byte at a time
-		cmp $8, %rax
-		jl aligned_1
-
-		// Write 8 bytes at a time
-		cmp $16, %rax
-		jl aligned_8
-
-		// Write 16 bytes at a time
-		cmp $32, %rax
-		jl aligned_16
-
-	aligned_32:
-		movdqa %xmm0, (%r8)
-		movdqa %xmm0, 16(%r8)
-
-		add $32, %r8
-		sub $32, %rax
-
-		// Checks if we're done writing bytes
-		test %rax, %rax
-		jz end
-
-		// Write 1 byte at a time
-		cmp $8, %rax
-		jl aligned_1
-
-		// Write 8 bytes at a time
-		cmp $16, %rax
-		jl aligned_8
-
-	aligned_16:
-		movdqa %xmm0, (%r8)
-
-		add $16, %r8
-		sub $16, %rax
-
-		// Checks if we're done writing bytes
-		test %rax, %rax
-		jz end
-
-		// Write 1 byte at a time
-		cmp $8, %rax
-		jl aligned_1
-
-	aligned_8:
-		mov %rdx, (%r8)
-
-		add $8, %r8
-		sub $8, %rax
-
-		// Checks if we're done writing bytes
-		test %rax, %rax
-		jz end
-
-	aligned_1:
-		mov %dl, (%r8)
-
-		inc %r8
-		dec %rax
-
-		test %rax, %rax
-		jnz aligned_1
-
-	end:
-		ret
--- a/arch/x64/linux/syscall.S
+++ b/arch/x64/linux/syscall.S
@ -1,65 +0,0 @@
-/*
-The kernel uses the following registers:
-%rdi, %rsi, %rdx, %r8, %r9, %r10
-
-The number of the syscall is passed in %rax.
-
-A syscall clobbers:
-%rax, %rcx, %r11
-
-The returned value is placed in %rax.
-*/
-	.text
-
-// 1 parameter.
-	.globl _D5tanya3sys5linux7syscallQiFNbNillZl
-	.type _D5tanya3sys5linux7syscallQiFNbNillZl, @function
-
-_D5tanya3sys5linux7syscallQiFNbNillZl:
-	movq %rsi, %rax // Syscall number.
-
-	syscall
-
-	ret
-
-
-// 2 parameters.
-	.globl _D5tanya3sys5linux7syscallQiFNbNilllZl
-	.type _D5tanya3sys5linux7syscallQiFNbNilllZl, @function
-
-_D5tanya3sys5linux7syscallQiFNbNilllZl:
-	movq %rdx, %rax
-
-	syscall
-
-	ret
-
-
-// 3 parameters.
-	.globl _D5tanya3sys5linux7syscallQiFNbNillllZl
-	.type _D5tanya3sys5linux7syscallQiFNbNillllZl, @function
-
-_D5tanya3sys5linux7syscallQiFNbNillllZl:
-	movq %rcx, %rax
-
-	syscall
-
-	ret
-
-
-// 6 parameters.
-	.globl _D5tanya3sys5linux7syscallQiFNbNilllllllZl
-	.type _D5tanya3sys5linux7syscallQiFNbNilllllllZl, @function
-
-_D5tanya3sys5linux7syscallQiFNbNilllllllZl:
-	pushq %rbp
-	movq %rsp, %rbp
-
-	movq 16(%rbp), %rax
-
-	mov %rcx, %r10
-
-	syscall
-
-	leave
-	ret
--- a/codecov.yml
+++ b/codecov.yml
@ -1,3 +0,0 @@
-ignore:
-  - "source/tanya/async/event/iocp.d"
-  - "source/tanya/async/iocp.d"
--- a/dub.json
+++ b/dub.json
@ -2,17 +2,28 @@
 	"name": "tanya",
 	"description": "@nogc library. Containers, networking, metaprogramming, memory management, utilities",
 	"license": "MPL-2.0",
-	"copyright": "© Eugene Wissner <info@caraus.de>",
+	"copyright": "© Eugene Wissner <belka@caraus.de>",
 	"authors": [
 		"Eugene Wissner"
 	],

 	"targetType": "library",

-	"dependencies-linux": {
+	"dependencies": {
+		"tanya:meta": "*",
+		"tanya:os": "*",
+		"tanya:middle": "*",
+		"tanya:test": "*",
 		"mir-linux-kernel": "~>1.0.0"
 	},

+	"subPackages": [
+		"./meta",
+		"./os",
+		"./middle",
+		"./test"
+	],
+
 	"configurations": [
 		{
 			"name": "library",
@ -27,13 +38,38 @@
 		{
 			"name": "native",
 			"targetType": "library",
-			"platforms": ["linux-x86_64-gdc"],
-			"preBuildCommands": ["ninja -C arch"],
-			"lflags": ["arch/tanya.a"],
+			"platforms": ["linux-x86_64"],
 			"versions": ["TanyaNative"]
+		},
+		{
+			"name": "unittest",
+			"versions": ["TanyaPhobos"],
+			"importPaths": [
+				"./source",
+				"./tests"
+			],
+			"sourcePaths": [
+				"./source",
+				"./tests"
+			]
+		},
+		{
+			"name": "unittest-native",
+			"platforms": ["linux-x86_64"],
+			"versions": ["TanyaNative"],
+			"importPaths": [
+				"./source",
+				"./tests"
+			],
+			"sourcePaths": [
+				"./source",
+				"./tests"
+			]
 		}
 	],

+	"dflags-dmd": ["-dip1000"],
+
 	"libs-windows": ["advapi32"],
 	"libs-windows-x86_mscoff": ["iphlpapi"],
 	"libs-windows-x86_64": ["iphlpapi"]
--- a/meta/dub.json
+++ b/meta/dub.json
@ -0,0 +1,13 @@
+{
+	"name": "meta",
+	"description": "Template metaprogramming",
+	"targetType": "library",
+
+	"sourcePaths": [
+		"."
+	],
+	"importPaths": [
+		"."
+	],
+	"dflags-dmd": ["-dip1000"]
+}
--- a/source/tanya/meta/metafunction.d
+++ b/source/tanya/meta/metafunction.d
@ -9,11 +9,11 @@
 * It contains different algorithms for iterating, searching and modifying
 * template arguments.
 *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/meta/metafunction.d,
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/meta/tanya/meta/metafunction.d,
 *                 tanya/meta/metafunction.d)
 */
 module tanya.meta.metafunction;
@ -798,22 +798,7 @@ alias AliasSeq(Args...) = Args;
 * Returns: $(D_KEYWORD true) if all the items of $(D_PARAM L) satisfy
 *          $(D_PARAM F), $(D_KEYWORD false) otherwise.
 */
-template allSatisfy(alias F, L...)
-if (__traits(isTemplate, F))
-{
-    static if (L.length == 0)
-    {
-        enum bool allSatisfy = true;
-    }
-    else static if (F!(L[0]))
-    {
-        enum bool allSatisfy = allSatisfy!(F, L[1 .. $]);
-    }
-    else
-    {
-        enum bool allSatisfy = false;
-    }
-}
+enum bool allSatisfy(alias F, L...) = Filter!(templateNot!F, L).length == 0;

 ///
@nogc nothrow pure @safe unittest
@ -836,22 +821,7 @@ if (__traits(isTemplate, F))
 * Returns: $(D_KEYWORD true) if any of the items of $(D_PARAM L) satisfy
 *          $(D_PARAM F), $(D_KEYWORD false) otherwise.
 */
-template anySatisfy(alias F, L...)
-if (__traits(isTemplate, F))
-{
-    static if (L.length == 0)
-    {
-        enum bool anySatisfy = false;
-    }
-    else static if (F!(L[0]))
-    {
-        enum bool anySatisfy = true;
-    }
-    else
-    {
-        enum bool anySatisfy = anySatisfy!(F, L[1 .. $]);
-    }
-}
+enum bool anySatisfy(alias F, L...) = Filter!(F, L).length != 0;

 ///
@nogc nothrow pure @safe unittest
@ -861,22 +831,19 @@ if (__traits(isTemplate, F))
    static assert(!anySatisfy!(isSigned, uint, ushort, ulong));
 }

-private template indexOf(ptrdiff_t i, Args...)
-if (Args.length > 0)
+private template indexOf(Args...)
 {
-    static if (Args.length == 1)
+    static foreach (i, Arg; Args[1 .. $])
+    {
+        static if (!is(typeof(indexOf) == ptrdiff_t) && isEqual!(Args[0], Arg))
+        {
+            enum ptrdiff_t indexOf = i;
+        }
+    }
+    static if (!is(typeof(indexOf) == ptrdiff_t))
    {
        enum ptrdiff_t indexOf = -1;
    }
-    else static if (isEqual!(Args[0 .. 2]))
-    {
-        enum ptrdiff_t indexOf = i;
-    }
-    else
-    {
-        enum ptrdiff_t indexOf = indexOf!(i + 1,
-                                          AliasSeq!(Args[0], Args[2 .. $]));
-    }
 }

 /**
@ -891,13 +858,13 @@ if (Args.length > 0)
 */
 template staticIndexOf(T, L...)
 {
-    enum ptrdiff_t staticIndexOf = indexOf!(0, AliasSeq!(T, L));
+    enum ptrdiff_t staticIndexOf = indexOf!(T, L);
 }

 /// ditto
 template staticIndexOf(alias T, L...)
 {
-    enum ptrdiff_t staticIndexOf = indexOf!(0, AliasSeq!(T, L));
+    enum ptrdiff_t staticIndexOf = indexOf!(T, L);
 }

 ///
@ -920,16 +887,10 @@ template staticIndexOf(alias T, L...)
 * Returns: $(D_KEYWORD true) if $(D_PARAM T) can be found in $(D_PARAM L),
 *          $(D_KEYWORD false) otherwise.
 */
-template canFind(T, L...)
-{
-    enum bool canFind = indexOf!(0, AliasSeq!(T, L)) != -1;
-}
+enum bool canFind(T, L...) = staticIndexOf!(T, L) != -1;

 /// ditto
-template canFind(alias T, L...)
-{
-    enum bool canFind = indexOf!(0, AliasSeq!(T, L)) != -1;
-}
+enum bool canFind(alias T, L...) = staticIndexOf!(T, L) != -1;

 ///
@nogc nothrow pure @safe unittest
@ -1129,30 +1090,6 @@ if (__traits(isTemplate, cmp))
    static assert(!isSorted!(cmp, long, byte, ubyte, short, uint));
 }

-@nogc nothrow pure @safe unittest
-{
-    enum cmp(int x, int y) = x - y;
-    static assert(isSorted!(cmp));
-    static assert(isSorted!(cmp, 1));
-    static assert(isSorted!(cmp, 1, 2, 2));
-    static assert(isSorted!(cmp, 1, 2, 2, 4));
-    static assert(isSorted!(cmp, 1, 2, 2, 4, 8));
-    static assert(!isSorted!(cmp, 32, 2, 2, 4, 8));
-    static assert(isSorted!(cmp, 32, 32));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    enum cmp(int x, int y) = x < y;
-    static assert(isSorted!(cmp));
-    static assert(isSorted!(cmp, 1));
-    static assert(isSorted!(cmp, 1, 2, 2));
-    static assert(isSorted!(cmp, 1, 2, 2, 4));
-    static assert(isSorted!(cmp, 1, 2, 2, 4, 8));
-    static assert(!isSorted!(cmp, 32, 2, 2, 4, 8));
-    static assert(isSorted!(cmp, 32, 32));
-}
-
 /**
 * Params:
 *  T    = A template.
@ -1641,6 +1578,7 @@ template EraseAll(alias T, L...)
 *          $(D_PARAM pred).
 */
 template Filter(alias pred, L...)
+if (__traits(isTemplate, pred))
 {
    static if (L.length == 0)
    {
@ -1803,7 +1741,7 @@ if (T.length == 2)
 }

 /**
- * Attaces a numeric index to each element from $(D_PARAM Args).
+ * Attaches a numeric index to each element from $(D_PARAM Args).
 *
 * $(D_PSYMBOL EnumerateFrom) returns a sequence of tuples ($(D_PSYMBOL Pack)s)
 * consisting of the index of each element and the element itself.
@ -1841,7 +1779,7 @@ template EnumerateFrom(size_t start, Args...)
 }

 /**
- * Attaces a numeric index to each element from $(D_PARAM Args).
+ * Attaches a numeric index to each element from $(D_PARAM Args).
 *
 * $(D_PSYMBOL EnumerateFrom) returns a sequence of tuples ($(D_PSYMBOL Pack)s)
 * consisting of the index of each element and the element itself.
--- a/source/tanya/meta/package.d
+++ b/source/tanya/meta/package.d
@ -9,11 +9,11 @@
 * to transform from one type to another. It has also different algorithms for
 * iterating, searching and modifying template arguments.
 *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/meta/package.d,
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/meta/tanya/meta/package.d,
 *                 tanya/meta/package.d)
 */
 module tanya.meta;
--- a/source/tanya/meta/trait.d
+++ b/source/tanya/meta/trait.d
@ -8,11 +8,11 @@
 * Templates in this module are used to obtain type information at compile
 * time.
 *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/meta/trait.d,
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/meta/tanya/meta/trait.d,
 *                 tanya/meta/trait.d)
 */
 module tanya.meta.trait;
@ -70,47 +70,6 @@ enum bool isWideString(T) = is(T : const dchar[]) && !isStaticArray!T;
    static assert(!isWideString!(dchar[10]));
 }

-/**
- * Determines whether $(D_PARAM T) is a complex type.
- *
- * Complex types are:
- * $(UL
- *  $(LI cfloat)
- *  $(LI ifloat)
- *  $(LI cdouble)
- *  $(LI idouble)
- *  $(LI creal)
- *  $(LI ireal)
- * )
- *
- * Params:
- *  T = A type.
- *
- * Returns: $(D_KEYWORD true) if $(D_PARAM T) is a complex type,
- *          $(D_KEYWORD false) otherwise.
- */
-enum bool isComplex(T) = is(Unqual!(OriginalType!T) == cfloat)
-                      || is(Unqual!(OriginalType!T) == ifloat)
-                      || is(Unqual!(OriginalType!T) == cdouble)
-                      || is(Unqual!(OriginalType!T) == idouble)
-                      || is(Unqual!(OriginalType!T) == creal)
-                      || is(Unqual!(OriginalType!T) == ireal);
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(isComplex!cfloat);
-    static assert(isComplex!ifloat);
-    static assert(isComplex!cdouble);
-    static assert(isComplex!idouble);
-    static assert(isComplex!creal);
-    static assert(isComplex!ireal);
-
-    static assert(!isComplex!float);
-    static assert(!isComplex!double);
-    static assert(!isComplex!real);
-}
-
 /*
 * Tests whether $(D_PARAM T) is an interface.
 *
@ -353,32 +312,6 @@ enum bool isIntegral(T) = isUnsigned!T
    static assert(!isIntegral!float);
 }

-/**
- * Determines whether $(D_PARAM T) is a numeric (floating point, integral or
- * complex) type.
-*
- * Params:
- *  T = A type.
- *
- * Returns: $(D_KEYWORD true) if $(D_PARAM T) is a numeric type,
- *          $(D_KEYWORD false) otherwise.
- *
- * See_Also: $(D_PSYMBOL isIntegral!T),
- *           $(D_PSYMBOL isFloatingPoint),
- *           $(D_PSYMBOL isComplex).
- */
-enum bool isNumeric(T) = isIntegral!T || isFloatingPoint!T || isComplex!T;
-
-///
-@nogc nothrow pure @safe unittest
-{
-    alias F = float;
-    static assert(isNumeric!F);
-    static assert(!isNumeric!bool);
-    static assert(!isNumeric!char);
-    static assert(!isNumeric!wchar);
-}
-
 /**
 * Determines whether $(D_PARAM T) is a boolean type, i.e. $(D_KEYWORD bool).
 *
@ -458,67 +391,6 @@ enum bool isSomeChar(T) = is(Unqual!(OriginalType!T) == char)
    static assert(!isSomeChar!uint);
 }

-/**
- * Determines whether $(D_PARAM T) is a scalar type.
- *
- * Scalar types are numbers, booleans and characters.
- *
- * Params:
- *  T = A type.
- *
- * Returns: $(D_KEYWORD true) if $(D_PARAM T) is a scalar type,
- *          $(D_KEYWORD false) otherwise.
- *
- * See_Also: $(D_PSYMBOL isNumeric),
- *           $(D_PSYMBOL isBoolean),
- *           $(D_PSYMBOL isSomeChar).
- */
-enum bool isScalarType(T) = isNumeric!T || isBoolean!T || isSomeChar!T;
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(isScalarType!int);
-    static assert(!isScalarType!(int[]));
-}
-
-/**
- * Determines whether $(D_PARAM T) is a basic type.
- *
- * Basic types are scalar types and $(D_KEYWORD void).
- *
- * Params:
- *  T = A type.
- *
- * Returns: $(D_KEYWORD true) if $(D_PARAM T) is a basic type,
- *          $(D_KEYWORD false) otherwise.
- *
- * See_Also: $(D_PSYMBOL isScalarType).
- */
-enum bool isBasicType(T) = isScalarType!T || is(T : void);
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static struct S
-    {
-    }
-    class C
-    {
-    }
-    enum E : int
-    {
-        i = 0,
-    }
-
-    static assert(isBasicType!void);
-    static assert(isBasicType!(shared void));
-    static assert(isBasicType!E);
-    static assert(!isBasicType!(int*));
-    static assert(!isBasicType!(void function()));
-    static assert(!isBasicType!C);
-}
-
 /**
 * Determines whether $(D_PARAM T) is a pointer type.
 *
@ -549,19 +421,6 @@ template isPointer(T)
    static assert(!isPointer!bool);
 }

-// typeof(null) is not a pointer.
-@nogc nothrow pure @safe unittest
-{
-    static assert(!isPointer!(typeof(null)));
-    static assert(!isPointer!(const shared typeof(null)));
-
-    enum typeOfNull : typeof(null)
-    {
-        null_ = null,
-    }
-    static assert(!isPointer!typeOfNull);
-}
-
 /**
 * Determines whether $(D_PARAM T) is an array type (dynamic or static, but
 * not an associative one).
@ -689,34 +548,6 @@ template isAssociativeArray(T)
    static assert(!isAssociativeArray!bool);
 }

-/**
- * Determines whether $(D_PARAM T) is a built-in type.
- *
- * Built-in types are all basic types and arrays.
- *
- * Params:
- *  T = A type.
- *
- * Returns: $(D_KEYWORD true) if $(D_PARAM T) is a built-in type,
- *          $(D_KEYWORD false) otherwise.
- *
- * See_Also: $(D_PSYMBOL isBasicType!T),
- *           $(D_PSYMBOL isArray),
- *           $(D_PSYMBOL isAssociativeArray).
- */
-enum bool isBuiltinType(T) = isBasicType!T
-                          || isArray!T
-                          || isAssociativeArray!T;
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(isBuiltinType!int);
-    static assert(isBuiltinType!(int[]));
-    static assert(isBuiltinType!(int[int]));
-    static assert(!isBuiltinType!(int*));
-}
-
 /**
 * Determines whether $(D_PARAM T) is an aggregate type.
 *
@ -857,57 +688,6 @@ enum bool isSomeString(T) = isNarrowString!T || isWideString!T;
    static assert(!isSomeString!(char[10]));
 }

-/**
- * Returns the minimum value of type $(D_PARAM T). In contrast to
- * $(D_INLINECODE T.min) this template works with floating point and complex
- * types as well.
- *
- * Params:
- *  T = Integral, boolean, floating point, complex or character type.
- *
- * Returns: The minimum value of $(D_PARAM T).
- *
- * See_Also: $(D_PSYMBOL isIntegral),
- *           $(D_PSYMBOL isBoolean),
- *           $(D_PSYMBOL isSomeChar),
- *           $(D_PSYMBOL isFloatingPoint),
- *           $(D_PSYMBOL isComplex).
- */
-template mostNegative(T)
-{
-    static if (isIntegral!T || isBoolean!T || isSomeChar!T)
-    {
-        enum T mostNegative = T.min;
-    }
-    else static if (isFloatingPoint!T || isComplex!T)
-    {
-        enum T mostNegative = -T.max;
-    }
-    else
-    {
-        static assert(false, T.stringof ~ " doesn't have the minimum value");
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(mostNegative!char == char.min);
-    static assert(mostNegative!wchar == wchar.min);
-    static assert(mostNegative!dchar == dchar.min);
-
-    static assert(mostNegative!byte == byte.min);
-    static assert(mostNegative!ubyte == ubyte.min);
-    static assert(mostNegative!bool == bool.min);
-
-    static assert(mostNegative!float == -float.max);
-    static assert(mostNegative!double == -double.max);
-    static assert(mostNegative!real == -real.max);
-
-    static assert(mostNegative!ifloat == -ifloat.max);
-    static assert(mostNegative!cfloat == -cfloat.max);
-}
-
 /**
 * Determines whether the type $(D_PARAM T) is copyable.
 *
@ -1478,20 +1258,6 @@ if (F.length == 1)
    static assert(!isCallable!I);
 }

-@nogc nothrow pure @safe unittest
-{
-    static struct S
-    {
-        @property int opCall()
-        {
-            return 0;
-        }
-    }
-    S s;
-    static assert(isCallable!S);
-    static assert(isCallable!s);
-}
-
 /**
 * Determines whether $(D_PARAM T) defines a symbol $(D_PARAM member).
 *
@ -1676,63 +1442,6 @@ if (isCallable!F)
    static assert(is(FunctionTypeOf!(() {}) == function));
 }

-@nogc nothrow pure @safe unittest
-{
-    static assert(is(FunctionTypeOf!(void delegate()) == function));
-
-    static void staticFunc()
-    {
-    }
-    auto functionPointer = &staticFunc;
-    static assert(is(FunctionTypeOf!staticFunc == function));
-    static assert(is(FunctionTypeOf!functionPointer == function));
-
-    void func()
-    {
-    }
-    auto dg = &func;
-    static assert(is(FunctionTypeOf!func == function));
-    static assert(is(FunctionTypeOf!dg == function));
-
-    interface I
-    {
-        @property int prop();
-    }
-    static assert(is(FunctionTypeOf!(I.prop) == function));
-
-    static struct S
-    {
-        void opCall()
-        {
-        }
-    }
-    class C
-    {
-        static void opCall()
-        {
-        }
-    }
-    S s;
-
-    static assert(is(FunctionTypeOf!s == function));
-    static assert(is(FunctionTypeOf!C == function));
-    static assert(is(FunctionTypeOf!S == function));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    static struct S2
-    {
-        @property int opCall()
-        {
-            return 0;
-        }
-    }
-    S2 s2;
-    static assert(is(FunctionTypeOf!S2 == function));
-    static assert(is(FunctionTypeOf!s2 == function));
-}
-
 /**
 * Determines the return type of the callable $(D_PARAM F).
 *
@ -2341,6 +2050,61 @@ if (isCallable!F)
    static assert((functionAttributes!func1 & FunctionAttribute.return_) == 0);
 }

+/**
+ * Determines whether a function has attribute.
+ *
+ * This template should get at least two arguments: the function itself and the
+ * attributes it should be tested for. If more than one attribute is given,
+ * $(D_PSYMBOL hasFunctionAttributes) evaluates to $(D_KEYWORD true) if all of
+ * them are present. The attributes should be $(D_PSYMBOL FunctionAttribute)
+ * members.
+ *
+ * Params:
+ *  Args = The function and attributes.
+ *
+ * Returns:
+ *
+ * See_Also: $(D_PSYMBOL FunctionAttribute).
+ */
+template hasFunctionAttributes(Args...)
+if (Args.length > 1
+ && is(typeof(Args[1]) == FunctionAttribute)
+ && isCallable!(Args[0])
+ && allSameType!(Map!(TypeOf, Args[1 .. $])))
+{
+    enum uint pred(Args_...) = Args_[0] | Args_[1];
+
+    template Reduce(Args_...)
+    {
+        static if (Args_.length == 1)
+        {
+            enum uint Reduce = Args_[0];
+        }
+        else
+        {
+            enum uint Reduce = Reduce!(pred!(Args_[0], Args_[1]), Args_[2 .. $]);
+        }
+    }
+    enum uint field = Reduce!(0, Args[1 .. $]);
+    enum hasFunctionAttributes = (functionAttributes!(Args[0]) & field) == field;
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static struct Range
+    {
+        @property auto front() inout
+        {
+            return 8;
+        }
+    }
+    static assert(hasFunctionAttributes!(Range.init.front, FunctionAttribute.inout_));
+    static assert(!hasFunctionAttributes!(Range.init.front, FunctionAttribute.const_));
+    static assert(!hasFunctionAttributes!(Range.init.front,
+                  FunctionAttribute.inout_, FunctionAttribute.const_));
+}
+
 /**
 * Returns a tuple with default values of the parameters to $(D_PARAM F).
 *
@ -2364,7 +2128,7 @@ if (isCallable!F)
            }
            else
            {
-                enum getDefault(T[i .. i + 1] name)
+                auto getDefault(T[i .. i + 1] name)
                {
                    return name[0];
                }
@ -2552,44 +2316,6 @@ template hasElaborateAssign(T)
    }
 }

-@nogc nothrow pure @safe unittest
-{
-    static assert(!hasElaborateAssign!int);
-
-    static struct S1
-    {
-        void opAssign(S1)
-        {
-        }
-    }
-    static struct S2
-    {
-        void opAssign(int)
-        {
-        }
-    }
-    static struct S3
-    {
-        S1 s;
-        alias s this;
-    }
-    static assert(hasElaborateAssign!S1);
-    static assert(!hasElaborateAssign!(const S1));
-    static assert(hasElaborateAssign!(S1[1]));
-    static assert(!hasElaborateAssign!(S1[0]));
-    static assert(!hasElaborateAssign!S2);
-    static assert(hasElaborateAssign!S3);
-
-    static struct S4
-    {
-        void opAssign(S4)
-        {
-        }
-        @disable this(this);
-    }
-    static assert(hasElaborateAssign!S4);
-}
-
 /**
 * Returns all members of $(D_KEYWORD enum) $(D_PARAM T).
 *
@ -2642,16 +2368,6 @@ if (is(T == enum))
    static assert([EnumMembers!E] == [E.one, E.two, E.three]);
 }

-// Produces a tuple for an enum with only one member
-@nogc nothrow pure @safe unittest
-{
-    enum E : int
-    {
-        one = 0,
-    }
-    static assert(EnumMembers!E == AliasSeq!0);
-}
-
 /**
 * Different than $(D_INLINECODE T.alignof), which is the same for all class
 * types,  $(D_PSYMBOL classInstanceOf) determines the alignment of the class
@ -2692,6 +2408,58 @@ if (is(T == class))
    static assert(classInstanceAlignment!C2 == S.alignof);
 }

+/**
+ * Returns the size in bytes of the state that needs to be allocated to hold an
+ * object of type $(D_PARAM T).
+ *
+ * There is a difference between the `.sizeof`-property and
+ * $(D_PSYMBOL stateSize) if $(D_PARAM T) is a class or an interface.
+ * `T.sizeof` is constant on the given architecture then and is the same as
+ * `size_t.sizeof` and `ptrdiff_t.sizeof`. This is because classes and
+ * interfaces are reference types and `.sizeof` returns the size of the
+ * reference which is the same as the size of a pointer. $(D_PSYMBOL stateSize)
+ * returns the size of the instance itself.
+ *
+ * The size of a dynamic array is `size_t.sizeof * 2` since a dynamic array
+ * stores its length and a data pointer. The size of the static arrays is
+ * calculated differently since they are value types. It is the array length
+ * multiplied by the element size.
+ *
+ * `stateSize!void` is `1` since $(D_KEYWORD void) is mostly used as a synonym
+ * for $(D_KEYWORD byte)/$(D_KEYWORD ubyte) in `void*`.
+ *
+ * Params:
+ *  T = Object type.
+ *
+ * Returns: Size of an instance of type $(D_PARAM T).
+ */
+template stateSize(T)
+{
+    static if (isPolymorphicType!T)
+    {
+        enum size_t stateSize = __traits(classInstanceSize, T);
+    }
+    else
+    {
+        enum size_t stateSize = T.sizeof;
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static assert(stateSize!int == 4);
+    static assert(stateSize!bool == 1);
+    static assert(stateSize!(int[]) == (size_t.sizeof * 2));
+    static assert(stateSize!(short[3]) == 6);
+
+    static struct Empty
+    {
+    }
+    static assert(stateSize!Empty == 1);
+    static assert(stateSize!void == 1);
+}
+
 /**
 * Tests whether $(D_INLINECODE pred(T)) can be used as condition in an
 * $(D_KEYWORD if)-statement or a ternary operator.
@ -2944,14 +2712,6 @@ template isInnerClass(T)
    static assert(!isInnerClass!(O.Fake));
 }

-@nogc nothrow pure @safe unittest
-{
-    class RefCountedStore(T)
-    {
-    }
-    static assert(!isInnerClass!(RefCountedStore!int));
-}
-
 /**
 * Returns the types of all members of $(D_PARAM T).
 *
@ -3079,28 +2839,3 @@ enum bool isOrderingComparable(T) = ifTestable!(T, a => a > a);
 {
    static assert(isOrderingComparable!int);
 }
-
-@nogc nothrow pure @safe unittest
-{
-    static struct DisabledOpEquals
-    {
-        @disable bool opEquals(typeof(this)) @nogc nothrow pure @safe;
-
-        int opCmp(typeof(this)) @nogc nothrow pure @safe
-        {
-            return 0;
-        }
-    }
-    static assert(!isEqualityComparable!DisabledOpEquals);
-    static assert(isOrderingComparable!DisabledOpEquals);
-
-    static struct OpEquals
-    {
-        bool opEquals(typeof(this)) @nogc nothrow pure @safe
-        {
-            return true;
-        }
-    }
-    static assert(isEqualityComparable!OpEquals);
-    static assert(!isOrderingComparable!OpEquals);
-}
--- a/meta/tanya/meta/transform.d
+++ b/meta/tanya/meta/transform.d
@ -0,0 +1,504 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * Type transformations.
+ *
+ * Templates in this module can be used to modify type qualifiers or transform
+ * types. They take some type as argument and return a different type after
+ * perfoming the specified transformation.
+ *
+ * Copyright: Eugene Wissner 2017-2020.
+ * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
+ *                  Mozilla Public License, v. 2.0).
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/meta/tanya/meta/transform.d,
+ *                 tanya/meta/transform.d)
+ */
+module tanya.meta.transform;
+
+import tanya.meta.metafunction;
+import tanya.meta.trait;
+
+/**
+ * Removes any type qualifiers from $(D_PARAM T).
+ *
+ * Removed qualifiers are:
+ * $(UL
+ *  $(LI const)
+ *  $(LI immutable)
+ *  $(LI inout)
+ *  $(LI shared)
+ * )
+ * and combinations of these.
+ *
+ * If the type $(D_PARAM T) doesn't have any qualifieres,
+ * $(D_INLINECODE Unqual!T) becomes an alias for $(D_PARAM T).
+ *
+ * Params:
+ *  T = A type.
+ *
+ * Returns: $(D_PARAM T) without any type qualifiers.
+ */
+template Unqual(T)
+{
+    static if (is(T U == shared const U)
+            || is(T U == shared inout U)
+            || is(T U == shared inout const U)
+            || is(T U == inout const U)
+            || is(T U == const U)
+            || is(T U == immutable U)
+            || is(T U == inout U)
+            || is(T U == shared U))
+    {
+        alias Unqual = U;
+    }
+    else
+    {
+        alias Unqual = T;
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static assert(is(Unqual!bool == bool));
+    static assert(is(Unqual!(immutable bool) == bool));
+    static assert(is(Unqual!(inout bool) == bool));
+    static assert(is(Unqual!(inout const bool) == bool));
+    static assert(is(Unqual!(shared bool) == bool));
+    static assert(is(Unqual!(shared const bool) == bool));
+    static assert(is(Unqual!(shared inout const bool) == bool));
+}
+
+/**
+ * If $(D_PARAM T) is an $(D_KEYWORD enum), $(D_INLINECODE OriginalType!T)
+ * evaluates to the most base type of that $(D_KEYWORD enum) and to
+ * $(D_PARAM T) otherwise.
+ *
+ * Params:
+ *  T = A type.
+ *
+ * Returns: Base type of the $(D_KEYWORD enum) $(D_PARAM T) or $(D_PARAM T)
+ *          itself.
+ */
+template OriginalType(T)
+{
+    static if (is(T U == enum))
+    {
+        alias OriginalType = OriginalType!U;
+    }
+    else
+    {
+        alias OriginalType = T;
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    enum E1 : const(int)
+    {
+        n = 0,
+    }
+    enum E2 : bool
+    {
+        t = true,
+    }
+    enum E3 : E2
+    {
+        t = E2.t,
+    }
+    enum E4 : const(E2)
+    {
+        t = E2.t,
+    }
+
+    static assert(is(OriginalType!E1 == const int));
+    static assert(is(OriginalType!E2 == bool));
+    static assert(is(OriginalType!E3 == bool));
+    static assert(is(OriginalType!E4 == bool));
+    static assert(is(OriginalType!(const E4) == bool));
+}
+
+/**
+ * Copies constness of $(D_PARAM From) to $(D_PARAM To).
+ *
+ * The following type qualifiers affect the constness and hence are copied:
+ * $(UL
+ *  $(LI const)
+ *  $(LI immutable)
+ *  $(LI inout)
+ *  $(LI inout const)
+ * )
+ *
+ * Params:
+ *  From = Source type.
+ *  To   = Target type.
+ *
+ * Returns: $(D_PARAM To) with the constness of $(D_PARAM From).
+ */
+template CopyConstness(From, To)
+{
+    static if (is(From T == immutable T))
+    {
+        alias CopyConstness = immutable To;
+    }
+    else static if (is(From T == const T) || is(From T == shared const T))
+    {
+        alias CopyConstness = const To;
+    }
+    else static if (is(From T == inout T) || is(From T == shared inout T))
+    {
+        alias CopyConstness = inout To;
+    }
+    else static if (is(From T == inout const T)
+                 || is(From T == shared inout const T))
+    {
+        alias CopyConstness = inout const To;
+    }
+    else
+    {
+        alias CopyConstness = To;
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static assert(is(CopyConstness!(int, char) == char));
+    static assert(is(CopyConstness!(const int, char) == const char));
+    static assert(is(CopyConstness!(immutable int, char) == immutable char));
+    static assert(is(CopyConstness!(inout int, char) == inout char));
+    static assert(is(CopyConstness!(inout const int, char) == inout const char));
+
+    static assert(is(CopyConstness!(shared int, char) == char));
+    static assert(is(CopyConstness!(shared const int, char) == const char));
+    static assert(is(CopyConstness!(shared inout int, char) == inout char));
+    static assert(is(CopyConstness!(shared inout const int, char) == inout const char));
+
+    static assert(is(CopyConstness!(const int, shared char) == shared const char));
+    static assert(is(CopyConstness!(const int, immutable char) == immutable char));
+    static assert(is(CopyConstness!(immutable int, const char) == immutable char));
+}
+
+/**
+ * Retrieves the target type `U` of a pointer `U*`.
+ *
+ * Params:
+ *  T = Pointer type.
+ *
+ * Returns: Pointer target type.
+ */
+template PointerTarget(T)
+{
+    static if (is(T U : U*))
+    {
+        alias PointerTarget = U;
+    }
+    else
+    {
+        static assert(T.stringof ~ " isn't a pointer type");
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static assert(is(PointerTarget!(bool*) == bool));
+    static assert(is(PointerTarget!(const bool*) == const bool));
+    static assert(is(PointerTarget!(const shared bool*) == const shared bool));
+    static assert(!is(PointerTarget!bool));
+}
+
+/**
+ * Params:
+ *  T = The type of the associative array.
+ *
+ * Returns: The key type of the associative array $(D_PARAM T).
+ */
+template KeyType(T)
+{
+    static if (is(T V : V[K], K))
+    {
+        alias KeyType = K;
+    }
+    else
+    {
+        static assert(false, T.stringof ~ " isn't an associative array");
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static assert(is(KeyType!(int[string]) == string));
+    static assert(!is(KeyType!(int[15])));
+}
+
+/**
+ * Params:
+ *  T = The type of the associative array.
+ *
+ * Returns: The value type of the associative array $(D_PARAM T).
+ */
+template ValueType(T)
+{
+    static if (is(T V : V[K], K))
+    {
+        alias ValueType = V;
+    }
+    else
+    {
+        static assert(false, T.stringof ~ " isn't an associative array");
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static assert(is(ValueType!(int[string]) == int));
+    static assert(!is(ValueType!(int[15])));
+}
+
+/**
+ * Adds $(D_KEYWORD inout) qualifier to the type $(D_PARAM T).
+ *
+ * Params:
+ *  T = A type.
+ *
+ * Returns: $(D_INLINECODE inout(T)).
+ */
+alias InoutOf(T) = inout(T);
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static assert(is(InoutOf!int == inout int));
+}
+
+/**
+ * Adds $(D_KEYWORD inout) qualifier to the type $(D_PARAM T).
+ *
+ * Params:
+ *  T = A type.
+ *
+ * Returns: $(D_INLINECODE inout(T)).
+ */
+alias ConstOf(T) = const(T);
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static assert(is(ConstOf!int == const int));
+}
+
+/**
+ * Adds $(D_KEYWORD inout) qualifier to the type $(D_PARAM T).
+ *
+ * Params:
+ *  T = A type.
+ *
+ * Returns: $(D_INLINECODE inout(T)).
+ */
+alias SharedOf(T) = shared(T);
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static assert(is(SharedOf!int == shared int));
+}
+
+/**
+ * Adds $(D_KEYWORD inout) qualifier to the type $(D_PARAM T).
+ *
+ * Params:
+ *  T = A type.
+ *
+ * Returns: $(D_INLINECODE inout(T)).
+ */
+alias SharedInoutOf(T) = shared(inout T);
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static assert(is(SharedInoutOf!int == shared inout int));
+}
+
+/**
+ * Adds $(D_KEYWORD shared const) qualifier to the type $(D_PARAM T).
+ *
+ * Params:
+ *  T = A type.
+ *
+ * Returns: $(D_INLINECODE shared(const T)).
+ */
+alias SharedConstOf(T) = shared(const T);
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static assert(is(SharedConstOf!int == shared const int));
+}
+
+/**
+ * Adds $(D_KEYWORD immutable) qualifier to the type $(D_PARAM T).
+ *
+ * Params:
+ *  T = A type.
+ *
+ * Returns: $(D_INLINECODE immutable(T)).
+ */
+alias ImmutableOf(T) = immutable(T);
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static assert(is(ImmutableOf!int == immutable int));
+}
+
+/**
+ * Adds $(D_KEYWORD inout const) qualifier to the type $(D_PARAM T).
+ *
+ * Params:
+ *  T = A type.
+ *
+ * Returns: $(D_INLINECODE inout(const T)).
+ */
+alias InoutConstOf(T) = inout(const T);
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static assert(is(InoutConstOf!int == inout const int));
+}
+
+/**
+ * Adds $(D_KEYWORD shared inout const) qualifier to the type $(D_PARAM T).
+ *
+ * Params:
+ *  T = A type.
+ *
+ * Returns: $(D_INLINECODE shared(inout const T)).
+ */
+alias SharedInoutConstOf(T) = shared(inout const T);
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static assert(is(SharedInoutConstOf!int == shared inout const int));
+}
+
+/**
+ * Determines the type of $(D_PARAM T). If $(D_PARAM T) is already a type,
+ * $(D_PSYMBOL TypeOf) aliases itself to $(D_PARAM T).
+ *
+ * $(D_PSYMBOL TypeOf) evaluates to $(D_KEYWORD void) for template arguments.
+ *
+ * The symbols that don't have a type and aren't types cannot be used as
+ * arguments to $(D_PSYMBOL TypeOf).
+ *
+ * Params:
+ *  T = Expression, type or template.
+ *
+ * Returns: The type of $(D_PARAM T).
+ */
+alias TypeOf(T) = T;
+
+/// ditto
+template TypeOf(alias T)
+if (isExpressions!T || __traits(isTemplate, T))
+{
+    alias TypeOf = typeof(T);
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    struct S(T)
+    {
+    }
+    static assert(is(TypeOf!S == void));
+    static assert(is(TypeOf!int == int));
+    static assert(is(TypeOf!true == bool));
+    static assert(!is(TypeOf!(tanya.meta)));
+}
+
+/**
+ * Finds the type with the smallest size in the $(D_PARAM Args) list. If
+ * several types have the same type, the leftmost is returned.
+ *
+ * Params:
+ *  Args = Type list.
+ *
+ * Returns: The smallest type.
+ *
+ * See_Also: $(D_PSYMBOL Largest).
+ */
+template Smallest(Args...)
+if (Args.length >= 1)
+{
+    static assert(is(Args[0]), T.stringof ~ " doesn't have .sizeof property");
+
+    static if (Args.length == 1)
+    {
+        alias Smallest = Args[0];
+    }
+    else static if (Smallest!(Args[1 .. $]).sizeof < Args[0].sizeof)
+    {
+        alias Smallest = Smallest!(Args[1 .. $]);
+    }
+    else
+    {
+        alias Smallest = Args[0];
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static assert(is(Smallest!(int, ushort, uint, short) == ushort));
+    static assert(is(Smallest!(short) == short));
+    static assert(is(Smallest!(ubyte[8], ubyte[5]) == ubyte[5]));
+    static assert(!is(Smallest!(short, 5)));
+}
+
+/**
+ * Finds the type with the largest size in the $(D_PARAM Args) list. If several
+ * types have the same type, the leftmost is returned.
+ *
+ * Params:
+ *  Args = Type list.
+ *
+ * Returns: The largest type.
+ *
+ * See_Also: $(D_PSYMBOL Smallest).
+ */
+template Largest(Args...)
+if (Args.length >= 1)
+{
+    static assert(is(Args[0]), T.stringof ~ " doesn't have .sizeof property");
+
+    static if (Args.length == 1)
+    {
+        alias Largest = Args[0];
+    }
+    else static if (Largest!(Args[1 .. $]).sizeof > Args[0].sizeof)
+    {
+        alias Largest = Largest!(Args[1 .. $]);
+    }
+    else
+    {
+        alias Largest = Args[0];
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static assert(is(Largest!(int, short, uint) == int));
+    static assert(is(Largest!(short) == short));
+    static assert(is(Largest!(ubyte[8], ubyte[5]) == ubyte[8]));
+    static assert(!is(Largest!(short, 5)));
+}
--- a/middle/dub.json
+++ b/middle/dub.json
@ -0,0 +1,22 @@
+{
+	"name": "middle",
+	"description": "Runtime, middle-level utilities",
+	"targetType": "library",
+
+	"dependencies": {
+		"tanya:meta": "*",
+		"tanya:os": "*"
+	},
+
+	"dependencies-linux": {
+		"mir-linux-kernel": "~>1.0.0"
+	},
+
+	"sourcePaths": [
+		"."
+	],
+	"importPaths": [
+		"."
+	],
+	"dflags-dmd": ["-dip1000"]
+}
--- a/middle/middle-test-library
+++ b/middle/middle-test-library
--- a/middle/tanya/memory/allocator.d
+++ b/middle/tanya/memory/allocator.d
@ -3,23 +3,85 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 /**
- * Dynamic memory management.
+ * This module contains the interface for implementing custom allocators.
 *
- * Copyright: Eugene Wissner 2016-2018.
+ * Allocators are classes encapsulating memory allocation strategy. This allows
+ * to decouple memory management from the algorithms and the data. 
+ *
+ * Copyright: Eugene Wissner 2016-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/memory/package.d,
- *                 tanya/memory/package.d)
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/middle/tanya/memory/allocator.d,
+ *                 tanya/memory/allocator.d)
 */
-module tanya.memory;
+module tanya.memory.allocator;

-import tanya.algorithm.mutation;
-import tanya.conv;
-import tanya.exception;
-public import tanya.memory.allocator;
+import tanya.memory.lifetime;
 import tanya.meta.trait;
-import tanya.range.primitive;
+
+/**
+ * Abstract class implementing a basic allocator.
+ */
+interface Allocator
+{
+    /**
+     * Returns: Alignment offered.
+     */
+    @property uint alignment() const shared pure nothrow @safe @nogc;
+
+    /**
+     * Allocates $(D_PARAM size) bytes of memory.
+     *
+     * Params:
+     *  size = Amount of memory to allocate.
+     *
+     * Returns: Pointer to the new allocated memory.
+     */
+    void[] allocate(size_t size) shared pure nothrow @nogc;
+
+    /**
+     * Deallocates a memory block.
+     *
+     * Params:
+     *  p = A pointer to the memory block to be freed.
+     *
+     * Returns: Whether the deallocation was successful.
+     */
+    bool deallocate(void[] p) shared pure nothrow @nogc;
+
+    /**
+     * Increases or decreases the size of a memory block.
+     *
+     * Params:
+     *  p    = A pointer to the memory block.
+     *  size = Size of the reallocated block.
+     *
+     * Returns: Pointer to the allocated memory.
+     */
+    bool reallocate(ref void[] p, size_t size) shared pure nothrow @nogc;
+
+    /**
+     * Reallocates a memory block in place if possible or returns
+     * $(D_KEYWORD false). This function cannot be used to allocate or
+     * deallocate memory, so if $(D_PARAM p) is $(D_KEYWORD null) or
+     * $(D_PARAM size) is `0`, it should return $(D_KEYWORD false).
+     *
+     * Params:
+     *  p    = A pointer to the memory block.
+     *  size = Size of the reallocated block.
+     *
+     * Returns: $(D_KEYWORD true) if successful, $(D_KEYWORD false) otherwise.
+     */
+    bool reallocateInPlace(ref void[] p, size_t size)
+    shared pure nothrow @nogc;
+}
+
+package template GetPureInstance(T : Allocator)
+{
+    alias GetPureInstance = shared(T) function()
+                            pure nothrow @nogc;
+}

 /**
 * The mixin generates common methods for classes and structs using
@ -86,10 +148,6 @@ mixin template DefaultAllocator()
    }
 }

-// From druntime
-extern (C)
-private void _d_monitordelete(Object h, bool det) @nogc nothrow pure;
-
 shared Allocator allocator;

 private shared(Allocator) getAllocatorInstance() @nogc nothrow
@ -98,12 +156,12 @@ private shared(Allocator) getAllocatorInstance() @nogc nothrow
    {
        version (TanyaNative)
        {
-            import tanya.memory.mmappool;
+            import tanya.memory.mmappool : MmapPool;
            defaultAllocator = MmapPool.instance;
        }
        else
        {
-            import tanya.memory.mallocator;
+            import tanya.memory.mallocator : Mallocator;
            defaultAllocator = Mallocator.instance;
        }
    }
@ -143,58 +201,6 @@ do
    .allocator = allocator;
 }

-/**
- * Returns the size in bytes of the state that needs to be allocated to hold an
- * object of type $(D_PARAM T).
- *
- * There is a difference between the `.sizeof`-property and
- * $(D_PSYMBOL stateSize) if $(D_PARAM T) is a class or an interface.
- * `T.sizeof` is constant on the given architecture then and is the same as
- * `size_t.sizeof` and `ptrdiff_t.sizeof`. This is because classes and
- * interfaces are reference types and `.sizeof` returns the size of the
- * reference which is the same as the size of a pointer. $(D_PSYMBOL stateSize)
- * returns the size of the instance itself.
- *
- * The size of a dynamic array is `size_t.sizeof * 2` since a dynamic array
- * stores its length and a data pointer. The size of the static arrays is
- * calculated differently since they are value types. It is the array length
- * multiplied by the element size.
- *
- * `stateSize!void` is `1` since $(D_KEYWORD void) is mostly used as a synonym
- * for $(D_KEYWORD byte)/$(D_KEYWORD ubyte) in `void*`.
- *
- * Params:
- *  T = Object type.
- *
- * Returns: Size of an instance of type $(D_PARAM T).
- */
-template stateSize(T)
-{
-    static if (isPolymorphicType!T)
-    {
-        enum size_t stateSize = __traits(classInstanceSize, T);
-    }
-    else
-    {
-        enum size_t stateSize = T.sizeof;
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(stateSize!int == 4);
-    static assert(stateSize!bool == 1);
-    static assert(stateSize!(int[]) == (size_t.sizeof * 2));
-    static assert(stateSize!(short[3]) == 6);
-
-    static struct Empty
-    {
-    }
-    static assert(stateSize!Empty == 1);
-    static assert(stateSize!void == 1);
-}
-
 /**
 * Params:
 *  size      = Raw size.
@ -208,70 +214,185 @@ pure nothrow @safe @nogc
    return (size - 1) / alignment * alignment + alignment;
 }

-/*
- * Internal function used to create, resize or destroy a dynamic array. It
- * may throw $(D_PSYMBOL OutOfMemoryError). The new
- * allocated part of the array isn't initialized. This function can be trusted
- * only in the data structures that can ensure that the array is
- * allocated/rellocated/deallocated with the same allocator.
- *
- * Params:
- *  T         = Element type of the array being created.
- *  allocator = The allocator used for getting memory.
- *  array     = A reference to the array being changed.
- *  length    = New array length.
- *
- * Returns: $(D_PARAM array).
+/**
+ * Error thrown if memory allocation fails.
 */
-package(tanya) T[] resize(T)(shared Allocator allocator,
-                             auto ref T[] array,
-                             const size_t length) @trusted
+final class OutOfMemoryError : Error
 {
-    if (length == 0)
+    /**
+     * Constructs new error.
+     *
+     * Params:
+     *  msg  = The message for the exception.
+     *  file = The file where the exception occurred.
+     *  line = The line number where the exception occurred.
+     *  next = The previous exception in the chain of exceptions, if any.
+     */
+    this(string msg = "Out of memory",
+         string file = __FILE__,
+         size_t line = __LINE__,
+         Throwable next = null) @nogc nothrow pure @safe
    {
-        if (allocator.deallocate(array))
-        {
-            return null;
-        }
-        else
-        {
-            onOutOfMemoryError();
-        }
+        super(msg, file, line, next);
    }

-    void[] buf = array;
-    if (!allocator.reallocate(buf, length * T.sizeof))
+    /// ditto
+    this(string msg,
+         Throwable next,
+         string file = __FILE__,
+         size_t line = __LINE__) @nogc nothrow pure @safe
+    {
+        super(msg, file, line, next);
+    }
+}
+
+/**
+ * Destroys and deallocates $(D_PARAM p) of type $(D_PARAM T).
+ * It is assumed the respective entities had been allocated with the same
+ * allocator.
+ *
+ * Params:
+ *  T         = Type of $(D_PARAM p).
+ *  allocator = Allocator the $(D_PARAM p) was allocated with.
+ *  p         = Object or array to be destroyed.
+ */
+void dispose(T)(shared Allocator allocator, auto ref T p)
+{
+    () @trusted { allocator.deallocate(finalize(p)); }();
+    p = null;
+}
+
+/**
+ * Constructs a new class instance of type $(D_PARAM T) using $(D_PARAM args)
+ * as the parameter list for the constructor of $(D_PARAM T).
+ *
+ * Params:
+ *  T         = Class type.
+ *  A         = Types of the arguments to the constructor of $(D_PARAM T).
+ *  allocator = Allocator.
+ *  args      = Constructor arguments of $(D_PARAM T).
+ *
+ * Returns: Newly created $(D_PSYMBOL T).
+ *
+ * Precondition: $(D_INLINECODE allocator !is null)
+ */
+T make(T, A...)(shared Allocator allocator, auto ref A args)
+if (is(T == class))
+in
+{
+    assert(allocator !is null);
+}
+do
+{
+    auto mem = (() @trusted => allocator.allocate(stateSize!T))();
+    if (mem is null)
    {
        onOutOfMemoryError();
    }
-    // Casting from void[] is unsafe, but we know we cast to the original type.
-    array = cast(T[]) buf;
+    scope (failure)
+    {
+        () @trusted { allocator.deallocate(mem); }();
+    }

-    return array;
+    return emplace!T(mem[0 .. stateSize!T], args);
 }

+/**
+ * Constructs a value object of type $(D_PARAM T) using $(D_PARAM args)
+ * as the parameter list for the constructor of $(D_PARAM T) and returns a
+ * pointer to the new object.
+ *
+ * Params:
+ *  T         = Object type.
+ *  A         = Types of the arguments to the constructor of $(D_PARAM T).
+ *  allocator = Allocator.
+ *  args      = Constructor arguments of $(D_PARAM T).
+ *
+ * Returns: Pointer to the created object.
+ *
+ * Precondition: $(D_INLINECODE allocator !is null)
+ */
+T* make(T, A...)(shared Allocator allocator, auto ref A args)
+if (!isPolymorphicType!T && !isAssociativeArray!T && !isArray!T)
+in
+{
+    assert(allocator !is null);
+}
+do
+{
+    auto mem = (() @trusted => allocator.allocate(stateSize!T))();
+    if (mem is null)
+    {
+        onOutOfMemoryError();
+    }
+    scope (failure)
+    {
+        () @trusted { allocator.deallocate(mem); }();
+    }
+    return emplace!T(mem[0 .. stateSize!T], args);
+}
+
+///
@nogc nothrow pure @safe unittest
 {
-    int[] p;
+    int* i = defaultAllocator.make!int(5);
+    assert(*i == 5);
+    defaultAllocator.dispose(i);
+}

-    p = defaultAllocator.resize(p, 20);
-    assert(p.length == 20);
+/**
+ * Constructs a new array with $(D_PARAM n) elements.
+ *
+ * Params:
+ *  T         = Array type.
+ *  E         = Array element type.
+ *  allocator = Allocator.
+ *  n         = Array size.
+ *
+ * Returns: Newly created array.
+ *
+ * Precondition: $(D_INLINECODE allocator !is null
+ *                           && n <= size_t.max / E.sizeof)
+ */
+T make(T : E[], E)(shared Allocator allocator, size_t n)
+in
+{
+    assert(allocator !is null);
+    assert(n <= size_t.max / E.sizeof);
+}
+do
+{
+    auto ret = allocator.resize!E(null, n);

-    p = defaultAllocator.resize(p, 30);
-    assert(p.length == 30);
+    static if (hasElaborateDestructor!E)
+    {
+        for (auto range = ret; range.length != 0; range = range[1 .. $])
+        {
+            emplace!E(cast(void[]) range[0 .. 1], E.init);
+        }
+    }
+    else
+    {
+        ret[] = E.init;
+    }

-    p = defaultAllocator.resize(p, 10);
-    assert(p.length == 10);
+    return ret;
+}

-    p = defaultAllocator.resize(p, 0);
-    assert(p is null);
+///
+@nogc nothrow pure @safe unittest
+{
+    int[] i = defaultAllocator.make!(int[])(2);
+    assert(i.length == 2);
+    assert(i[0] == int.init && i[1] == int.init);
+    defaultAllocator.dispose(i);
 }

 /*
 * Destroys the object.
 * Returns the memory should be freed.
 */
-package(tanya) void[] finalize(T)(ref T* p)
+package void[] finalize(T)(ref T* p)
 {
    if (p is null)
    {
@ -284,7 +405,7 @@ package(tanya) void[] finalize(T)(ref T* p)
    return (cast(void*) p)[0 .. T.sizeof];
 }

-package(tanya) void[] finalize(T)(ref T p)
+package void[] finalize(T)(ref T p)
 if (isPolymorphicType!T)
 {
    if (p is null)
@ -339,170 +460,70 @@ if (isPolymorphicType!T)
    return support;
 }

-package(tanya) void[] finalize(T)(ref T[] p)
+package void[] finalize(T)(ref T[] p)
 {
-    destroyAll(p);
+    destroyAllImpl!(T[], T)(p);
    return p;
 }

 /**
- * Destroys and deallocates $(D_PARAM p) of type $(D_PARAM T).
- * It is assumed the respective entities had been allocated with the same
- * allocator.
+ * Allocates $(D_PSYMBOL OutOfMemoryError) in a static storage and throws it.
 *
 * Params:
- *  T         = Type of $(D_PARAM p).
- *  allocator = Allocator the $(D_PARAM p) was allocated with.
- *  p         = Object or array to be destroyed.
+ *  msg = Custom error message.
+ *
+ * Throws: $(D_PSYMBOL OutOfMemoryError).
 */
-void dispose(T)(shared Allocator allocator, auto ref T p)
+void onOutOfMemoryError(string msg = "Out of memory")
+@nogc nothrow pure @trusted
 {
-    () @trusted { allocator.deallocate(finalize(p)); }();
-    p = null;
+    static ubyte[stateSize!OutOfMemoryError] memory;
+    alias PureType = OutOfMemoryError function(string) @nogc nothrow pure;
+    throw (cast(PureType) () => emplace!OutOfMemoryError(memory))(msg);
 }

-@nogc nothrow pure @system unittest
+// From druntime
+extern (C)
+private void _d_monitordelete(Object h, bool det) @nogc nothrow pure;
+
+/*
+ * Internal function used to create, resize or destroy a dynamic array. It
+ * may throw $(D_PSYMBOL OutOfMemoryError). The new
+ * allocated part of the array isn't initialized. This function can be trusted
+ * only in the data structures that can ensure that the array is
+ * allocated/rellocated/deallocated with the same allocator.
+ *
+ * Params:
+ *  T         = Element type of the array being created.
+ *  allocator = The allocator used for getting memory.
+ *  array     = A reference to the array being changed.
+ *  length    = New array length.
+ *
+ * Returns: $(D_PARAM array).
+ */
+package(tanya) T[] resize(T)(shared Allocator allocator,
+                             auto ref T[] array,
+                             const size_t length) @trusted
 {
-    static struct S
+    if (length == 0)
    {
-        ~this() @nogc nothrow pure @safe
+        if (allocator.deallocate(array))
        {
+            return null;
+        }
+        else
+        {
+            onOutOfMemoryError();
        }
    }
-    auto p = cast(S[]) defaultAllocator.allocate(S.sizeof);

-    defaultAllocator.dispose(p);
-}
-
-// Works with interfaces.
-@nogc nothrow pure @safe unittest
-{
-    interface I
-    {
-    }
-    class C : I
-    {
-    }
-    auto c = defaultAllocator.make!C();
-    I i = c;
-
-    defaultAllocator.dispose(i);
-    defaultAllocator.dispose(i);
-}
-
-/**
- * Constructs a new class instance of type $(D_PARAM T) using $(D_PARAM args)
- * as the parameter list for the constructor of $(D_PARAM T).
- *
- * Params:
- *  T         = Class type.
- *  A         = Types of the arguments to the constructor of $(D_PARAM T).
- *  allocator = Allocator.
- *  args      = Constructor arguments of $(D_PARAM T).
- *
- * Returns: Newly created $(D_PSYMBOL T).
- *
- * Precondition: $(D_INLINECODE allocator !is null)
- */
-T make(T, A...)(shared Allocator allocator, auto ref A args)
-if (is(T == class))
-in
-{
-    assert(allocator !is null);
-}
-do
-{
-    auto mem = (() @trusted => allocator.allocate(stateSize!T))();
-    if (mem is null)
+    void[] buf = array;
+    if (!allocator.reallocate(buf, length * T.sizeof))
    {
        onOutOfMemoryError();
    }
-    scope (failure)
-    {
-        () @trusted { allocator.deallocate(mem); }();
-    }
+    // Casting from void[] is unsafe, but we know we cast to the original type.
+    array = cast(T[]) buf;

-    return emplace!T(mem[0 .. stateSize!T], args);
-}
-
-/**
- * Constructs a value object of type $(D_PARAM T) using $(D_PARAM args)
- * as the parameter list for the constructor of $(D_PARAM T) and returns a
- * pointer to the new object.
- *
- * Params:
- *  T         = Object type.
- *  A         = Types of the arguments to the constructor of $(D_PARAM T).
- *  allocator = Allocator.
- *  args      = Constructor arguments of $(D_PARAM T).
- *
- * Returns: Pointer to the created object.
- *
- * Precondition: $(D_INLINECODE allocator !is null)
- */
-T* make(T, A...)(shared Allocator allocator, auto ref A args)
-if (!is(T == interface)
- && !is(T == class)
- && !isAssociativeArray!T
- && !isArray!T)
-in
-{
-    assert(allocator !is null);
-}
-do
-{
-    auto mem = (() @trusted => allocator.allocate(stateSize!T))();
-    if (mem is null)
-    {
-        onOutOfMemoryError();
-    }
-    scope (failure)
-    {
-        () @trusted { allocator.deallocate(mem); }();
-    }
-    return emplace!T(mem[0 .. stateSize!T], args);
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    int* i = defaultAllocator.make!int(5);
-    assert(*i == 5);
-    defaultAllocator.dispose(i);
-}
-
-/**
- * Constructs a new array with $(D_PARAM n) elements.
- *
- * Params:
- *  T         = Array type.
- *  allocator = Allocator.
- *  n         = Array size.
- *
- * Returns: Newly created array.
- *
- * Precondition: $(D_INLINECODE allocator !is null
- *                           && n <= size_t.max / ElementType!T.sizeof)
- */
-T make(T)(shared Allocator allocator, const size_t n)
-if (isArray!T)
-in
-{
-    assert(allocator !is null);
-    assert(n <= size_t.max / ElementType!T.sizeof);
-}
-do
-{
-    auto ret = allocator.resize!(ElementType!T)(null, n);
-    ret.uninitializedFill(ElementType!T.init);
-    return ret;
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    int[] i = defaultAllocator.make!(int[])(2);
-    assert(i.length == 2);
-    assert(i[0] == int.init && i[1] == int.init);
-    defaultAllocator.dispose(i);
+    return array;
 }
--- a/middle/tanya/memory/lifetime.d
+++ b/middle/tanya/memory/lifetime.d
@ -0,0 +1,540 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * Lifetime management functions, types and related exceptions.
+ *
+ * Copyright: Eugene Wissner 2019-2020.
+ * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
+ *                  Mozilla Public License, v. 2.0).
+ * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/middle/tanya/memory/lifetime.d,
+ *                 tanya/memory/lifetime.d)
+ */
+module tanya.memory.lifetime;
+
+import tanya.memory.allocator;
+import tanya.meta.metafunction;
+import tanya.meta.trait;
+
+package(tanya) void destroyAllImpl(R, E)(R p)
+{
+    static if (hasElaborateDestructor!E)
+    {
+        foreach (ref e; p)
+        {
+            destroy(e);
+        }
+    }
+}
+
+/**
+ * Constructs a new object of type $(D_PARAM T) in $(D_PARAM memory) with the
+ * given arguments.
+ *
+ * If $(D_PARAM T) is a $(D_KEYWORD class), emplace returns a class reference
+ * of type $(D_PARAM T), otherwise a pointer to the constructed object is
+ * returned.
+ *
+ * If $(D_PARAM T) is a nested class inside another class, $(D_PARAM outer)
+ * should be an instance of the outer class.
+ *
+ * $(D_PARAM args) are arguments for the constructor of $(D_PARAM T). If
+ * $(D_PARAM T) isn't an aggregate type and doesn't have a constructor,
+ * $(D_PARAM memory) can be initialized to `args[0]` if `Args.length == 1`,
+ * `Args[0]` should be implicitly convertible to $(D_PARAM T) then.
+ *
+ * Params:
+ *  T     = Constructed type.
+ *  U     = Type of the outer class if $(D_PARAM T) is a nested class.
+ *  Args  = Types of the constructor arguments if $(D_PARAM T) has a constructor
+ *          or the type of the initial value.
+ *  outer = Outer class instance if $(D_PARAM T) is a nested class.
+ *  args  = Constructor arguments if $(D_PARAM T) has a constructor or the
+ *          initial value.
+ *
+ * Returns: New instance of type $(D_PARAM T) constructed in $(D_PARAM memory).
+ *
+ * Precondition: `memory.length == stateSize!T`.
+ * Postcondition: $(D_PARAM memory) and the result point to the same memory.
+ */
+T emplace(T, U, Args...)(void[] memory, U outer, auto ref Args args)
+if (!isAbstractClass!T && isInnerClass!T && is(typeof(T.outer) == U))
+in
+{
+    assert(memory.length >= stateSize!T);
+}
+out (result)
+{
+    assert(memory.ptr is (() @trusted => cast(void*) result)());
+}
+do
+{
+    import tanya.memory.op : copy;
+
+    copy(typeid(T).initializer, memory);
+
+    auto result = (() @trusted => cast(T) memory.ptr)();
+    result.outer = outer;
+
+    static if (is(typeof(result.__ctor(args))))
+    {
+        result.__ctor(args);
+    }
+
+    return result;
+}
+
+/// ditto
+T emplace(T, Args...)(void[] memory, auto ref Args args)
+if (is(T == class) && !isAbstractClass!T && !isInnerClass!T)
+in
+{
+    assert(memory.length == stateSize!T);
+}
+out (result)
+{
+    assert(memory.ptr is (() @trusted => cast(void*) result)());
+}
+do
+{
+    import tanya.memory.op : copy;
+
+    copy(typeid(T).initializer, memory);
+
+    auto result = (() @trusted => cast(T) memory.ptr)();
+    static if (is(typeof(result.__ctor(args))))
+    {
+        result.__ctor(args);
+    }
+    return result;
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    class C
+    {
+        int i = 5;
+        class Inner
+        {
+            int i;
+
+            this(int param) pure nothrow @safe @nogc
+            {
+                this.i = param;
+            }
+        }
+    }
+    ubyte[stateSize!C] memory1;
+    ubyte[stateSize!(C.Inner)] memory2;
+
+    auto c = emplace!C(memory1);
+    assert(c.i == 5);
+
+    auto inner = emplace!(C.Inner)(memory2, c, 8);
+    assert(c.i == 5);
+    assert(inner.i == 8);
+    assert(inner.outer is c);
+}
+
+/// ditto
+T* emplace(T, Args...)(void[] memory, auto ref Args args)
+if (!isAggregateType!T && (Args.length <= 1))
+in
+{
+    assert(memory.length >= T.sizeof);
+}
+out (result)
+{
+    assert(memory.ptr is result);
+}
+do
+{
+    auto result = (() @trusted => cast(T*) memory.ptr)();
+    static if (Args.length == 1)
+    {
+        *result = T(args[0]);
+    }
+    else
+    {
+        *result = T.init;
+    }
+    return result;
+}
+
+private void initializeOne(T)(ref void[] memory, ref T* result) @trusted
+{
+    import tanya.memory.op : copy, fill;
+
+    static if (!hasElaborateAssign!T && isAssignable!T)
+    {
+        *result = T.init;
+    }
+    else static if (__VERSION__ >= 2083 // __traits(isZeroInit) available.
+        && __traits(isZeroInit, T))
+    {
+        memory.ptr[0 .. T.sizeof].fill!0;
+    }
+    else
+    {
+        static immutable T init = T.init;
+        copy((&init)[0 .. 1], memory);
+    }
+}
+
+/// ditto
+T* emplace(T, Args...)(void[] memory, auto ref Args args)
+if (!isPolymorphicType!T && isAggregateType!T)
+in
+{
+    assert(memory.length >= T.sizeof);
+}
+out (result)
+{
+    assert(memory.ptr is result);
+}
+do
+{
+    auto result = (() @trusted => cast(T*) memory.ptr)();
+
+    static if (Args.length == 0)
+    {
+        static assert(is(typeof({ static T t; })),
+                      "Default constructor is disabled");
+        initializeOne(memory, result);
+    }
+    else static if (is(typeof(result.__ctor(args))))
+    {
+        initializeOne(memory, result);
+        result.__ctor(args);
+    }
+    else static if (Args.length == 1 && is(typeof({ T t = args[0]; })))
+    {
+        import tanya.memory.op : copy;
+
+        ((ref arg) @trusted =>
+            copy((cast(void*) &arg)[0 .. T.sizeof], memory))(args[0]);
+        static if (hasElaborateCopyConstructor!T)
+        {
+            result.__postblit();
+        }
+    }
+    else static if (is(typeof({ T t = T(args); })))
+    {
+        auto init = T(args);
+        (() @trusted => moveEmplace(init, *result))();
+    }
+    else
+    {
+        static assert(false,
+                      "Unable to construct value with the given arguments");
+    }
+    return result;
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    ubyte[4] memory;
+
+    auto i = emplace!int(memory);
+    static assert(is(typeof(i) == int*));
+    assert(*i == 0);
+
+    i = emplace!int(memory, 5);
+    assert(*i == 5);
+
+    static struct S
+    {
+        int i;
+        @disable this();
+        @disable this(this);
+        this(int i) @nogc nothrow pure @safe
+        {
+            this.i = i;
+        }
+    }
+    auto s = emplace!S(memory, 8);
+    static assert(is(typeof(s) == S*));
+    assert(s.i == 8);
+}
+
+private void deinitialize(bool zero, T)(ref T value)
+{
+    static if (is(T == U[S], U, size_t S))
+    {
+        foreach (ref e; value)
+        {
+            deinitialize!zero(e);
+        }
+    }
+    else
+    {
+        import tanya.memory.op : copy, fill;
+
+        static if (isNested!T)
+        {
+            // Don't override the context pointer.
+            enum size_t size = T.sizeof - (void*).sizeof;
+        }
+        else
+        {
+            enum size_t size = T.sizeof;
+        }
+        static if (zero)
+        {
+            fill!0((cast(void*) &value)[0 .. size]);
+        }
+        else
+        {
+            copy(typeid(T).initializer()[0 .. size], (&value)[0 .. 1]);
+        }
+    }
+}
+
+/**
+ * Moves $(D_PARAM source) into $(D_PARAM target) assuming that
+ * $(D_PARAM target) isn't initialized.
+ *
+ * Moving the $(D_PARAM source) copies it into the $(D_PARAM target) and places
+ * the $(D_PARAM source) into a valid but unspecified state, which means that
+ * after moving $(D_PARAM source) can be destroyed or assigned a new value, but
+ * accessing it yields an unspecified value. No postblits or destructors are
+ * called. If the $(D_PARAM target) should be destroyed before, use
+ * $(D_PSYMBOL move).
+ *
+ * $(D_PARAM source) and $(D_PARAM target) must be different objects.
+ *
+ * Params:
+ *  T      = Object type.
+ *  source = Source object.
+ *  target = Target object.
+ *
+ * See_Also: $(D_PSYMBOL move),
+ *           $(D_PSYMBOL hasElaborateCopyConstructor),
+ *           $(D_PSYMBOL hasElaborateDestructor).
+ *
+ * Precondition: `&source !is &target`.
+ */
+void moveEmplace(T)(ref T source, ref T target) @system
+in
+{
+    assert(&source !is &target, "Source and target must be different");
+}
+do
+{
+    static if (is(T == struct) || isStaticArray!T)
+    {
+        import tanya.memory.op : copy;
+
+        copy((&source)[0 .. 1], (&target)[0 .. 1]);
+
+        static if (hasElaborateCopyConstructor!T || hasElaborateDestructor!T)
+        {
+            static if (__VERSION__ >= 2083) // __traits(isZeroInit) available.
+            {
+                deinitialize!(__traits(isZeroInit, T))(source);
+            }
+            else
+            {
+                if (typeid(T).initializer().ptr is null)
+                {
+                    deinitialize!true(source);
+                }
+                else
+                {
+                    deinitialize!false(source);
+                }
+            }
+        }
+    }
+    else
+    {
+        target = source;
+    }
+}
+
+///
+@nogc nothrow pure @system unittest
+{
+    static struct S
+    {
+        int member = 5;
+
+        this(this) @nogc nothrow pure @safe
+        {
+            assert(false);
+        }
+    }
+    S source, target = void;
+    moveEmplace(source, target);
+    assert(target.member == 5);
+
+    int x1 = 5, x2;
+    moveEmplace(x1, x2);
+    assert(x2 == 5);
+}
+
+/**
+ * Moves $(D_PARAM source) into $(D_PARAM target) assuming that
+ * $(D_PARAM target) isn't initialized.
+ *
+ * Moving the $(D_PARAM source) copies it into the $(D_PARAM target) and places
+ * the $(D_PARAM source) into a valid but unspecified state, which means that
+ * after moving $(D_PARAM source) can be destroyed or assigned a new value, but
+ * accessing it yields an unspecified value. $(D_PARAM target) is destroyed before
+ * the new value is assigned. If $(D_PARAM target) isn't initialized and
+ * therefore shouldn't be destroyed, $(D_PSYMBOL moveEmplace) can be used.
+ *
+ * If $(D_PARAM target) isn't specified, $(D_PSYMBOL move) returns the source
+ * as rvalue without calling its copy constructor or destructor.
+ *
+ * $(D_PARAM source) and $(D_PARAM target) are the same object,
+ * $(D_PSYMBOL move) does nothing.
+ *
+ * Params:
+ *  T      = Object type.
+ *  source = Source object.
+ *  target = Target object.
+ *
+ * See_Also: $(D_PSYMBOL moveEmplace).
+ */
+void move(T)(ref T source, ref T target)
+{
+    if ((() @trusted => &source is &target)())
+    {
+        return;
+    }
+    static if (hasElaborateDestructor!T)
+    {
+        target.__xdtor();
+    }
+    (() @trusted => moveEmplace(source, target))();
+}
+
+/// ditto
+T move(T)(ref T source) @trusted
+{
+    static if (hasElaborateCopyConstructor!T || hasElaborateDestructor!T)
+    {
+        T target = void;
+        moveEmplace(source, target);
+        return target;
+    }
+    else
+    {
+        return source;
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static struct S
+    {
+        int member = 5;
+
+        this(this) @nogc nothrow pure @safe
+        {
+            assert(false);
+        }
+    }
+    S source, target = void;
+    move(source, target);
+    assert(target.member == 5);
+    assert(move(target).member == 5);
+
+    int x1 = 5, x2;
+    move(x1, x2);
+    assert(x2 == 5);
+    assert(move(x2) == 5);
+}
+
+/**
+ * Exchanges the values of $(D_PARAM a) and $(D_PARAM b).
+ *
+ * $(D_PSYMBOL swap) moves the contents of $(D_PARAM a) and $(D_PARAM b)
+ * without calling its postblits or destructors.
+ *
+ * Params:
+ *  a = The first object.
+ *  b = The second object.
+ */
+void swap(T)(ref T a, ref T b) @trusted
+{
+    T tmp = void;
+    moveEmplace(a, tmp);
+    moveEmplace(b, a);
+    moveEmplace(tmp, b);
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    int a = 3, b = 5;
+    swap(a, b);
+    assert(a == 5);
+    assert(b == 3);
+}
+
+/**
+ * Forwards its argument list preserving $(D_KEYWORD ref) and $(D_KEYWORD out)
+ * storage classes.
+ *
+ * $(D_PSYMBOL forward) accepts a list of variables or literals. It returns an
+ * argument list of the same length that can be for example passed to a
+ * function accepting the arguments of this type.
+ *
+ * Params:
+ *  args = Argument list.
+ *
+ * Returns: $(D_PARAM args) with their original storage classes.
+ */
+template forward(args...)
+{
+    static if (args.length == 0)
+    {
+        alias forward = AliasSeq!();
+    }
+    else static if (__traits(isRef, args[0]) || __traits(isOut, args[0]))
+    {
+        static if (args.length == 1)
+        {
+            alias forward = args[0];
+        }
+        else
+        {
+            alias forward = AliasSeq!(args[0], forward!(args[1 .. $]));
+        }
+    }
+    else
+    {
+        @property auto forwardOne()
+        {
+            return move(args[0]);
+        }
+        static if (args.length == 1)
+        {
+            alias forward = forwardOne;
+        }
+        else
+        {
+            alias forward = AliasSeq!(forwardOne, forward!(args[1 .. $]));
+        }
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static assert(is(typeof((int i) { int v = forward!i; })));
+    static assert(is(typeof((ref int i) { int v = forward!i; })));
+    static assert(is(typeof({
+        void f(int i, ref int j, out int k)
+        {
+            f(forward!(i, j, k));
+        }
+    })));
+}
--- a/middle/tanya/memory/mallocator.d
+++ b/middle/tanya/memory/mallocator.d
@ -3,22 +3,18 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 /**
- * Allocator based on $(D_PSYMBOL malloc), $(D_PSYMBOL realloc) and $(D_PSYMBOL free).
+ * Allocator based on $(D_PSYMBOL malloc), $(D_PSYMBOL realloc) and
+ * $(D_PSYMBOL free).
 *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/memory/mallocator.d,
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/middle/tanya/memory/mallocator.d,
 *                 tanya/memory/mallocator.d)
 */
 module tanya.memory.mallocator;

-version (TanyaNative)
-{
-}
-else:
-
 import core.stdc.stdlib;
 import tanya.memory.allocator;

@ -171,16 +167,6 @@ final class Mallocator : Allocator
        assert(p is null);
    }

-    // Fails with false
-    @nogc nothrow pure @system unittest
-    {
-        void[] p = Mallocator.instance.allocate(20);
-        void[] oldP = p;
-        assert(!Mallocator.instance.reallocate(p, size_t.max - Mallocator.psize * 2));
-        assert(oldP is p);
-        Mallocator.instance.deallocate(p);
-    }
-
    /**
     * Returns: The alignment offered.
     */
@ -189,11 +175,6 @@ final class Mallocator : Allocator
        return (void*).alignof;
    }

-    private nothrow @nogc unittest
-    {
-        assert(Mallocator.instance.alignment == (void*).alignof);
-    }
-
    static private shared(Mallocator) instantiate() @nogc nothrow @system
    {
        if (instance_ is null)
--- a/middle/tanya/memory/mmappool.d
+++ b/middle/tanya/memory/mmappool.d
@ -5,41 +5,43 @@
 /*
 * Native allocator.
 *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/memory/mmappool.d,
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/middle/tanya/memory/mmappool.d,
 *                 tanya/memory/mmappool.d)
 */
 module tanya.memory.mmappool;

-version (TanyaNative):
-
-import mir.linux._asm.unistd;
-import tanya.algorithm.comparison;
+import core.sys.linux.sys.mman;
 import tanya.memory.allocator;
 import tanya.memory.op;
 import tanya.os.error;
-import tanya.sys.linux.syscall;
-import tanya.sys.posix.mman;

-private void* mapMemory(const size_t length) @nogc nothrow pure @system
+version (Windows)
 {
-    auto p = syscall_(0,
-                      length,
-                      PROT_READ | PROT_WRITE,
-                      MAP_PRIVATE | MAP_ANONYMOUS,
-                      -1,
-                      0,
-                      NR_mmap);
-    return p == -ErrorCode.noMemory ? null : cast(void*) p;
+    import core.sys.windows.basetsd : SIZE_T;
+    import core.sys.windows.windef : BOOL, DWORD;
+    import core.sys.windows.winnt : MEM_COMMIT, MEM_RELEASE, PAGE_READWRITE, PVOID;
+
+    extern (Windows)
+    private PVOID VirtualAlloc(PVOID, SIZE_T, DWORD, DWORD)
+    @nogc nothrow pure @system;
+
+    extern (Windows)
+    private BOOL VirtualFree(shared PVOID, SIZE_T, DWORD)
+    @nogc nothrow pure @system;
 }
-
-private bool unmapMemory(shared void* addr, const size_t length)
-@nogc nothrow pure @system
+else
 {
-    return syscall_(cast(ptrdiff_t) addr, length, NR_munmap) == 0;
+    extern(C) pragma(mangle, "mmap")
+    private void* mapMemory(void *addr, size_t length, int prot, int flags, int fd, off_t offset)
+    @nogc nothrow pure @system;
+
+    extern(C) pragma(mangle, "munmap")
+    private bool unmapMemory(shared void* addr, size_t length)
+    @nogc nothrow pure @system;
 }

 /*
@ -115,33 +117,6 @@ final class MmapPool : Allocator
        return data is null ? null : data[0 .. size];
    }

-    @nogc nothrow pure @system unittest
-    {
-        auto p = MmapPool.instance.allocate(20);
-        assert(p);
-        MmapPool.instance.deallocate(p);
-
-        p = MmapPool.instance.allocate(0);
-        assert(p.length == 0);
-    }
-
-    @nogc nothrow pure @system unittest
-    {
-        // allocate() check.
-        size_t tooMuchMemory = size_t.max
-                             - MmapPool.alignment_
-                             - BlockEntry.sizeof * 2
-                             - RegionEntry.sizeof
-                             - pageSize;
-        assert(MmapPool.instance.allocate(tooMuchMemory) is null);
-
-        assert(MmapPool.instance.allocate(size_t.max) is null);
-
-        // initializeRegion() check.
-        tooMuchMemory = size_t.max - MmapPool.alignment_;
-        assert(MmapPool.instance.allocate(tooMuchMemory) is null);
-    }
-
    /*
     * Search for a block large enough to keep $(D_PARAM size) and split it
     * into two blocks if the block is too large.
@ -234,7 +209,10 @@ final class MmapPool : Allocator
            {
                block.region.next.prev = block.region.prev;
            }
-            return unmapMemory(block.region, block.region.size);
+            version (Windows)
+                return VirtualFree(block.region, 0, MEM_RELEASE) != 0;
+            else
+                return unmapMemory(block.region, block.region.size) == 0;
        }
        // Merge blocks if neigbours are free.
        if (block.next !is null && block.next.free)
@ -258,13 +236,6 @@ final class MmapPool : Allocator
        return true;
    }

-    @nogc nothrow pure @system unittest
-    {
-        auto p = MmapPool.instance.allocate(20);
-
-        assert(MmapPool.instance.deallocate(p));
-    }
-
    /*
     * Reallocates a memory block in place if possible or returns
     * $(D_KEYWORD false). This function cannot be used to allocate or
@ -341,30 +312,6 @@ final class MmapPool : Allocator
        return true;
    }

-    @nogc nothrow pure @system unittest
-    {
-        void[] p;
-        assert(!MmapPool.instance.reallocateInPlace(p, 5));
-        assert(p is null);
-
-        p = MmapPool.instance.allocate(1);
-        auto orig = p.ptr;
-
-        assert(MmapPool.instance.reallocateInPlace(p, 2));
-        assert(p.length == 2);
-        assert(p.ptr == orig);
-
-        assert(MmapPool.instance.reallocateInPlace(p, 4));
-        assert(p.length == 4);
-        assert(p.ptr == orig);
-
-        assert(MmapPool.instance.reallocateInPlace(p, 2));
-        assert(p.length == 2);
-        assert(p.ptr == orig);
-
-        MmapPool.instance.deallocate(p);
-    }
-
    /*
     * Increases or decreases the size of a memory block.
     *
@ -399,7 +346,7 @@ final class MmapPool : Allocator
        }
        if (p !is null)
        {
-            copy(p[0 .. min(p.length, size)], reallocP);
+            copy(p[0 .. p.length < size ? p.length : size], reallocP);
            deallocate(p);
        }
        p = reallocP;
@ -407,34 +354,6 @@ final class MmapPool : Allocator
        return true;
    }

-    @nogc nothrow pure @system unittest
-    {
-        void[] p;
-        MmapPool.instance.reallocate(p, 10 * int.sizeof);
-        (cast(int[]) p)[7] = 123;
-
-        assert(p.length == 40);
-
-        MmapPool.instance.reallocate(p, 8 * int.sizeof);
-
-        assert(p.length == 32);
-        assert((cast(int[]) p)[7] == 123);
-
-        MmapPool.instance.reallocate(p, 20 * int.sizeof);
-        (cast(int[]) p)[15] = 8;
-
-        assert(p.length == 80);
-        assert((cast(int[]) p)[15] == 8);
-        assert((cast(int[]) p)[7] == 123);
-
-        MmapPool.instance.reallocate(p, 8 * int.sizeof);
-
-        assert(p.length == 32);
-        assert((cast(int[]) p)[7] == 123);
-
-        MmapPool.instance.deallocate(p);
-    }
-
    static private shared(MmapPool) instantiate() @nogc nothrow @system
    {
        if (instance_ is null)
@ -464,11 +383,6 @@ final class MmapPool : Allocator
        return (cast(GetPureInstance!MmapPool) &instantiate)();
    }

-    @nogc nothrow pure @system unittest
-    {
-        assert(instance is instance);
-    }
-
    /*
     * Initializes a region for one element.
     *
@ -486,11 +400,29 @@ final class MmapPool : Allocator
        {
            return null;
        }
-
-        void* p = mapMemory(regionSize);
-        if (p is null)
+        version (Windows)
        {
-            return null;
+            void* p = VirtualAlloc(null,
+                    regionSize,
+                    MEM_COMMIT,
+                    PAGE_READWRITE);
+            if (p is null)
+            {
+                return null;
+            }
+        }
+        else
+        {
+            void* p = mapMemory(null,
+                    regionSize,
+                    PROT_READ | PROT_WRITE,
+                    MAP_PRIVATE | MAP_ANONYMOUS,
+                    -1,
+                    0);
+            if (cast(ptrdiff_t) p == -1)
+            {
+                return null;
+            }
        }

        Region region = cast(Region) p;
@ -566,11 +498,6 @@ final class MmapPool : Allocator
        return alignment_;
    }

-    @nogc nothrow pure @system unittest
-    {
-        assert(MmapPool.instance.alignment == MmapPool.alignment_);
-    }
-
    private enum uint alignment_ = 8;

    private shared static MmapPool instance_;
@ -599,60 +526,19 @@ final class MmapPool : Allocator
    private alias Block = shared BlockEntry*;
 }

-// A lot of allocations/deallocations, but it is the minimum caused a
-// segmentation fault because MmapPool reallocateInPlace moves a block wrong.
@nogc nothrow pure @system unittest
 {
-    auto a = MmapPool.instance.allocate(16);
-    auto d = MmapPool.instance.allocate(16);
-    auto b = MmapPool.instance.allocate(16);
-    auto e = MmapPool.instance.allocate(16);
-    auto c = MmapPool.instance.allocate(16);
-    auto f = MmapPool.instance.allocate(16);
+    // allocate() check.
+    size_t tooMuchMemory = size_t.max
+        - MmapPool.alignment_
+        - MmapPool.BlockEntry.sizeof * 2
+        - MmapPool.RegionEntry.sizeof
+        - MmapPool.pageSize;
+    assert(MmapPool.instance.allocate(tooMuchMemory) is null);

-    MmapPool.instance.deallocate(a);
-    MmapPool.instance.deallocate(b);
-    MmapPool.instance.deallocate(c);
+    assert(MmapPool.instance.allocate(size_t.max) is null);

-    a = MmapPool.instance.allocate(50);
-    MmapPool.instance.reallocateInPlace(a, 64);
-    MmapPool.instance.deallocate(a);
-
-    a = MmapPool.instance.allocate(1);
-    auto tmp1 = MmapPool.instance.allocate(1);
-    auto h1 = MmapPool.instance.allocate(1);
-    auto tmp2 = cast(ubyte[]) MmapPool.instance.allocate(1);
-
-    auto h2 = MmapPool.instance.allocate(2);
-    tmp1 = MmapPool.instance.allocate(1);
-    MmapPool.instance.deallocate(h2);
-    MmapPool.instance.deallocate(h1);
-
-    h2 = MmapPool.instance.allocate(2);
-    h1 = MmapPool.instance.allocate(1);
-    MmapPool.instance.deallocate(h2);
-
-    auto rep = cast(void[]) tmp2;
-    MmapPool.instance.reallocate(rep, tmp1.length);
-    tmp2 = cast(ubyte[]) rep;
-
-    MmapPool.instance.reallocate(tmp1, 9);
-
-    rep = cast(void[]) tmp2;
-    MmapPool.instance.reallocate(rep, tmp1.length);
-    tmp2 = cast(ubyte[]) rep;
-    MmapPool.instance.reallocate(tmp1, 17);
-
-    tmp2[$ - 1] = 0;
-
-    MmapPool.instance.deallocate(tmp1);
-
-    b = MmapPool.instance.allocate(16);
-
-    MmapPool.instance.deallocate(h1);
-    MmapPool.instance.deallocate(a);
-    MmapPool.instance.deallocate(b);
-    MmapPool.instance.deallocate(d);
-    MmapPool.instance.deallocate(e);
-    MmapPool.instance.deallocate(f);
+    // initializeRegion() check.
+    tooMuchMemory = size_t.max - MmapPool.alignment_;
+    assert(MmapPool.instance.allocate(tooMuchMemory) is null);
 }
--- a/middle/tanya/memory/op.d
+++ b/middle/tanya/memory/op.d
@ -5,47 +5,16 @@
 /**
 * Set of operations on memory blocks.
 *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/memory/op.d,
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/middle/tanya/memory/op.d,
 *                 tanya/memory/op.d)
 */
 module tanya.memory.op;

-version (TanyaNative)
-{
-    extern private void fillMemory(void[], size_t) pure nothrow @system @nogc;
-
-    extern private void copyMemory(const void[], void[])
-    pure nothrow @system @nogc;
-
-    extern private void moveMemory(const void[], void[])
-    pure nothrow @system @nogc;
-
-    extern private bool equalMemory(const void[], const void[])
-    pure nothrow @system @nogc;
-}
-else
-{
-    import core.stdc.string;
-}
-
-version (TanyaNative)
-{
-    @nogc nothrow pure @system unittest
-    {
-        ubyte[2] buffer = 1;
-        fillMemory(buffer[1 .. $], 0);
-        assert(buffer[0] == 1 && buffer[1] == 0);
-    }
-
-    @nogc nothrow pure @safe unittest
-    {
-        assert(equal(null, null));
-    }
-}
+import core.stdc.string;

 private enum alignMask = size_t.sizeof - 1;

@ -75,14 +44,7 @@ in
 }
 do
 {
-    version (TanyaNative)
-    {
-        copyMemory(source, target);
-    }
-    else
-    {
-        memcpy(target.ptr, source.ptr, source.length);
-    }
+    memcpy(target.ptr, source.ptr, source.length);
 }

 ///
@ -94,26 +56,6 @@ do
    assert(equal(source, target));
 }

-@nogc nothrow pure @safe unittest
-{
-    {
-        ubyte[0] source, target;
-        source.copy(target);
-    }
-    {
-        ubyte[1] source = [1];
-        ubyte[1] target;
-        source.copy(target);
-        assert(target[0] == 1);
-    }
-    {
-        ubyte[8] source = [1, 2, 3, 4, 5, 6, 7, 8];
-        ubyte[8] target;
-        source.copy(target);
-        assert(equal(source, target));
-    }
-}
-
 /*
 * size_t value each of which bytes is set to `Byte`.
 */
@ -143,14 +85,7 @@ in
 }
 do
 {
-    version (TanyaNative)
-    {
-        fillMemory(memory, filledBytes!c);
-    }
-    else
-    {
-        memset(memory.ptr, c, memory.length);
-    }
+    memset(memory.ptr, c, memory.length);
 }

 ///
@ -195,14 +130,7 @@ in
 }
 do
 {
-    version (TanyaNative)
-    {
-        moveMemory(source, target);
-    }
-    else
-    {
-        memmove(target.ptr, source.ptr, source.length);
-    }
+    memmove(target.ptr, source.ptr, source.length);
 }

 ///
@ -215,15 +143,6 @@ do
    assert(equal(expected, mem));
 }

-@nogc nothrow pure @safe unittest
-{
-    ubyte[9] r1 = [ 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i' ];
-    ubyte[9] r2;
-
-    copyBackward(r1, r2);
-    assert(equal(r1, r2));
-}
-
 /**
 * Finds the first occurrence of $(D_PARAM needle) in $(D_PARAM haystack) if
 * any.
@ -398,15 +317,7 @@ in
 }
 do
 {
-    version (TanyaNative)
-    {
-        return equalMemory(r1, r2);
-    }
-    else
-    {
-        return r1.length == r2.length
-            && memcmp(r1.ptr, r2.ptr, r1.length) == 0;
-    }
+    return r1.length == r2.length && memcmp(r1.ptr, r2.ptr, r1.length) == 0;
 }

 ///
@ -417,21 +328,3 @@ do
    assert(!equal("asdf", "asd"));
    assert(!equal("asdf", "qwer"));
 }
-
-// Compares unanligned memory
-@nogc nothrow pure @safe unittest
-{
-    ubyte[16] r1 = [
-        'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h',
-        'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
-    ];
-    ubyte[16] r2 = [
-        'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h',
-        'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
-    ];
-
-    assert(equal(r1, r2));
-    assert(equal(r1[1 .. $], r2[1 .. $]));
-    assert(equal(r1[0 .. $ - 1], r2[0 .. $ - 1]));
-    assert(equal(r1[0 .. 8], r2[0 .. 8]));
-}
--- a/source/tanya/network/package.d
+++ b/source/tanya/network/package.d
@ -3,15 +3,16 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 /**
- * Network programming.
+ * Dynamic memory management.
 *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/network/package.d,
- *                 tanya/network/package.d)
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/middle/tanya/memory/package.d,
+ *                 tanya/memory/package.d)
 */
-module tanya.network;
+module tanya.memory;

-public import tanya.network.socket;
+public import tanya.memory.allocator;
+public import tanya.memory.lifetime;
--- a/middle/tanya/memory/smartref.d
+++ b/middle/tanya/memory/smartref.d
@ -14,27 +14,22 @@
 *  $(LI Unique ownership)
 * )
 *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/memory/smartref.d,
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/middle/tanya/memory/smartref.d,
 *                 tanya/memory/smartref.d)
 */
 module tanya.memory.smartref;

-import tanya.algorithm.comparison;
-import tanya.algorithm.mutation;
-import tanya.conv;
-import tanya.exception;
-import tanya.memory;
+import tanya.memory.allocator;
+import tanya.memory.lifetime;
 import tanya.meta.trait;
-import tanya.range.primitive;
-version (unittest) import tanya.test.stub;

 private template Payload(T)
 {
-    static if (isPolymorphicType!T || isArray!T)
+    static if (isPolymorphicType!T || isDynamicArray!T)
    {
        alias Payload = T;
    }
@ -306,174 +301,14 @@ struct RefCounted(T)
    auto val = rc.get();

    *val = 8;
-    assert(*rc.storage.payload == 8);
+    assert(*rc.get == 8);

    val = null;
-    assert(rc.storage.payload !is null);
-    assert(*rc.storage.payload == 8);
+    assert(rc.get !is null);
+    assert(*rc.get == 8);

    *rc = 9;
-    assert(*rc.storage.payload == 9);
-}
-
-@nogc @system unittest
-{
-    auto rc = defaultAllocator.refCounted!int(5);
-    rc = defaultAllocator.make!int(7);
-    assert(*rc == 7);
-}
-
-@nogc @system unittest
-{
-    RefCounted!int rc;
-    assert(!rc.isInitialized);
-    rc = null;
-    assert(!rc.isInitialized);
-}
-
-@nogc @system unittest
-{
-    auto rc = defaultAllocator.refCounted!int(5);
-
-    void func(RefCounted!int param) @nogc
-    {
-        assert(param.count == 2);
-        param = defaultAllocator.make!int(7);
-        assert(param.count == 1);
-        assert(*param == 7);
-    }
-    func(rc);
-    assert(rc.count == 1);
-    assert(*rc == 5);
-}
-
-@nogc @system unittest
-{
-    RefCounted!int rc;
-
-    void func(RefCounted!int param) @nogc
-    {
-        assert(param.count == 0);
-        param = defaultAllocator.make!int(7);
-        assert(param.count == 1);
-        assert(*param == 7);
-    }
-    func(rc);
-    assert(rc.count == 0);
-}
-
-@nogc @system unittest
-{
-    RefCounted!int rc1, rc2;
-    static assert(is(typeof(rc1 = rc2)));
-}
-
-version (unittest)
-{
-    private class A
-    {
-        uint *destroyed;
-
-        this(ref uint destroyed) @nogc
-        {
-            this.destroyed = &destroyed;
-        }
-
-        ~this() @nogc
-        {
-            ++(*destroyed);
-        }
-    }
-
-    private struct B
-    {
-        int prop;
-        @disable this();
-        this(int param1) @nogc
-        {
-            prop = param1;
-        }
-    }
-}
-
-@nogc @system unittest
-{
-    uint destroyed;
-    auto a = defaultAllocator.make!A(destroyed);
-
-    assert(destroyed == 0);
-    {
-        auto rc = RefCounted!A(a, defaultAllocator);
-        assert(rc.count == 1);
-
-        void func(RefCounted!A rc) @nogc @system
-        {
-            assert(rc.count == 2);
-        }
-        func(rc);
-
-        assert(rc.count == 1);
-    }
-    assert(destroyed == 1);
-
-    RefCounted!int rc;
-    assert(rc.count == 0);
-    rc = defaultAllocator.make!int(8);
-    assert(rc.count == 1);
-}
-
-@nogc @system unittest
-{
-    auto rc = RefCounted!int(defaultAllocator);
-    assert(!rc.isInitialized);
-    assert(rc.allocator is defaultAllocator);
-}
-
-@nogc @system unittest
-{
-    auto rc = defaultAllocator.refCounted!int(5);
-    assert(rc.count == 1);
-
-    void func(RefCounted!int rc) @nogc
-    {
-        assert(rc.count == 2);
-        rc = null;
-        assert(!rc.isInitialized);
-        assert(rc.count == 0);
-    }
-
-    assert(rc.count == 1);
-    func(rc);
-    assert(rc.count == 1);
-
-    rc = null;
-    assert(!rc.isInitialized);
-    assert(rc.count == 0);
-}
-
-@nogc @system unittest
-{
-    auto rc = defaultAllocator.refCounted!int(5);
-    assert(*rc == 5);
-
-    void func(RefCounted!int rc) @nogc
-    {
-        assert(rc.count == 2);
-        rc = defaultAllocator.refCounted!int(4);
-        assert(*rc == 4);
-        assert(rc.count == 1);
-    }
-    func(rc);
-    assert(*rc == 5);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(typeof(RefCounted!int.storage.payload) == int*));
-    static assert(is(typeof(RefCounted!A.storage.payload) == A));
-
-    static assert(is(RefCounted!B));
-    static assert(is(RefCounted!A));
+    assert(*rc.get == 9);
 }

 /**
@ -531,21 +366,21 @@ do
 *
 * Params:
 *  T         = Array type.
+ *  E         = Array element type.
 *  size      = Array size.
 *  allocator = Allocator.
 *
 * Returns: Newly created $(D_PSYMBOL RefCounted!T).
 *
 * Precondition: $(D_INLINECODE allocator !is null
- *                           && size <= size_t.max / ElementType!T.sizeof)
+ *                           && size <= size_t.max / E.sizeof)
 */
-RefCounted!T refCounted(T)(shared Allocator allocator, const size_t size)
+RefCounted!T refCounted(T : E[], E)(shared Allocator allocator, size_t size)
@trusted
-if (isArray!T)
 in
 {
    assert(allocator !is null);
-    assert(size <= size_t.max / ElementType!T.sizeof);
+    assert(size <= size_t.max / E.sizeof);
 }
 do
 {
@ -574,51 +409,6 @@ do
    assert(rc.count == 1);
 }

-@nogc @system unittest
-{
-    struct E
-    {
-    }
-    auto b = defaultAllocator.refCounted!B(15);
-    static assert(is(typeof(b.storage.payload) == B*));
-    static assert(is(typeof(b.prop) == int));
-    static assert(!is(typeof(defaultAllocator.refCounted!B())));
-
-    static assert(is(typeof(defaultAllocator.refCounted!E())));
-    static assert(!is(typeof(defaultAllocator.refCounted!E(5))));
-    {
-        auto rc = defaultAllocator.refCounted!B(3);
-        assert(rc.get().prop == 3);
-    }
-    {
-        auto rc = defaultAllocator.refCounted!E();
-        assert(rc.count);
-    }
-}
-
-@nogc @system unittest
-{
-    auto rc = defaultAllocator.refCounted!(int[])(5);
-    assert(rc.length == 5);
-}
-
-@nogc @system unittest
-{
-    auto p1 = defaultAllocator.make!int(5);
-    auto p2 = p1;
-    auto rc = RefCounted!int(p1, defaultAllocator);
-    assert(rc.get() is p2);
-}
-
-@nogc @system unittest
-{
-    size_t destroyed;
-    {
-        auto rc = defaultAllocator.refCounted!WithDtor(destroyed);
-    }
-    assert(destroyed == 1);
-}
-
 /**
 * $(D_PSYMBOL Unique) stores an object that gets destroyed at the end of its scope.
 *
@ -854,63 +644,24 @@ do
 *
 * Params:
 *  T         = Array type.
+ *  E         = Array element type.
 *  size      = Array size.
 *  allocator = Allocator.
 *
 * Returns: Newly created $(D_PSYMBOL Unique!T).
 *
 * Precondition: $(D_INLINECODE allocator !is null
- *                           && size <= size_t.max / ElementType!T.sizeof)
+ *                           && size <= size_t.max / E.sizeof)
 */
-Unique!T unique(T)(shared Allocator allocator, const size_t size)
+Unique!T unique(T : E[], E)(shared Allocator allocator, size_t size)
@trusted
-if (isArray!T)
 in
 {
    assert(allocator !is null);
-    assert(size <= size_t.max / ElementType!T.sizeof);
+    assert(size <= size_t.max / E.sizeof);
 }
 do
 {
-    auto payload = allocator.resize!(ElementType!T)(null, size);
+    auto payload = allocator.resize!E(null, size);
    return Unique!T(payload, allocator);
 }
-
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(typeof(defaultAllocator.unique!B(5))));
-    static assert(is(typeof(defaultAllocator.unique!(int[])(5))));
-}
-
-@nogc nothrow pure @system unittest
-{
-    auto s = defaultAllocator.unique!int(5);
-    assert(*s == 5);
-
-    s = null;
-    assert(s is null);
-}
-
-@nogc nothrow pure @system unittest
-{
-    auto s = defaultAllocator.unique!int(5);
-    assert(*s == 5);
-
-    s = defaultAllocator.unique!int(4);
-    assert(*s == 4);
-}
-
-@nogc nothrow pure @system unittest
-{
-    auto p1 = defaultAllocator.make!int(5);
-    auto p2 = p1;
-
-    auto rc = Unique!int(p1, defaultAllocator);
-    assert(rc.get() is p2);
-}
-
-@nogc nothrow pure @system unittest
-{
-    auto rc = Unique!int(defaultAllocator);
-    assert(rc.allocator is defaultAllocator);
-}
--- a/os/dub.json
+++ b/os/dub.json
@ -0,0 +1,17 @@
+{
+	"name": "os",
+	"description": "Platform-independent interfaces to operating system functionality",
+	"targetType": "library",
+
+	"dependencies": {
+		"tanya:meta": "*"
+	},
+
+	"sourcePaths": [
+		"."
+	],
+	"importPaths": [
+		"."
+	],
+	"dflags-dmd": ["-dip1000"]
+}
--- a/source/tanya/os/error.d
+++ b/source/tanya/os/error.d
@ -5,11 +5,11 @@
 /**
 * This module provides a portable way of using operating system error codes.
 *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/os/error.d,
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/os/tanya/os/error.d,
 *                 tanya/os/error.d)
 */
 module tanya.os.error;
@ -307,14 +307,14 @@ struct ErrorCode
     *
     * Returns: $(D_KEYWORD this).
     */
-    ref ErrorCode opAssign(const ErrorNo that) @nogc nothrow pure @safe
+    ref ErrorCode opAssign(const ErrorNo that) return @nogc nothrow pure @safe
    {
        this.value_ = that;
        return this;
    }

    /// ditto
-    ref ErrorCode opAssign(const ErrorCode that) @nogc nothrow pure @safe
+    ref ErrorCode opAssign(const ErrorCode that) return @nogc nothrow pure @safe
    {
        this.value_ = that.value_;
        return this;
@ -407,12 +407,6 @@ struct ErrorCode
        assert(ec.toString() == "An invalid pointer address detected");
    }

-    @nogc nothrow pure @safe unittest
-    {
-        ErrorCode ec = cast(ErrorCode.ErrorNo) -1;
-        assert(ec.toString() is null);
-    }
-
    private ErrorNo value_ = ErrorNo.success;

    alias ErrorNo this;
--- a/source/tanya/os/package.d
+++ b/source/tanya/os/package.d
@ -6,11 +6,11 @@
 * This package provides platform-independent interfaces to operating system
 * functionality.
 *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/os/package.d,
+ * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/os/tanya/os/package.d,
 *                 tanya/os/package.d)
 */
 module tanya.os;
--- a/source/tanya/algorithm/comparison.d
+++ b/source/tanya/algorithm/comparison.d
@ -1,463 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Algorithms for comparing values.
- *
- * Copyright: Eugene Wissner 2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/algorithm/comparison.d,
- *                 tanya/algorithm/comparison.d)
- */
-module tanya.algorithm.comparison;
-
-import tanya.algorithm.mutation;
-import tanya.math;
-static import tanya.memory.op;
-import tanya.meta.metafunction;
-import tanya.meta.trait;
-import tanya.meta.transform;
-import tanya.range.array;
-import tanya.range.primitive;
-
-private ref inout(Args[0]) minMax(alias cmp, Args...)(ref inout Args args)
-{
-    auto actual = ((ref arg) @trusted => &arg)(args[0]);
-
-    foreach (i, arg; args[1 .. $])
-    {
-        static if (isFloatingPoint!(Args[0]))
-        {
-            if (isNaN(arg))
-            {
-                continue;
-            }
-            if (isNaN(*actual))
-            {
-                actual = ((ref arg) @trusted => &arg)(args[i + 1]);
-                continue;
-            }
-        }
-        if (cmp(arg, *actual))
-        {
-            actual = ((ref arg) @trusted => &arg)(args[i + 1]);
-        }
-    }
-
-    return *actual;
-}
-
-private T moveIf(T)(ref T arg)
-{
-    static if (hasElaborateCopyConstructor!T && isMutable!T)
-    {
-        return move(arg);
-    }
-    else
-    {
-        return arg;
-    }
-}
-
-/**
- * Finds the smallest element in the argument list or a range.
- *
- * If a range is passed, $(D_PSYMBOL min) returns a range of the same type,
- * whose front element is the smallest in the range. If more than one element
- * fulfills this condition, the front of the returned range points to
- * the first one found.
- * If $(D_PARAM range) is empty, the original range is returned.
- *
- * If $(D_PARAM Args) are floating point numbers, $(B NaN) is not considered
- * for comparison. $(B NaN) is returned only if all arguments are $(B NaN)s.
- *
- * Params:
- *  Args  = Types of the arguments. All arguments should have the same type.
- *  Range = Forward range type.
- *  args  = Argument list.
- *  range = Forward range.
- *
- * Returns: The smallest element.
- */
-CommonType!Args min(Args...)(Args args)
-if (Args.length >= 2
- && isOrderingComparable!(Args[0])
- && allSameType!(Map!(Unqual, Args)))
-{
-    return moveIf(minMax!((ref a, ref b) => a < b)(args));
-}
-
-/// ditto
-ref inout(Unqual!(Args[0])) min(Args...)(ref inout Args args)
-if (Args.length >= 2
- && isOrderingComparable!(Args[0])
- && allSameType!(Map!(Unqual, Args)))
-{
-    return minMax!((ref a, ref b) => a < b)(args);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    static assert(!is(typeof(min(1, 1UL))));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    assert(min(5, 3) == 3);
-    assert(min(4, 4) == 4);
-    assert(min(5.2, 3.0) == 3.0);
-
-    assert(min(5.2, double.nan) == 5.2);
-    assert(min(double.nan, 3.0) == 3.0);
-    assert(isNaN(min(double.nan, double.nan)));
-}
-
-/// ditto
-Range min(Range)(Range range)
-if (isForwardRange!Range && isOrderingComparable!(ElementType!Range))
-{
-    if (range.empty)
-    {
-        return range;
-    }
-    auto actual = range.save;
-
-    range.popFront();
-    for (; !range.empty; range.popFront())
-    {
-        if (range.front < actual.front)
-        {
-            actual = range.save;
-        }
-    }
-
-    return actual;
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    assert(min(1, 2) == 1);
-    assert(min(3, 2) == 2);
-    assert(min(3, 1, 2) == 1);
-
-    int[4] range = [3, 1, 1, 2];
-    auto minElement = min(range[]);
-    assert(minElement.front == 1);
-    assert(minElement.length == 3);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    assert(min(cast(ubyte[]) []).empty);
-}
-
-/**
- * Finds the largest element in the argument list or a range.
- *
- * If a range is passed, $(D_PSYMBOL max) returns a range of the same type,
- * whose front element is the largest in the range. If more than one element
- * fulfills this condition, the front of the returned range points to
- * the first one found.
- * If $(D_PARAM range) is empty, the original range is returned.
- *
- * If $(D_PARAM Args) are floating point numbers, $(B NaN) is not considered
- * for comparison. $(B NaN) is returned only if all arguments are $(B NaN)s.
- *
- * Params:
- *  Args  = Types of the arguments. All arguments should have the same type.
- *  Range = Forward range type.
- *  args  = Argument list.
- *  range = Forward range.
- *
- * Returns: The largest element.
- */
-CommonType!Args max(Args...)(Args args)
-if (Args.length >= 2
- && isOrderingComparable!(Args[0])
- && allSameType!(Map!(Unqual, Args)))
-{
-    return moveIf(minMax!((ref a, ref b) => a > b)(args));
-}
-
-/// ditto
-ref inout(Unqual!(Args[0])) max(Args...)(ref inout Args args)
-if (Args.length >= 2
- && isOrderingComparable!(Args[0])
- && allSameType!(Map!(Unqual, Args)))
-{
-    return minMax!((ref a, ref b) => a > b)(args);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    static assert(!is(typeof(max(1, 1UL))));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    assert(max(5, 3) == 5);
-    assert(max(4, 4) == 4);
-    assert(max(5.2, 3.0) == 5.2);
-
-    assert(max(5.2, double.nan) == 5.2);
-    assert(max(double.nan, 3.0) == 3.0);
-    assert(isNaN(max(double.nan, double.nan)));
-}
-
-/// ditto
-Range max(Range)(Range range)
-if (isForwardRange!Range && isOrderingComparable!(ElementType!Range))
-{
-    if (range.empty)
-    {
-        return range;
-    }
-    auto actual = range.save;
-
-    range.popFront();
-    for (; !range.empty; range.popFront())
-    {
-        if (range.front > actual.front)
-        {
-            actual = range.save;
-        }
-    }
-
-    return actual;
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    assert(max(1, 2) == 2);
-    assert(max(3, 2) == 3);
-    assert(max(1, 3, 2) == 3);
-
-    int[4] range = [1, 5, 5, 2];
-    auto maxElement = max(range[]);
-    assert(maxElement.front == 5);
-    assert(maxElement.length == 3);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    assert(max(cast(ubyte[]) []).empty);
-}
-
-// min/max compare const and mutable structs.
-@nogc nothrow pure @safe unittest
-{
-    static struct S
-    {
-        int s;
-
-        int opCmp(typeof(this) that) const @nogc nothrow pure @safe
-        {
-            return this.s - that.s;
-        }
-    }
-    {
-        const s1 = S(1);
-        assert(min(s1, S(2)).s == 1);
-        assert(max(s1, S(2)).s == 2);
-    }
-    {
-        auto s2 = S(2), s3 = S(3);
-        assert(min(s2, s3).s == 2);
-        assert(max(s2, s3).s == 3);
-    }
-}
-
-/**
- * Compares element-wise two ranges for equality.
- *
- * If the ranges have different lengths, they aren't equal.
- *
- * Params:
- *  pred = Predicate used to compare individual element pairs.
- *  R1   = First range type.
- *  R2   = Second range type.
- *  r1   = First range.
- *  r2   = Second range.
- *
- * Returns: $(D_KEYWORD true) if both ranges are equal, $(D_KEYWORD false)
- *          otherwise.
- */
-bool equal(alias pred = (auto ref a, auto ref b) => a == b, R1, R2)
-          (R1 r1, R2 r2)
-if (allSatisfy!(isInputRange, R1, R2)
- && is(typeof(pred(r1.front, r2.front)) == bool))
-{
-    static if (isDynamicArray!R1
-            && is(R1 == R2)
-            && __traits(isPOD, ElementType!R1))
-    {
-        return tanya.memory.op.equal(r1, r2);
-    }
-    else
-    {
-        static if (hasLength!R1 && hasLength!R2)
-        {
-            if (r1.length != r2.length)
-            {
-                return false;
-            }
-        }
-        for (; !r1.empty && !r2.empty; r1.popFront(), r2.popFront())
-        {
-            if (!pred(r1.front, r2.front))
-            {
-                return false;
-            }
-        }
-        static if (hasLength!R1 && hasLength!R2)
-        {
-            return true;
-        }
-        else
-        {
-            return r1.empty && r2.empty;
-        }
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    int[2] range1 = [1, 2];
-    assert(equal(range1[], range1[]));
-
-    int[3] range2 = [1, 2, 3];
-    assert(!equal(range1[], range2[]));
-}
-
-/**
- * Compares element-wise two ranges for ordering.
- *
- * $(D_PSYMBOL compare) returns a negative value if $(D_PARAM r1) is less than
- * $(D_PARAM r2), a positive value if $(D_PARAM r2) is less than $(D_PARAM r1),
- * or `0` if $(D_PARAM r1) and $(D_PARAM r2) equal.
- *
- * $(D_PSYMBOL compare) iterates both ranges in lockstep. Whichever of them
- * contains an element that is greater than the respective element at the same
- * position in the other range is the greater one of the two.
- *
- * If one of the ranges becomes empty when iterating, but all elements equal so
- * far, the range with more elements is the greater one.
- *
- * If $(D_PARAM pred) is given, it is used for comparison. $(D_PARAM pred) is
- * called as $(D_INLINECODE pred(r1.front, r2.front)) and
- * $(D_INLINECODE pred(r2.front, r1.front)) to perform three-way comparison.
- * $(D_PARAM pred) should return a $(D_KEYWORD bool).
- *
- * If $(D_PARAM pred) is not given, but the element type of $(D_PARAM R1)
- * defines `opCmp()` for the element type of $(D_PARAM R2), `opCmp()` is used.
- *
- * Otherwise the comparison is perfomed using the basic comparison operators.
- *
- * Params:
- *  pred = Predicate used for comparison.
- *  R1   = First range type.
- *  R2   = Second range type.
- *  r1   = First range.
- *  r2   = Second range.
- *
- * Returns: A negative value if $(D_PARAM r1) is less than $(D_PARAM r2), a
- *          positive value if $D(_PARAM r2) is less than $(D_PARAM r1), `0`
- *          otherwise.
- */
-int compare(alias pred, R1, R2)(R1 r1, R2 r2)
-if (allSatisfy!(isInputRange, R1, R2)
- && is(typeof(pred(r1.front, r2.front)) == bool)
- && is(typeof(pred(r2.front, r1.front)) == bool))
-{
-    alias predImpl = (ref r1, ref r2) {
-        return pred(r2.front, r1.front) - pred(r1.front, r2.front);
-    };
-    return compareImpl!(predImpl, R1, R2)(r1, r2);
-}
-
-/// ditto
-int compare(R1, R2)(R1 r1, R2 r2)
-if (allSatisfy!(isInputRange, R1, R2)
- && is(typeof(r1.front < r2.front || r2.front < r1.front)))
-{
-    static if (is(typeof(r1.front.opCmp(r2.front)) == int))
-    {
-        alias pred = (ref r1, ref r2) => r1.front.opCmp(r2.front);
-    }
-    else
-    {
-        alias pred = (ref r1, ref r2) {
-            return (r2.front < r1.front) - (r1.front < r2.front);
-        };
-    }
-    return compareImpl!(pred, R1, R2)(r1, r2);
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    assert(compare("abc", "abc") == 0);
-    assert(compare("abcd", "abc") > 0);
-    assert(compare("ab", "abc") < 0);
-    assert(compare("abc", "abcd") < 0);
-    assert(compare("abc", "ab") > 0);
-    assert(compare("aec", "abc") > 0);
-    assert(compare("aac", "abc") < 0);
-    assert(compare("abc", "aec") < 0);
-    assert(compare("abc", "aab") > 0);
-    assert(compare("aacd", "abc") < 0);
-    assert(compare("abc", "aacd") > 0);
-
-    assert(compare!((a, b) => a > b)("aec", "abc") < 0);
-    assert(compare!((a, b) => a > b)("aac", "abc") > 0);
-}
-
-private int compareImpl(alias pred, R1, R2)(ref R1 r1, ref R2 r2)
-{
-    for (; !r1.empty || !r2.empty; r1.popFront(), r2.popFront())
-    {
-        if (r1.empty)
-        {
-            return -1;
-        }
-        else if (r2.empty)
-        {
-            return 1;
-        }
-        const comparison = pred(r1, r2);
-        if (comparison != 0)
-        {
-            return comparison;
-        }
-    }
-    return 0;
-}
-
-@nogc nothrow pure @safe unittest
-{
-    static struct OpCmp(int value)
-    {
-        int opCmp(OpCmp) @nogc nothrow pure @safe
-        {
-            return value;
-        }
-    }
-    {
-        OpCmp!(-1)[1] range;
-        assert(compare(range[], range[]) < 0);
-    }
-    {
-        OpCmp!1[1] range;
-        assert(compare(range[], range[]) > 0);
-    }
-    {
-        OpCmp!0[1] range;
-        assert(compare(range[], range[]) == 0);
-    }
-}
--- a/source/tanya/algorithm/iteration.d
+++ b/source/tanya/algorithm/iteration.d
@ -11,7 +11,7 @@
 * All algorithms in this module are lazy, they request the next element of the
 * original range on demand.
 *
- * Copyright: Eugene Wissner 2018.
+ * Copyright: Eugene Wissner 2018-2021.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -20,41 +20,45 @@
 */
 module tanya.algorithm.iteration;

-import tanya.algorithm.comparison;
-import tanya.algorithm.mutation;
+import std.typecons;
+import tanya.memory.lifetime;
+import tanya.meta.trait;
+import tanya.meta.transform;
 import tanya.range;
-version (unittest) import tanya.test.stub;

-private struct Take(R, bool exactly)
+private struct SingletonByValue(E)
 {
-    private R source;
-    size_t length_;
+    private Nullable!E element;

    @disable this();

-    private this(R source, size_t length)
+    private this(U)(ref U element)
+    if (is(U == E))
    {
-        this.source = source;
-        static if (!exactly && hasLength!R)
+        this.element = move(element);
+    }
+
+    private this(U)(ref U element)
+    if (is(Unqual!U == Nullable!(Unqual!E)) || is(Unqual!U == Nullable!(const E)))
+    {
+        if (!element.isNull)
        {
-            this.length_ = min(source.length, length);
-        }
-        else
-        {
-            this.length_ = length;
+            this.element = element.get;
        }
    }

-    @property auto ref front()
+    @property ref inout(E) front() inout
    in
    {
        assert(!empty);
    }
    do
    {
-        return this.source.front;
+        return this.element.get;
    }

+    alias back = front;
+
    void popFront()
    in
    {
@ -62,587 +66,194 @@ private struct Take(R, bool exactly)
    }
    do
    {
-        this.source.popFront();
-        --this.length_;
+        this.element.nullify();
    }

-    @property bool empty()
+    alias popBack = popFront;
+
+    @property bool empty() const
    {
-        static if (exactly || isInfinite!R)
-        {
-            return length == 0;
-        }
-        else
-        {
-            return this.length_ == 0 || this.source.empty;
-        }
+        return this.element.isNull;
    }

-    static if (exactly || hasLength!R)
+    @property size_t length() const
    {
-        @property size_t length()
-        {
-            return this.length_;
-        }
+        return !this.element.isNull;
    }

-    static if (hasAssignableElements!R)
+    auto save()
    {
-        @property void front(ref ElementType!R value)
-        in
-        {
-            assert(!empty);
-        }
-        do
-        {
-            this.source.front = value;
-        }
-
-        @property void front(ElementType!R value)
-        in
-        {
-            assert(!empty);
-        }
-        do
-        {
-            this.source.front = move(value);
-        }
+        return SingletonByValue!E(this.element);
    }

-    static if (isForwardRange!R)
+    ref inout(E) opIndex(size_t i) inout
+    in
    {
-        typeof(this) save()
-        {
-            return typeof(this)(this.source.save(), length);
-        }
+        assert(!empty);
+        assert(i == 0);
    }
-    static if (isRandomAccessRange!R)
+    do
    {
-        @property auto ref back()
-        in
-        {
-            assert(!empty);
-        }
-        do
-        {
-            return this.source[this.length - 1];
-        }
-
-        void popBack()
-        in
-        {
-            assert(!empty);
-        }
-        do
-        {
-            --this.length_;
-        }
-
-        auto ref opIndex(size_t i)
-        in
-        {
-            assert(i < length);
-        }
-        do
-        {
-            return this.source[i];
-        }
-
-        static if (hasAssignableElements!R)
-        {
-            @property void back(ref ElementType!R value)
-            in
-            {
-                assert(!empty);
-            }
-            do
-            {
-                this.source[length - 1] = value;
-            }
-
-            @property void back(ElementType!R value)
-            in
-            {
-                assert(!empty);
-            }
-            do
-            {
-                this.source[length - 1] = move(value);
-            }
-
-            void opIndexAssign(ref ElementType!R value, size_t i)
-            in
-            {
-                assert(i < length);
-            }
-            do
-            {
-                this.source[i] = value;
-            }
-
-            void opIndexAssign(ElementType!R value, size_t i)
-            in
-            {
-                assert(i < length);
-            }
-            do
-            {
-                this.source[i] = move(value);
-            }
-        }
-    }
-
-    static if (!exactly && hasSlicing!R)
-    {
-        auto opSlice(size_t i, size_t j)
-        in
-        {
-            assert(i <= j);
-            assert(j <= length);
-        }
-        do
-        {
-            return typeof(this)(this.source[i .. j], length);
-        }
-    }
-
-    version (unittest) static assert(isInputRange!Take);
-}
-
-/**
- * Takes $(D_PARAM n) elements from $(D_PARAM range).
- *
- * If $(D_PARAM range) doesn't have $(D_PARAM n) elements, the resulting range
- * spans all elements of $(D_PARAM range).
- *
- * $(D_PSYMBOL take) is particulary useful with infinite ranges. You can take
- ` $(B n) elements from such range and pass the result to an algorithm which
- * expects a finit range.
- *
- * Params:
- *  R     = Type of the adapted range.
- *  range = The range to take the elements from.
- *  n     = The number of elements to take.
- *
- * Returns: A range containing maximum $(D_PARAM n) first elements of
- *          $(D_PARAM range).
- *
- * See_Also: $(D_PSYMBOL takeExactly).
- */
-auto take(R)(R range, size_t n)
-if (isInputRange!R)
-{
-    static if (hasSlicing!R && hasLength!R)
-    {
-        if (range.length <= n)
-            return range;
-        else
-            return range[0 .. n];
-    }
-    // Special case: take(take(...), n)
-    else static if (is(Range == Take!(RRange, exact), RRange, bool exact))
-    {
-        if (n > range.length_)
-            n = range.length_;
-        static if (exact)
-            // `take(takeExactly(r, n0), n)` is rewritten `takeExactly(r, min(n0, n))`.
-            return Take!(RRange, true)(range.source, n);
-        else
-            // `take(take(r, n0), n)` is rewritten `take(r, min(n0, n))`.
-            return Take!(RRange, false)(range.source, n);
-    }
-    else static if (isInfinite!R)
-    {
-        // If the range is infinite then `take` is the same as `takeExactly`.
-        return Take!(R, true)(range, n);
-    }
-    else
-    {
-        return Take!(R, false)(range, n);
+        return this.element.get;
    }
 }

-///
-@nogc nothrow pure @safe unittest
+private struct SingletonByRef(E)
 {
-    static struct InfiniteRange
-    {
-        private size_t front_ = 1;
-
-        enum bool empty = false;
-
-        @property size_t front() @nogc nothrow pure @safe
-        {
-            return this.front_;
-        }
-
-        @property void front(size_t i) @nogc nothrow pure @safe
-        {
-            this.front_ = i;
-        }
-
-        void popFront() @nogc nothrow pure @safe
-        {
-            ++this.front_;
-        }
-
-        size_t opIndex(size_t i) @nogc nothrow pure @safe
-        {
-            return this.front_ + i;
-        }
-
-        void opIndexAssign(size_t value, size_t i) @nogc nothrow pure @safe
-        {
-            this.front = i + value;
-        }
-
-        InfiniteRange save() @nogc nothrow pure @safe
-        {
-            return this;
-        }
-    }
-
-    auto t = InfiniteRange().take(3);
-    assert(t.length == 3);
-    assert(t.front == 1);
-    assert(t.back == 3);
-
-    t.popFront();
-    assert(t.front == 2);
-    assert(t.back == 3);
-
-    t.popBack();
-    assert(t.front == 2);
-    assert(t.back == 2);
-
-    t.popFront();
-    assert(t.empty);
-}
-
-// length is unknown when taking from a range without length
-@nogc nothrow pure @safe unittest
-{
-    static struct R
-    {
-        mixin InputRangeStub;
-    }
-    auto actual = take(R(), 100);
-
-    static assert(!hasLength!(typeof(actual)));
-}
-
-/**
- * Takes exactly $(D_PARAM n) elements from $(D_PARAM range).
- *
- * $(D_PARAM range) must have at least $(D_PARAM n) elements.
- *
- * $(D_PSYMBOL takeExactly) is particulary useful with infinite ranges. You can
- ` take $(B n) elements from such range and pass the result to an algorithm
- * which expects a finit range.
- *
- * Params:
- *  R     = Type of the adapted range.
- *  range = The range to take the elements from.
- *  n     = The number of elements to take.
- *
- * Returns: A range containing $(D_PARAM n) first elements of $(D_PARAM range).
- *
- * See_Also: $(D_PSYMBOL take).
- */
-auto takeExactly(R)(R range, size_t n)
-if (isInputRange!R)
-{
-    static if (hasSlicing!R)
-    {
-        return range[0 .. n];
-    }
-    // Special case: takeExactly(take(range, ...), n) is takeExactly(range, n)
-    else static if (is(Range == Take!(RRange, exact), RRange, bool exact))
-    {
-        assert(n <= range.length_);
-        return Take!(RRange, true)(range.source, n);
-    }
-    else
-    {
-        return Take!(R, true)(range, n);
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static struct InfiniteRange
-    {
-        private size_t front_ = 1;
-
-        enum bool empty = false;
-
-        @property size_t front() @nogc nothrow pure @safe
-        {
-            return this.front_;
-        }
-
-        @property void front(size_t i) @nogc nothrow pure @safe
-        {
-            this.front_ = i;
-        }
-
-        void popFront() @nogc nothrow pure @safe
-        {
-            ++this.front_;
-        }
-
-        size_t opIndex(size_t i) @nogc nothrow pure @safe
-        {
-            return this.front_ + i;
-        }
-
-        void opIndexAssign(size_t value, size_t i) @nogc nothrow pure @safe
-        {
-            this.front = i + value;
-        }
-
-        InfiniteRange save() @nogc nothrow pure @safe
-        {
-            return this;
-        }
-    }
-
-    auto t = InfiniteRange().takeExactly(3);
-    assert(t.length == 3);
-    assert(t.front == 1);
-    assert(t.back == 3);
-
-    t.popFront();
-    assert(t.front == 2);
-    assert(t.back == 3);
-
-    t.popBack();
-    assert(t.front == 2);
-    assert(t.back == 2);
-
-    t.popFront();
-    assert(t.empty);
-}
-
-// Takes minimum length if the range length > n
-@nogc nothrow pure @safe unittest
-{
-    auto range = take(cast(int[]) null, 8);
-    assert(range.length == 0);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    const int[9] range = [1, 2, 3, 4, 5, 6, 7, 8, 9];
-    {
-        auto slice = take(range[], 8)[1 .. 3];
-
-        assert(slice.length == 2);
-        assert(slice.front == 2);
-        assert(slice.back == 3);
-    }
-    {
-        auto slice = takeExactly(range[], 8)[1 .. 3];
-
-        assert(slice.length == 2);
-        assert(slice.front == 2);
-        assert(slice.back == 3);
-    }
-}
-
-// Reverse-access-order range returned by `retro`.
-private struct Retro(Range)
-{
-    Range source;
+    private E* element;

    @disable this();

-    private this(Range source)
+    private this(return ref E element) @trusted
    {
-        this.source = source;
+        this.element = &element;
    }

-    Retro save()
+    @property ref inout(E) front() inout return
+    in
    {
-        return this;
+        assert(!empty);
+    }
+    do
+    {
+        return *this.element;
    }

-    @property auto ref front()
-    in (!empty)
-    {
-        return this.source.back;
-    }
+    alias back = front;

    void popFront()
-    in (!empty)
+    in
    {
-        this.source.popBack();
+        assert(!empty);
+    }
+    do
+    {
+        this.element = null;
    }

-    @property auto ref back()
-    in (!empty)
+    alias popBack = popFront;
+
+    @property bool empty() const
    {
-        return this.source.front;
+        return this.element is null;
    }

-    void popBack()
-    in (!empty)
+    @property size_t length() const
    {
-        this.source.popFront();
+        return this.element !is null;
    }

-    @property bool empty()
+    auto save() return
    {
-        return this.source.empty;
+        return typeof(this)(*this.element);
    }

-    static if (hasLength!Range)
+    ref inout(E) opIndex(size_t i) inout return
+    in
    {
-        @property size_t length()
-        {
-            return this.source.length;
-        }
+        assert(!empty);
+        assert(i == 0);
    }
-
-    static if (isRandomAccessRange!Range && hasLength!Range)
+    do
    {
-        auto ref opIndex(size_t i)
-        in (i < length)
-        {
-            return this.source[$ - ++i];
-        }
+        return *this.element;
    }
-
-    static if (hasLength!Range && hasSlicing!Range)
-    {
-        alias opDollar = length;
-
-        auto opSlice(size_t i, size_t j)
-        in
-        {
-            assert(i <= j);
-            assert(j <= length);
-        }
-        do
-        {
-            return typeof(this)(this.source[$-j .. $-i]);
-        }
-    }
-
-    static if (hasAssignableElements!Range)
-    {
-        @property void front(ref ElementType!Range value)
-        in (!empty)
-        {
-            this.source.back = value;
-        }
-
-        @property void front(ElementType!Range value)
-        in (!empty)
-        {
-            this.source.back = move(value);
-        }
-
-        @property void back(ref ElementType!Range value)
-        in (!empty)
-        {
-            this.source.front = value;
-        }
-
-        @property void back(ElementType!Range value)
-        in (!empty)
-        {
-            this.source.front = move(value);
-        }
-
-        static if (isRandomAccessRange!Range && hasLength!Range)
-        {
-            void opIndexAssign(ref ElementType!Range value, size_t i)
-            in (i < length)
-            {
-                this.source[$ - ++i] = value;
-            }
-
-            void opIndexAssign(ElementType!Range value, size_t i)
-            in (i < length)
-            {
-                this.source[$ - ++i] = move(value);
-            }
-        }
-    }
-
-    version (unittest) static assert(isBidirectionalRange!Retro);
 }

 /**
- * Iterates a bidirectional range backwards.
+ * Creates a bidirectional and random-access range with the single element
+ * $(D_PARAM element).
 *
- * If $(D_PARAM Range) is a random-access range as well, the resulting range
- * is a random-access range too.
+ * If $(D_PARAM element) is passed by value the resulting range stores it
+ * internally. If $(D_PARAM element) is passed by reference, the resulting
+ * range keeps only a pointer to the element.
 *
 * Params:
- *  Range = Bidirectional range type.
- *  range = Bidirectional range.
+ *  E       = Element type.
+ *  element = Element.
 *
- * Returns: Bidirectional range with the elements order reversed.
+ * Returns: A range with one element.
 */
-auto retro(Range)(return Range range)
-if (isBidirectionalRange!Range)
+auto singleton(E)(return E element)
+if (isMutable!E)
 {
-    // Special case: retro(retro(range)) is range
-    static if (is(Range == Retro!RRange, RRange))
-        return range.source;
-    else
-        return Retro!Range(range);
+    return SingletonByValue!E(element);
+}
+
+/// ditto
+auto singleton(E)(return ref E element)
+{
+    return SingletonByRef!E(element);
 }

 ///
@nogc nothrow pure @safe unittest
 {
-    import tanya.algorithm.comparison : equal;
+    auto singleChar = singleton('a');

-    const int[3] given = [1, 2, 3];
+    assert(singleChar.length == 1);
+    assert(singleChar.front == 'a');
+
+    singleChar.popFront();
+    assert(singleChar.empty);
+}
+
+/**
+ * Accumulates all elements of a range using a function.
+ *
+ * $(D_PSYMBOL foldr) takes a function, a bidirectional range and the initial
+ * value. The function takes this initial value and the first element of the
+ * range (in this order), puts them together and returns the result. The return
+ * type of the function should be the same as the type of the initial value.
+ * This is than repeated for all the remaining elements of the range, whereby
+ * the value returned by the passed function is used at the place of the
+ * initial value.
+ *
+ * $(D_PSYMBOL foldr) accumulates from right to left.
+ *
+ * Params:
+ *  F = Callable accepting the accumulator and a range element.
+ */
+template foldr(F...)
+if (F.length == 1)
+{
+    /**
+     * Params:
+     *  R     = Bidirectional range type.
+     *  T     = Type of the accumulated value.
+     *  range = Bidirectional range.
+     *  init  = Initial value.
+     *
+     * Returns: Accumulated value.
+     */
+    auto foldr(R, T)(scope R range, auto ref T init)
+    if (isBidirectionalRange!R)
+    {
+        if (range.empty)
+        {
+            return init;
+        }
+        else
+        {
+            auto acc = F[0](init, getAndPopBack(range));
+            return foldr(range, acc);
+        }
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    int[3] range = [1, 2, 3];
+    int[3] output;
    const int[3] expected = [3, 2, 1];

-    auto actual = retro(given[]);
+    alias f = (acc, x) {
+        acc.front = x;
+        acc.popFront;
+        return acc;
+    };
+    const actual = foldr!f(range[], output[]);

-    assert(actual.length == expected.length);
-    assert(!actual.empty);
-    assert(equal(actual, expected[]));
-}
-
-// Elements are accessible in reverse order
-@nogc nothrow pure @safe unittest
-{
-    const int[3] given = [1, 2, 3];
-    auto actual = retro(given[]);
-
-    assert(actual.back == given[].front);
-    assert(actual[0] == 3);
-    assert(actual[2] == 1);
-
-    actual.popBack();
-    assert(actual.back == 2);
-    assert(actual[1] == 2);
-
-    // Check slicing.
-    auto slice = retro(given[])[1 .. $];
-    assert(slice.length == 2 && slice.front == 2 && slice.back == 1);
-}
-
-// Elements can be assigned
-@nogc nothrow pure @safe unittest
-{
-    int[4] given = [1, 2, 3, 4];
-    auto actual = retro(given[]);
-
-    actual.front = 5;
-    assert(given[].back == 5);
-
-    actual.back = 8;
-    assert(given[].front == 8);
-
-    actual[2] = 10;
-    assert(given[1] == 10);
+    assert(output[] == expected[]);
 }
--- a/source/tanya/algorithm/mutation.d
+++ b/source/tanya/algorithm/mutation.d
@ -5,7 +5,7 @@
 /**
 * Algorithms that modify its arguments.
 *
- * Copyright: Eugene Wissner 2017-2019.
+ * Copyright: Eugene Wissner 2017-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -14,284 +14,11 @@
 */
 module tanya.algorithm.mutation;

-import tanya.conv;
+static import tanya.memory.lifetime;
 static import tanya.memory.op;
 import tanya.meta.trait;
 import tanya.meta.transform;
 import tanya.range;
-version (unittest) import tanya.test.stub;
-
-private void deinitialize(bool zero, T)(ref T value)
-{
-    static if (is(T == U[S], U, size_t S))
-    {
-        foreach (ref e; value)
-        {
-            deinitialize!zero(e);
-        }
-    }
-    else
-    {
-        static if (isNested!T)
-        {
-            // Don't override the context pointer.
-            enum size_t size = T.sizeof - (void*).sizeof;
-        }
-        else
-        {
-            enum size_t size = T.sizeof;
-        }
-        static if (zero)
-        {
-            tanya.memory.op.fill!0((cast(void*) &value)[0 .. size]);
-        }
-        else
-        {
-            tanya.memory.op.copy(typeid(T).initializer()[0 .. size],
-                                 (&value)[0 .. 1]);
-        }
-    }
-}
-
-/**
- * Moves $(D_PARAM source) into $(D_PARAM target) assuming that
- * $(D_PARAM target) isn't initialized.
- *
- * Moving the $(D_PARAM source) copies it into the $(D_PARAM target) and places
- * the $(D_PARAM source) into a valid but unspecified state, which means that
- * after moving $(D_PARAM source) can be destroyed or assigned a new value, but
- * accessing it yields an unspecified value. No postblits or destructors are
- * called. If the $(D_PARAM target) should be destroyed before, use
- * $(D_PSYMBOL move).
- *
- * $(D_PARAM source) and $(D_PARAM target) must be different objects.
- *
- * Params:
- *  T      = Object type.
- *  source = Source object.
- *  target = Target object.
- *
- * See_Also: $(D_PSYMBOL move),
- *           $(D_PSYMBOL hasElaborateCopyConstructor),
- *           $(D_PSYMBOL hasElaborateDestructor).
- *
- * Precondition: `&source !is &target`.
- */
-void moveEmplace(T)(ref T source, ref T target) @system
-in
-{
-    assert(&source !is &target, "Source and target must be different");
-}
-do
-{
-    static if (is(T == struct) || isStaticArray!T)
-    {
-        tanya.memory.op.copy((&source)[0 .. 1], (&target)[0 .. 1]);
-
-        static if (hasElaborateCopyConstructor!T || hasElaborateDestructor!T)
-        {
-            static if (__VERSION__ >= 2083) // __traits(isZeroInit) available.
-            {
-                deinitialize!(__traits(isZeroInit, T))(source);
-            }
-            else
-            {
-                if (typeid(T).initializer().ptr is null)
-                {
-                    deinitialize!true(source);
-                }
-                else
-                {
-                    deinitialize!false(source);
-                }
-            }
-        }
-    }
-    else
-    {
-        target = source;
-    }
-}
-
-///
-@nogc nothrow pure @system unittest
-{
-    static struct S
-    {
-        int member = 5;
-
-        this(this) @nogc nothrow pure @safe
-        {
-            assert(false);
-        }
-    }
-    S source, target = void;
-    moveEmplace(source, target);
-    assert(target.member == 5);
-
-    int x1 = 5, x2;
-    moveEmplace(x1, x2);
-    assert(x2 == 5);
-}
-
-// Is pure.
-@nogc nothrow pure @system unittest
-{
-    struct S
-    {
-        this(this)
-        {
-        }
-    }
-    S source, target = void;
-    static assert(is(typeof({ moveEmplace(source, target); })));
-}
-
-// Moves nested.
-@nogc nothrow pure @system unittest
-{
-    struct Nested
-    {
-        void method() @nogc nothrow pure @safe
-        {
-        }
-    }
-    Nested source, target = void;
-    moveEmplace(source, target);
-    assert(source == target);
-}
-
-// Emplaces static arrays.
-@nogc nothrow pure @system unittest
-{
-    static struct S
-    {
-        size_t member;
-        this(size_t i) @nogc nothrow pure @safe
-        {
-            this.member = i;
-        }
-        ~this() @nogc nothrow pure @safe
-        {
-        }
-    }
-    S[2] source = [ S(5), S(5) ], target = void;
-    moveEmplace(source, target);
-    assert(source[0].member == 0);
-    assert(target[0].member == 5);
-    assert(source[1].member == 0);
-    assert(target[1].member == 5);
-}
-
-/**
- * Moves $(D_PARAM source) into $(D_PARAM target) assuming that
- * $(D_PARAM target) isn't initialized.
- *
- * Moving the $(D_PARAM source) copies it into the $(D_PARAM target) and places
- * the $(D_PARAM source) into a valid but unspecified state, which means that
- * after moving $(D_PARAM source) can be destroyed or assigned a new value, but
- * accessing it yields an unspecified value. $(D_PARAM target) is destroyed before
- * the new value is assigned. If $(D_PARAM target) isn't initialized and
- * therefore shouldn't be destroyed, $(D_PSYMBOL moveEmplace) can be used.
- *
- * If $(D_PARAM target) isn't specified, $(D_PSYMBOL move) returns the source
- * as rvalue without calling its copy constructor or destructor.
- *
- * $(D_PARAM source) and $(D_PARAM target) are the same object,
- * $(D_PSYMBOL move) does nothing.
- *
- * Params:
- *  T      = Object type.
- *  source = Source object.
- *  target = Target object.
- *
- * See_Also: $(D_PSYMBOL moveEmplace).
- */
-void move(T)(ref T source, ref T target)
-{
-    if ((() @trusted => &source is &target)())
-    {
-        return;
-    }
-    static if (hasElaborateDestructor!T)
-    {
-        target.__xdtor();
-    }
-    (() @trusted => moveEmplace(source, target))();
-}
-
-/// ditto
-T move(T)(ref T source) @trusted
-{
-    static if (hasElaborateCopyConstructor!T || hasElaborateDestructor!T)
-    {
-        T target = void;
-        moveEmplace(source, target);
-        return target;
-    }
-    else
-    {
-        return source;
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static struct S
-    {
-        int member = 5;
-
-        this(this) @nogc nothrow pure @safe
-        {
-            assert(false);
-        }
-    }
-    S source, target = void;
-    move(source, target);
-    assert(target.member == 5);
-    assert(move(target).member == 5);
-
-    int x1 = 5, x2;
-    move(x1, x2);
-    assert(x2 == 5);
-    assert(move(x2) == 5);
-}
-
-// Moves if source is target.
-@nogc nothrow pure @safe unittest
-{
-    int x = 5;
-    move(x, x);
-    assert(x == 5);
-}
-
-/**
- * Exchanges the values of $(D_PARAM a) and $(D_PARAM b).
- *
- * $(D_PSYMBOL swap) moves the contents of $(D_PARAM a) and $(D_PARAM b)
- * without calling its postblits or destructors.
- *
- * Params:
- *  a = The first object.
- *  b = The second object.
- */
-void swap(T)(ref T a, ref T b) @trusted
-{
-    T tmp = void;
-    moveEmplace(a, tmp);
-    moveEmplace(b, a);
-    moveEmplace(tmp, b);
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    int a = 3, b = 5;
-    swap(a, b);
-    assert(a == 5);
-    assert(b == 3);
-}

 /**
 * Copies the $(D_PARAM source) range into the $(D_PARAM target) range.
@ -309,7 +36,7 @@ void swap(T)(ref T a, ref T b) @trusted
 *               $(D_PARAM source) elements.
 */
 Target copy(Source, Target)(Source source, Target target)
-if (isInputRange!Source && isOutputRange!(Target, Source))
+if (isInputRange!Source && isOutputRange!(Target, ElementType!Source))
 in
 {
    static if (hasLength!Source && hasLength!Target)
@ -350,7 +77,7 @@ do
 ///
@nogc nothrow pure @safe unittest
 {
-    import tanya.algorithm.comparison : equal;
+    import std.algorithm.comparison : equal;

    const int[2] source = [1, 2];
    int[2] target = [3, 4];
@ -359,52 +86,6 @@ do
    assert(equal(source[], target[]));
 }

-// Returns advanced target
-@nogc nothrow pure @safe unittest
-{
-    int[5] input = [1, 2, 3, 4, 5];
-    assert(copy(input[3 .. 5], input[]).front == 3);
-}
-
-// Copies overlapping arrays
-@nogc nothrow pure @safe unittest
-{
-    import tanya.algorithm.comparison : equal;
-
-    int[6] actual = [1, 2, 3, 4, 5, 6];
-    const int[6] expected = [1, 2, 1, 2, 3, 4];
-
-    copy(actual[0 .. 4], actual[2 .. 6]);
-    assert(equal(actual[], expected[]));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(typeof(copy((ubyte[]).init, (ushort[]).init))));
-    static assert(!is(typeof(copy((ushort[]).init, (ubyte[]).init))));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    static struct OutPutRange
-    {
-        int value;
-        void put(int value) @nogc nothrow pure @safe
-        in
-        {
-            assert(this.value == 0);
-        }
-        do
-        {
-            this.value = value;
-        }
-    }
-    int[1] source = [5];
-    OutPutRange target;
-
-    assert(copy(source[], target).value == 5);
-}
-
 /**
 * Fills $(D_PARAM range) with $(D_PARAM value).
 *
@ -433,7 +114,7 @@ if (isInputRange!Range && isAssignable!(ElementType!Range, Value))
 ///
@nogc nothrow pure @safe unittest
 {
-    import tanya.algorithm.comparison : equal;
+    import std.algorithm.comparison : equal;

    int[6] actual;
    const int[6] expected = [1, 1, 1, 1, 1, 1];
@ -442,42 +123,6 @@ if (isInputRange!Range && isAssignable!(ElementType!Range, Value))
    assert(equal(actual[], expected[]));
 }

-// [] is called where possible
-@nogc nothrow pure @system unittest
-{
-    static struct Slice
-    {
-        bool* slicingCalled;
-
-        int front() @nogc nothrow pure @safe
-        {
-            return 0;
-        }
-
-        void front(int) @nogc nothrow pure @safe
-        {
-        }
-
-        void popFront() @nogc nothrow pure @safe
-        {
-        }
-
-        bool empty() @nogc nothrow pure @safe
-        {
-            return true;
-        }
-
-        void opIndexAssign(int) @nogc nothrow pure @safe
-        {
-            *this.slicingCalled = true;
-        }
-    }
-    bool slicingCalled;
-    auto range = Slice(&slicingCalled);
-    fill(range, 0);
-    assert(slicingCalled);
-}
-
 /**
 * Fills $(D_PARAM range) with $(D_PARAM value) assuming the elements of the
 * $(D_PARAM range) aren't initialized.
@ -497,7 +142,7 @@ if (isInputRange!Range && hasLvalueElements!Range
        for (; !range.empty; range.popFront())
        {
            ElementType!Range* p = &range.front;
-            emplace!(ElementType!Range)(cast(void[]) (p[0 .. 1]), value);
+            tanya.memory.lifetime.emplace!(ElementType!Range)(cast(void[]) (p[0 .. 1]), value);
        }
    }
    else
@ -509,7 +154,7 @@ if (isInputRange!Range && hasLvalueElements!Range
 ///
@nogc nothrow pure @safe unittest
 {
-    import tanya.algorithm.comparison : equal;
+    import std.algorithm.comparison : equal;

    int[6] actual = void;
    const int[6] expected = [1, 1, 1, 1, 1, 1];
@ -532,9 +177,7 @@ if (isInputRange!Range && hasLvalueElements!Range)
    import tanya.memory.op : copy, fill;
    alias T = ElementType!Range;

-    static if (__VERSION__ >= 2083
-            && isDynamicArray!Range
-            && __traits(isZeroInit, T))
+    static if (isDynamicArray!Range && __traits(isZeroInit, T))
    {
        fill!0(range);
    }
@ -551,7 +194,7 @@ if (isInputRange!Range && hasLvalueElements!Range)
 ///
@nogc nothrow pure @safe unittest
 {
-    import tanya.algorithm.comparison : equal;
+    import std.algorithm.comparison : equal;

    int[2] actual = void;
    const int[2] expected = [0, 0];
@ -560,12 +203,6 @@ if (isInputRange!Range && hasLvalueElements!Range)
    assert(equal(actual[], expected[]));
 }

-@nogc nothrow pure @safe unittest
-{
-    NonCopyable[] nonCopyable;
-    initializeAll(nonCopyable);
-}
-
 /**
 * Destroys all elements in the $(D_PARAM range).
 *
@ -580,13 +217,7 @@ if (isInputRange!Range && hasLvalueElements!Range)
 void destroyAll(Range)(Range range)
 if (isInputRange!Range && hasLvalueElements!Range)
 {
-    static if (hasElaborateDestructor!(ElementType!Range))
-    {
-        foreach (ref e; range)
-        {
-            destroy(e);
-        }
-    }
+    tanya.memory.lifetime.destroyAllImpl!(Range, ElementType!Range)(range);
 }

 ///
@ -611,89 +242,3 @@ if (isInputRange!Range && hasLvalueElements!Range)

    assert(counter == 2);
 }
-
-/**
- * Rotates the elements of a union of two ranges.
- *
- * Performs a left rotation on the given ranges, as if it would be a signle
- * range, so that [`front.front`, `back.front`$(RPAREN) is a valid range, that
- * is $(D_PARAM back) would continue $(D_PARAM front).
- *
- * The elements are moved so, that the first element of $(D_PARAM back) becomes
- * the first element of $(D_PARAM front) without changing the relative order of
- * their elements.
- *
- * Params:
- *  Range = Range type.
- *  front = Left half.
- *  back  = Right half.
- */
-void rotate(Range)(Range front, Range back)
-if (isForwardRange!Range && hasSwappableElements!Range)
-{
-    auto next = back.save();
-
-    while (!front.empty && !next.empty && !sameHead(front, next))
-    {
-        swap(front.front, next.front);
-        front.popFront();
-        next.popFront();
-
-        if (next.empty)
-        {
-            next = back.save();
-        }
-        else if (front.empty)
-        {
-            front = back.save();
-            back = next.save();
-        }
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    import tanya.algorithm.comparison : equal;
-
-    const int[7] expected = [1, 2, 3, 4, 5, 6, 7];
-    int[7] actual = [5, 6, 3, 4, 1, 2, 7];
-
-    rotate(actual[0 .. 2], actual[4 .. 6]);
-    assert(equal(actual[], expected[]));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    import tanya.algorithm.comparison : equal;
-
-    const int[5] expected = [1, 2, 3, 4, 5];
-    int[5] actual = [4, 5, 1, 2, 3];
-
-    rotate(actual[0 .. 2], actual[2 .. $]);
-    assert(equal(actual[], expected[]));
-}
-
-// Doesn't cause an infinite loop if back is shorter than the front
-@nogc nothrow pure @safe unittest
-{
-    import tanya.algorithm.comparison : equal;
-
-    const int[5] expected = [1, 2, 3, 4, 5];
-    int[5] actual = [3, 4, 5, 1, 2];
-
-    rotate(actual[0 .. 3], actual[3 .. $]);
-    assert(equal(actual[], expected[]));
-}
-
-// Doesn't call .front on an empty front
-@nogc nothrow pure @safe unittest
-{
-    import tanya.algorithm.comparison : equal;
-
-    const int[2] expected = [2, 8];
-    int[2] actual = expected;
-
-    rotate(actual[0 .. 0], actual[]);
-    assert(equal(actual[], expected[]));
-}
--- a/source/tanya/algorithm/package.d
+++ b/source/tanya/algorithm/package.d
@ -5,7 +5,7 @@
 /**
 * Collection of generic algorithms.
 *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2021.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -14,6 +14,5 @@
 */
 module tanya.algorithm;

-public import tanya.algorithm.comparison;
 public import tanya.algorithm.iteration;
 public import tanya.algorithm.mutation;
--- a/source/tanya/algorithm/searching.d
+++ b/source/tanya/algorithm/searching.d
@ -1,78 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Searching algorithms.
- *
- * Copyright: Eugene Wissner 2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/algorithm/searching.d,
- *                 tanya/algorithm/searching.d)
- */
-module tanya.algorithm.searching;
-
-import tanya.range;
-
-/**
- * Counts the elements in an input range.
- *
- * If $(D_PARAM R) has length, $(D_PSYMBOL count) returns it, otherwise it
- * iterates over the range and counts the elements.
- *
- * Params:
- *  R     = Input range type.
- *  range = Input range.
- *
- * Returns: $(D_PARAM range) length.
- */
-size_t count(R)(R range)
-if (isInputRange!R)
-{
-    static if (hasLength!R)
-    {
-        return range.length;
-    }
-    else
-    {
-        size_t counter;
-        for (; !range.empty; range.popFront(), ++counter)
-        {
-        }
-        return counter;
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    int[3] array;
-    assert(count(array) == 3);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    static struct Range
-    {
-        private int counter = 3;
-
-        int front() const @nogc nothrow pure @safe
-        {
-            return this.counter;
-        }
-
-        void popFront() @nogc nothrow pure @safe
-        {
-            --this.counter;
-        }
-
-        bool empty() const @nogc nothrow pure @safe
-        {
-            return this.counter == 0;
-        }
-    }
-    Range range;
-    assert(count(range) == 3);
-}
--- a/source/tanya/async/event/epoll.d
+++ b/source/tanya/async/event/epoll.d
@ -1,187 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Event loop implementation for Linux.
- *
- * Copyright: Eugene Wissner 2016-2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/async/event/epoll.d,
- *                 tanya/async/event/epoll.d)
- */
-module tanya.async.event.epoll;
-
-version (D_Ddoc)
-{
-}
-else version (linux):
-
-import core.stdc.errno;
-public import core.sys.linux.epoll;
-import core.sys.posix.unistd;
-import core.time;
-import tanya.algorithm.comparison;
-import tanya.async.event.selector;
-import tanya.async.loop;
-import tanya.async.protocol;
-import tanya.async.transport;
-import tanya.async.watcher;
-import tanya.container.array;
-import tanya.memory;
-import tanya.network.socket;
-
-extern (C) nothrow @nogc
-{
-    int epoll_create1(int flags);
-    int epoll_ctl (int epfd, int op, int fd, epoll_event *event);
-    int epoll_wait (int epfd, epoll_event *events, int maxevents, int timeout);
-}
-
-final class EpollLoop : SelectorLoop
-{
-    protected int fd;
-    private Array!epoll_event events;
-
-    /**
-     * Initializes the loop.
-     */
-    this() @nogc
-    {
-        if ((fd = epoll_create1(EPOLL_CLOEXEC)) < 0)
-        {
-            throw defaultAllocator.make!BadLoopException("epoll initialization failed");
-        }
-        super();
-        events = Array!epoll_event(maxEvents);
-    }
-
-    /**
-     * Frees loop internals.
-     */
-    ~this() @nogc
-    {
-        close(fd);
-    }
-
-    /**
-     * Should be called if the backend configuration changes.
-     *
-     * Params:
-     *  watcher   = Watcher.
-     *  oldEvents = The events were already set.
-     *  events    = The events should be set.
-     *
-     * Returns: $(D_KEYWORD true) if the operation was successful.
-     */
-    protected override bool reify(SocketWatcher watcher,
-                                  EventMask oldEvents,
-                                  EventMask events) @nogc
-    {
-        int op = EPOLL_CTL_DEL;
-        epoll_event ev;
-
-        if (events == oldEvents)
-        {
-            return true;
-        }
-        if (events && oldEvents)
-        {
-            op = EPOLL_CTL_MOD;
-        }
-        else if (events && !oldEvents)
-        {
-            op = EPOLL_CTL_ADD;
-        }
-
-        ev.data.fd = watcher.socket.handle;
-        ev.events = (events & (Event.read | Event.accept) ? EPOLLIN | EPOLLPRI : 0)
-                  | (events & Event.write ? EPOLLOUT : 0)
-                  | EPOLLET;
-
-        return epoll_ctl(fd, op, watcher.socket.handle, &ev) == 0;
-    }
-
-    /**
-     * Does the actual polling.
-     */
-    protected override void poll() @nogc
-    {
-        // Don't block
-        immutable timeout = cast(immutable int) blockTime.total!"msecs";
-        auto eventCount = epoll_wait(fd, events.get().ptr, maxEvents, timeout);
-
-        if (eventCount < 0)
-        {
-            if (errno != EINTR)
-            {
-                throw defaultAllocator.make!BadLoopException();
-            }
-            return;
-        }
-
-        for (auto i = 0; i < eventCount; ++i)
-        {
-            auto transport = cast(StreamTransport) connections[events[i].data.fd];
-
-            if (transport is null)
-            {
-                auto connection = cast(ConnectionWatcher) connections[events[i].data.fd];
-                assert(connection !is null);
-
-                acceptConnections(connection);
-            }
-            else if (events[i].events & EPOLLERR)
-            {
-                kill(transport);
-                continue;
-            }
-            else if (events[i].events & (EPOLLIN | EPOLLPRI | EPOLLHUP))
-            {
-                SocketException exception;
-                try
-                {
-                    ptrdiff_t received;
-                    do
-                    {
-                        received = transport.socket.receive(transport.output[]);
-                        transport.output += received;
-                    }
-                    while (received);
-                }
-                catch (SocketException e)
-                {
-                    exception = e;
-                }
-                if (transport.socket.disconnected)
-                {
-                    kill(transport, exception);
-                    continue;
-                }
-                else if (transport.output.length)
-                {
-                    pendings.insertBack(transport);
-                }
-            }
-            if (events[i].events & EPOLLOUT)
-            {
-                transport.writeReady = true;
-                if (transport.input.length)
-                {
-                    feed(transport);
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns: The blocking time.
-     */
-    override protected @property inout(Duration) blockTime()
-    inout @safe pure nothrow
-    {
-        return min(super.blockTime, 1.dur!"seconds");
-    }
-}
--- a/source/tanya/async/event/iocp.d
+++ b/source/tanya/async/event/iocp.d
@ -1,390 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Event loop implementation for Windows.
- *
- * Copyright: Eugene Wissner 2016-2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/async/event/iocp.d,
- *                 tanya/async/event/iocp.d)
- */
-module tanya.async.event.iocp;
-
-version (D_Ddoc)
-{
-}
-else version (Windows):
-
-import core.sys.windows.mswsock;
-import core.sys.windows.winsock2;
-import tanya.async.loop;
-import tanya.async.protocol;
-import tanya.async.transport;
-import tanya.async.watcher;
-import tanya.container.buffer;
-import tanya.memory;
-import tanya.network.socket;
-import tanya.sys.windows.winbase;
-
-/**
- * Transport for stream sockets.
- */
-final class StreamTransport : SocketWatcher, DuplexTransport, SocketTransport
-{
-    private SocketException exception;
-
-    private ReadBuffer!ubyte output;
-
-    private WriteBuffer!ubyte input;
-
-    private Protocol protocol_;
-
-    private bool closing;
-
-    /**
-     * Creates new completion port transport.
-     *
-     * Params:
-     *  socket = Socket.
-     *
-     * Precondition: $(D_INLINECODE socket !is null)
-     */
-    this(OverlappedConnectedSocket socket) @nogc
-    {
-        super(socket);
-        output = ReadBuffer!ubyte(8192, 1024);
-        input = WriteBuffer!ubyte(8192);
-        active = true;
-    }
-
-    /**
-     * Returns: Socket.
-     *
-     * Postcondition: $(D_INLINECODE socket !is null)
-     */
-    override @property OverlappedConnectedSocket socket() pure nothrow @safe @nogc
-    out (socket)
-    {
-        assert(socket !is null);
-    }
-    do
-    {
-        return cast(OverlappedConnectedSocket) socket_;
-    }
-
-    /**
-     * Returns $(D_PARAM true) if the transport is closing or closed.
-     */
-    bool isClosing() const pure nothrow @safe @nogc
-    {
-        return closing;
-    }
-
-    /**
-     * Close the transport.
-     *
-     * Buffered data will be flushed.  No more data will be received.
-     */
-    void close() pure nothrow @safe @nogc
-    {
-        closing = true;
-    }
-
-    /**
-     * Write some data to the transport.
-     *
-     * Params:
-     *  data = Data to send.
-     */
-    void write(ubyte[] data) @nogc
-    {
-        input ~= data;
-    }
-
-    /**
-     * Returns: Application protocol.
-     */
-    @property Protocol protocol() pure nothrow @safe @nogc
-    {
-        return protocol_;
-    }
-
-    /**
-     * Switches the protocol.
-     *
-     * The protocol is deallocated by the event loop.
-     *
-     * Params:
-     *  protocol = Application protocol.
-     *
-     * Precondition: $(D_INLINECODE protocol !is null)
-     */
-    @property void protocol(Protocol protocol) pure nothrow @safe @nogc
-    in
-    {
-        assert(protocol !is null);
-    }
-    do
-    {
-        protocol_ = protocol;
-    }
-
-    /**
-     * Invokes the watcher callback.
-     */
-    override void invoke() @nogc
-    {
-        if (output.length)
-        {
-            immutable empty = input.length == 0;
-            protocol.received(output[0 .. $]);
-            output.clear();
-            if (empty)
-            {
-                SocketState overlapped;
-                try
-                {
-                    overlapped = defaultAllocator.make!SocketState;
-                    socket.beginSend(input[], overlapped);
-                }
-                catch (SocketException e)
-                {
-                    defaultAllocator.dispose(overlapped);
-                    defaultAllocator.dispose(e);
-                }
-            }
-        }
-        else
-        {
-            protocol.disconnected(exception);
-            defaultAllocator.dispose(protocol_);
-            defaultAllocator.dispose(exception);
-            active = false;
-        }
-    }
-}
-
-final class IOCPLoop : Loop
-{
-    protected HANDLE completionPort;
-
-    protected OVERLAPPED overlap;
-
-    /**
-     * Initializes the loop.
-     */
-    this() @nogc
-    {
-        super();
-
-        completionPort = CreateIoCompletionPort(INVALID_HANDLE_VALUE, null, 0, 0);
-        if (!completionPort)
-        {
-            throw make!BadLoopException(defaultAllocator,
-                                        "Creating completion port failed");
-        }
-    }
-
-    /**
-     * Should be called if the backend configuration changes.
-     *
-     * Params:
-     *  watcher   = Watcher.
-     *  oldEvents = The events were already set.
-     *  events    = The events should be set.
-     *
-     * Returns: $(D_KEYWORD true) if the operation was successful.
-     */
-    override protected bool reify(SocketWatcher watcher,
-                                  EventMask oldEvents,
-                                  EventMask events) @nogc
-    {
-        SocketState overlapped;
-        if (!(oldEvents & Event.accept) && (events & Event.accept))
-        {
-            auto socket = cast(OverlappedStreamSocket) watcher.socket;
-            assert(socket !is null);
-
-            if (CreateIoCompletionPort(cast(HANDLE) socket.handle,
-                                       completionPort,
-                                       cast(size_t) (cast(void*) watcher),
-                                       0) !is completionPort)
-            {
-                return false;
-            }
-
-            try
-            {
-                overlapped = defaultAllocator.make!SocketState;
-                socket.beginAccept(overlapped);
-            }
-            catch (SocketException e)
-            {
-                defaultAllocator.dispose(overlapped);
-                defaultAllocator.dispose(e);
-                return false;
-            }
-        }
-        if ((!(oldEvents & Event.read) && (events & Event.read))
-            || (!(oldEvents & Event.write) && (events & Event.write)))
-        {
-            auto transport = cast(StreamTransport) watcher;
-            assert(transport !is null);
-
-            if (CreateIoCompletionPort(cast(HANDLE) transport.socket.handle,
-                                       completionPort,
-                                       cast(size_t) (cast(void*) watcher),
-                                       0) !is completionPort)
-            {
-                return false;
-            }
-
-            // Begin to read
-            if (!(oldEvents & Event.read) && (events & Event.read))
-            {
-                try
-                {
-                    overlapped = defaultAllocator.make!SocketState;
-                    transport.socket.beginReceive(transport.output[], overlapped);
-                }
-                catch (SocketException e)
-                {
-                    defaultAllocator.dispose(overlapped);
-                    defaultAllocator.dispose(e);
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    private void kill(StreamTransport transport,
-                      SocketException exception = null) @nogc
-    in
-    {
-        assert(transport !is null);
-    }
-    do
-    {
-        transport.socket.shutdown();
-        defaultAllocator.dispose(transport.socket);
-        transport.exception = exception;
-        pendings.insertBack(transport);
-    }
-
-    /**
-     * Does the actual polling.
-     */
-    override protected void poll() @nogc
-    {
-        DWORD lpNumberOfBytes;
-        size_t key;
-        OVERLAPPED* overlap;
-        immutable timeout = cast(immutable int) blockTime.total!"msecs";
-
-        auto result = GetQueuedCompletionStatus(completionPort,
-                                                &lpNumberOfBytes,
-                                                &key,
-                                                &overlap,
-                                                timeout);
-        if (result == FALSE && overlap is null)
-        {
-            return; // Timeout
-        }
-
-        enum size_t offset = size_t.sizeof * 2;
-        auto overlapped = cast(SocketState) ((cast(void*) overlap) - offset);
-        assert(overlapped !is null);
-        scope (failure)
-        {
-            defaultAllocator.dispose(overlapped);
-        }
-
-        switch (overlapped.event)
-        {
-            case OverlappedSocketEvent.accept:
-                auto connection = cast(ConnectionWatcher) (cast(void*) key);
-                assert(connection !is null);
-
-                auto listener = cast(OverlappedStreamSocket) connection.socket;
-                assert(listener !is null);
-
-                auto socket = listener.endAccept(overlapped);
-                auto transport = defaultAllocator.make!StreamTransport(socket);
-
-                connection.incoming.insertBack(transport);
-
-                reify(transport,
-                      EventMask(Event.none),
-                      EventMask(Event.read | Event.write));
-
-                pendings.insertBack(connection);
-                listener.beginAccept(overlapped);
-                break;
-            case OverlappedSocketEvent.read:
-                auto transport = cast(StreamTransport) (cast(void*) key);
-                assert(transport !is null);
-
-                if (!transport.active)
-                {
-                    defaultAllocator.dispose(transport);
-                    defaultAllocator.dispose(overlapped);
-                    return;
-                }
-
-                int received;
-                SocketException exception;
-                try
-                {
-                    received = transport.socket.endReceive(overlapped);
-                }
-                catch (SocketException e)
-                {
-                    exception = e;
-                }
-                if (transport.socket.disconnected)
-                {
-                    // We want to get one last notification to destroy the watcher.
-                    transport.socket.beginReceive(transport.output[], overlapped);
-                    kill(transport, exception);
-                }
-                else if (received > 0)
-                {
-                    immutable full = transport.output.free == received;
-
-                    transport.output += received;
-                    // Receive was interrupted because the buffer is full. We have to continue.
-                    if (full)
-                    {
-                        transport.socket.beginReceive(transport.output[], overlapped);
-                    }
-                    pendings.insertBack(transport);
-                }
-                break;
-            case OverlappedSocketEvent.write:
-                auto transport = cast(StreamTransport) (cast(void*) key);
-                assert(transport !is null);
-
-                transport.input += transport.socket.endSend(overlapped);
-                if (transport.input.length > 0)
-                {
-                    transport.socket.beginSend(transport.input[], overlapped);
-                }
-                else
-                {
-                    transport.socket.beginReceive(transport.output[], overlapped);
-                    if (transport.isClosing())
-                    {
-                        kill(transport);
-                    }
-                }
-                break;
-            default:
-                assert(false, "Unknown event");
-        }
-    }
-}
--- a/source/tanya/async/event/kqueue.d
+++ b/source/tanya/async/event/kqueue.d
@ -1,331 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * Event loop implementation for *BSD.
- *
- * Copyright: Eugene Wissner 2016-2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/async/event/kqueue.d,
- *                 tanya/async/event/kqueue.d)
- */
-module tanya.async.event.kqueue;
-
-version (D_Ddoc)
-{
-}
-else version (OSX)
-{
-    version = MacBSD;
-}
-else version (iOS)
-{
-    version = MacBSD;
-}
-else version (TVOS)
-{
-    version = MacBSD;
-}
-else version (WatchOS)
-{
-    version = MacBSD;
-}
-else version (FreeBSD)
-{
-    version = MacBSD;
-}
-else version (OpenBSD)
-{
-    version = MacBSD;
-}
-else version (DragonFlyBSD)
-{
-    version = MacBSD;
-}
-
-version (MacBSD):
-
-import core.stdc.errno;
-import core.sys.posix.time; // timespec
-import core.sys.posix.unistd;
-import core.time;
-import tanya.algorithm.comparison;
-import tanya.async.event.selector;
-import tanya.async.loop;
-import tanya.async.transport;
-import tanya.async.watcher;
-import tanya.container.array;
-import tanya.memory;
-import tanya.network.socket;
-
-void EV_SET(kevent_t* kevp, typeof(kevent_t.tupleof) args) pure nothrow @nogc
-{
-    *kevp = kevent_t(args);
-}
-
-enum : short
-{
-    EVFILT_READ     =  -1,
-    EVFILT_WRITE    =  -2,
-    EVFILT_AIO      =  -3, /* attached to aio requests */
-    EVFILT_VNODE    =  -4, /* attached to vnodes */
-    EVFILT_PROC     =  -5, /* attached to struct proc */
-    EVFILT_SIGNAL   =  -6, /* attached to struct proc */
-    EVFILT_TIMER    =  -7, /* timers */
-    EVFILT_MACHPORT =  -8, /* Mach portsets */
-    EVFILT_FS       =  -9, /* filesystem events */
-    EVFILT_USER     = -10, /* User events */
-    EVFILT_VM       = -12, /* virtual memory events */
-    EVFILT_SYSCOUNT =  11
-}
-
-struct kevent_t
-{
-    uintptr_t ident; // Identifier for this event
-    short filter; // Filter for event
-    ushort flags;
-    uint fflags;
-    intptr_t data;
-    void* udata; // Opaque user data identifier
-}
-
-enum
-{
-    /* actions */
-    EV_ADD      = 0x0001, /* add event to kq (implies enable) */
-    EV_DELETE   = 0x0002, /* delete event from kq */
-    EV_ENABLE   = 0x0004, /* enable event */
-    EV_DISABLE  = 0x0008, /* disable event (not reported) */
-
-    /* flags */
-    EV_ONESHOT  = 0x0010, /* only report one occurrence */
-    EV_CLEAR    = 0x0020, /* clear event state after reporting */
-    EV_RECEIPT  = 0x0040, /* force EV_ERROR on success, data=0 */
-    EV_DISPATCH = 0x0080, /* disable event after reporting */
-
-    EV_SYSFLAGS = 0xF000, /* reserved by system */
-    EV_FLAG1    = 0x2000, /* filter-specific flag */
-
-    /* returned values */
-    EV_EOF      = 0x8000, /* EOF detected */
-    EV_ERROR    = 0x4000, /* error, data contains errno */
-}
-
-extern(C) int kqueue() nothrow @nogc;
-extern(C) int kevent(int kq, const kevent_t *changelist, int nchanges,
-                     kevent_t *eventlist, int nevents, const timespec *timeout)
-                     nothrow @nogc;
-
-final class KqueueLoop : SelectorLoop
-{
-    protected int fd;
-    private Array!kevent_t events;
-    private Array!kevent_t changes;
-    private size_t changeCount;
-
-    /**
-     * Returns: Maximal event count can be got at a time
-     *          (should be supported by the backend).
-     */
-    override protected @property uint maxEvents()
-    const pure nothrow @safe @nogc
-    {
-        return cast(uint) events.length;
-    }
-
-    this() @nogc
-    {
-        super();
-
-        if ((fd = kqueue()) == -1)
-        {
-            throw make!BadLoopException(defaultAllocator,
-                                        "kqueue initialization failed");
-        }
-        events = Array!kevent_t(64);
-        changes = Array!kevent_t(64);
-    }
-
-    /**
-     * Frees loop internals.
-     */
-    ~this() @nogc
-    {
-        close(fd);
-    }
-
-    private void set(SocketType socket, short filter, ushort flags) @nogc
-    {
-        if (changes.length <= changeCount)
-        {
-            changes.length = changeCount + maxEvents;
-        }
-        EV_SET(&changes[changeCount],
-               cast(ulong) socket,
-               filter,
-               flags,
-               0U,
-               0,
-               null);
-        ++changeCount;
-    }
-
-    /**
-     * Should be called if the backend configuration changes.
-     *
-     * Params:
-     * 	watcher   = Watcher.
-     * 	oldEvents = The events were already set.
-     * 	events    = The events should be set.
-     *
-     * Returns: $(D_KEYWORD true) if the operation was successful.
-     */
-    override protected bool reify(SocketWatcher watcher,
-                                  EventMask oldEvents,
-                                  EventMask events) @nogc
-    {
-        if (events != oldEvents)
-        {
-            if (oldEvents & Event.read || oldEvents & Event.accept)
-            {
-                set(watcher.socket.handle, EVFILT_READ, EV_DELETE);
-            }
-            if (oldEvents & Event.write)
-            {
-                set(watcher.socket.handle, EVFILT_WRITE, EV_DELETE);
-            }
-        }
-        if (events & (Event.read | events & Event.accept))
-        {
-            set(watcher.socket.handle, EVFILT_READ, EV_ADD | EV_ENABLE);
-        }
-        if (events & Event.write)
-        {
-            set(watcher.socket.handle, EVFILT_WRITE, EV_ADD | EV_DISPATCH);
-        }
-        return true;
-    }
-
-    /**
-     * Does the actual polling.
-     */
-    protected override void poll() @nogc
-    {
-        timespec ts;
-        blockTime.split!("seconds", "nsecs")(ts.tv_sec, ts.tv_nsec);
-
-        if (changeCount > maxEvents)
-        {
-            events.length = changes.length;
-        }
-
-        auto eventCount = kevent(fd,
-                                 changes.get().ptr,
-                                 cast(int) changeCount,
-                                 events.get().ptr,
-                                 maxEvents,
-                                 &ts);
-        changeCount = 0;
-
-        if (eventCount < 0)
-        {
-            if (errno != EINTR)
-            {
-                throw defaultAllocator.make!BadLoopException();
-            }
-            return;
-        }
-
-        for (int i; i < eventCount; ++i)
-        {
-            assert(connections.length > events[i].ident);
-
-            auto transport = cast(StreamTransport) connections[events[i].ident];
-            // If it is a ConnectionWatcher. Accept connections.
-            if (transport is null)
-            {
-                auto connection = cast(ConnectionWatcher) connections[events[i].ident];
-                assert(connection !is null);
-
-                acceptConnections(connection);
-            }
-            else if (events[i].flags & EV_ERROR)
-            {
-                kill(transport);
-            }
-            else if (events[i].filter == EVFILT_READ)
-            {
-                SocketException exception;
-                try
-                {
-                    ptrdiff_t received;
-                    do
-                    {
-                        received = transport.socket.receive(transport.output[]);
-                        transport.output += received;
-                    }
-                    while (received);
-                }
-                catch (SocketException e)
-                {
-                    exception = e;
-                }
-                if (transport.socket.disconnected)
-                {
-                    kill(transport, exception);
-                }
-                else if (transport.output.length)
-                {
-                    pendings.insertBack(transport);
-                }
-            }
-            else if (events[i].filter == EVFILT_WRITE)
-            {
-                transport.writeReady = true;
-                if (transport.input.length)
-                {
-                    feed(transport);
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns: The blocking time.
-     */
-    override protected @property inout(Duration) blockTime()
-    inout @nogc @safe pure nothrow
-    {
-        return min(super.blockTime, 1.dur!"seconds");
-    }
-
-    /**
-     * If the transport couldn't send the data, the further sending should
-     * be handled by the event loop.
-     *
-     * Params:
-     * 	transport = Transport.
-     * 	exception = Exception thrown on sending.
-     *
-     * Returns: $(D_KEYWORD true) if the operation could be successfully
-     *          completed or scheduled, $(D_KEYWORD false) otherwise (the
-     *          transport will be destroyed then).
-     */
-    protected override bool feed(StreamTransport transport,
-                                 SocketException exception = null) @nogc
-    {
-        if (!super.feed(transport, exception))
-        {
-            return false;
-        }
-        if (!transport.writeReady)
-        {
-            set(transport.socket.handle, EVFILT_WRITE, EV_DISPATCH);
-            return true;
-        }
-        return false;
-    }
-}
--- a/source/tanya/async/event/selector.d
+++ b/source/tanya/async/event/selector.d
@ -1,407 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * This module contains base implementations for reactor event loops.
- *
- * Copyright: Eugene Wissner 2016-2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/async/event/selector.d,
- *                 tanya/async/event/selector.d)
- */
-module tanya.async.event.selector;
-
-version (D_Ddoc)
-{
-}
-else version (Posix):
-
-import tanya.async.loop;
-import tanya.async.protocol;
-import tanya.async.transport;
-import tanya.async.watcher;
-import tanya.container.array;
-import tanya.container.buffer;
-import tanya.memory;
-import tanya.network.socket;
-
-/**
- * Transport for stream sockets.
- */
-package class StreamTransport : SocketWatcher, DuplexTransport, SocketTransport
-{
-    private SelectorLoop loop;
-
-    private SocketException exception;
-
-    package ReadBuffer!ubyte output;
-
-    package WriteBuffer!ubyte input;
-
-    private Protocol protocol_;
-
-    private bool closing;
-
-    /// Received notification that the underlying socket is write-ready.
-    package bool writeReady;
-
-    /**
-     * Params:
-     *  loop   = Event loop.
-     *  socket = Socket.
-     *
-     * Precondition: $(D_INLINECODE loop !is null && socket !is null)
-     */
-    this(SelectorLoop loop, ConnectedSocket socket) @nogc
-    in 
-    {
-        assert(loop !is null);
-    }
-    do
-    {
-        super(socket);
-        this.loop = loop;
-        output = ReadBuffer!ubyte(8192, 1024);
-        input = WriteBuffer!ubyte(8192);
-        active = true;
-    }
-
-    /**
-     * Returns: Socket.
-     *
-     * Postcondition: $(D_INLINECODE socket !is null)
-     */
-    override @property ConnectedSocket socket() pure nothrow @safe @nogc
-    out (socket)
-    {
-        assert(socket !is null);
-    }
-    do
-    {
-        return cast(ConnectedSocket) socket_;
-    }
-
-    private @property void socket(ConnectedSocket socket)
-    pure nothrow @safe @nogc
-    in
-    {
-        assert(socket !is null);
-    }
-    do
-    {
-        socket_ = socket;
-    }
-
-    /**
-     * Returns: Application protocol.
-     */
-    @property Protocol protocol() pure nothrow @safe @nogc
-    {
-        return protocol_;
-    }
-
-    /**
-     * Switches the protocol.
-     *
-     * The protocol is deallocated by the event loop.
-     *
-     * Params:
-     *  protocol = Application protocol.
-     *
-     * Precondition: $(D_INLINECODE protocol !is null)
-     */
-    @property void protocol(Protocol protocol) pure nothrow @safe @nogc
-    in
-    {
-        assert(protocol !is null);
-    }
-    do
-    {
-        protocol_ = protocol;
-    }
-
-    /**
-     * Returns $(D_PARAM true) if the transport is closing or closed.
-     */
-    bool isClosing() const pure nothrow @safe @nogc
-    {
-        return closing;
-    }
-
-    /**
-     * Close the transport.
-     *
-     * Buffered data will be flushed.  No more data will be received.
-     */
-    void close() @nogc
-    {
-        closing = true;
-        loop.reify(this,
-                   EventMask(Event.read | Event.write),
-                   EventMask(Event.write));
-    }
-
-    /**
-     * Invokes the watcher callback.
-     */
-    override void invoke() @nogc
-    {
-        if (output.length)
-        {
-            protocol.received(output[0 .. $]);
-            output.clear();
-            if (isClosing() && input.length == 0)
-            {
-                loop.kill(this);
-            }
-        }
-        else
-        {
-            protocol.disconnected(exception);
-            defaultAllocator.dispose(protocol_);
-            defaultAllocator.dispose(exception);
-            active = false;
-        }
-    }
-
-    /**
-     * Write some data to the transport.
-     *
-     * Params:
-     *  data = Data to send.
-     */
-    void write(ubyte[] data) @nogc
-    {
-        if (!data.length)
-        {
-            return;
-        }
-        // Try to write if the socket is write ready.
-        if (writeReady)
-        {
-            ptrdiff_t sent;
-            SocketException exception;
-            try
-            {
-                sent = socket.send(data);
-                if (sent == 0)
-                {
-                    writeReady = false;
-                }
-            }
-            catch (SocketException e)
-            {
-                writeReady = false;
-                exception = e;
-            }
-            if (sent < data.length)
-            {
-                input ~= data[sent..$];
-                loop.feed(this, exception);
-            }
-        }
-        else
-        {
-            input ~= data;
-        }
-    }
-}
-
-abstract class SelectorLoop : Loop
-{
-    /// Pending connections.
-    protected Array!SocketWatcher connections;
-
-    this() @nogc
-    {
-        super();
-        this.connections = Array!SocketWatcher(maxEvents);
-    }
-
-    ~this() @nogc
-    {
-        foreach (ref connection; this.connections[])
-        {
-            // We want to free only the transports. ConnectionWatcher are
-            // created by the user and should be freed by himself.
-            if (cast(StreamTransport) connection !is null)
-            {
-                defaultAllocator.dispose(connection);
-            }
-        }
-    }
-
-    /**
-     * Should be called if the backend configuration changes.
-     *
-     * Params:
-     *  watcher   = Watcher.
-     *  oldEvents = The events were already set.
-     *  events    = The events should be set.
-     *
-     * Returns: $(D_KEYWORD true) if the operation was successful.
-     */
-    override abstract protected bool reify(SocketWatcher watcher,
-                                           EventMask oldEvents,
-                                           EventMask events) @nogc;
-
-    /**
-     * Kills the watcher and closes the connection.
-     *
-     * Params:
-     *  transport = Transport.
-     *  exception = Occurred exception.
-     */
-    protected void kill(StreamTransport transport,
-                        SocketException exception = null) @nogc
-    in
-    {
-        assert(transport !is null);
-    }
-    do
-    {
-        transport.socket.shutdown();
-        defaultAllocator.dispose(transport.socket);
-        transport.exception = exception;
-        pendings.insertBack(transport);
-    }
-
-    /**
-     * If the transport couldn't send the data, the further sending should
-     * be handled by the event loop.
-     *
-     * Params:
-     *  transport = Transport.
-     *  exception = Exception thrown on sending.
-     *
-     * Returns: $(D_KEYWORD true) if the operation could be successfully
-     *          completed or scheduled, $(D_KEYWORD false) otherwise (the
-     *          transport will be destroyed then).
-     */
-    protected bool feed(StreamTransport transport,
-                        SocketException exception = null) @nogc
-    in
-    {
-        assert(transport !is null);
-    }
-    do
-    {
-        while (transport.input.length && transport.writeReady)
-        {
-            try
-            {
-                ptrdiff_t sent = transport.socket.send(transport.input[]);
-                if (sent == 0)
-                {
-                    transport.writeReady = false;
-                }
-                else
-                {
-                    transport.input += sent;
-                }
-            }
-            catch (SocketException e)
-            {
-                exception = e;
-                transport.writeReady = false;
-            }
-        }
-        if (exception !is null)
-        {
-            kill(transport, exception);
-            return false;
-        }
-        if (transport.input.length == 0 && transport.isClosing())
-        {
-            kill(transport);
-        }
-        return true;
-    }
-
-    /**
-     * Start watching.
-     *
-     * Params:
-     *  watcher = Watcher.
-     */
-    override void start(ConnectionWatcher watcher) @nogc
-    {
-        if (watcher.active)
-        {
-            return;
-        }
-
-        if (connections.length <= watcher.socket)
-        {
-            connections.length = watcher.socket.handle + maxEvents / 2;
-        }
-        connections[watcher.socket.handle] = watcher;
-
-        super.start(watcher);
-    }
-
-    /**
-     * Accept incoming connections.
-     *
-     * Params:
-     *  connection = Connection watcher ready to accept.
-     */
-    package void acceptConnections(ConnectionWatcher connection) @nogc
-    in
-    {
-        assert(connection !is null);
-    }
-    do
-    {
-        while (true)
-        {
-            ConnectedSocket client;
-            try
-            {
-                client = (cast(StreamSocket) connection.socket).accept();
-            }
-            catch (SocketException e)
-            {
-                defaultAllocator.dispose(e);
-                break;
-            }
-            if (client is null)
-            {
-                break;
-            }
-
-            StreamTransport transport;
-
-            if (connections.length > client.handle)
-            {
-                transport = cast(StreamTransport) connections[client.handle];
-            }
-            else
-            {
-                connections.length = client.handle + maxEvents / 2;
-            }
-            if (transport is null)
-            {
-                transport = defaultAllocator.make!StreamTransport(this, client);
-                connections[client.handle] = transport;
-            }
-            else
-            {
-                transport.socket = client;
-            }
-
-            reify(transport,
-                  EventMask(Event.none),
-                  EventMask(Event.read | Event.write));
-            connection.incoming.insertBack(transport);
-        }
-
-        if (!connection.incoming.empty)
-        {
-            pendings.insertBack(connection);
-        }
-    }
-}
--- a/source/tanya/async/iocp.d
+++ b/source/tanya/async/iocp.d
@ -1,56 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * This module provides API for Windows I/O Completion Ports.
- *
- * Note: Available only on Windows.
- *
- * Copyright: Eugene Wissner 2016-2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/async/iocp.d,
- *                 tanya/async/iocp.d)
- */
-module tanya.async.iocp;
-
-version (Windows)
-{
-    version = WindowsDoc;
-}
-else version (D_Ddoc)
-{
-    version = WindowsDoc;
-    version (Windows)
-    {
-    }
-    else
-    {
-        private struct OVERLAPPED
-        {
-        }
-        private alias HANDLE = void*;
-    }
-}
-
-version (WindowsDoc):
-
-import tanya.sys.windows.winbase;
-
-/**
- * Provides an extendable representation of a Win32 $(D_PSYMBOL OVERLAPPED)
- * structure.
- */
-class State
-{
-    /// For internal use by Windows API.
-    align(1) OVERLAPPED overlapped;
-
-    /// File/socket handle.
-    HANDLE handle;
-
-    /// For keeping events or event masks.
-    int event;
-}
--- a/source/tanya/async/loop.d
+++ b/source/tanya/async/loop.d
@ -1,433 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Interface for the event loop implementations and the default event loop
- * chooser.
- *
- * ---
- * import tanya.async;
- * import tanya.memory;
- * import tanya.network.socket;
- *
- * class EchoProtocol : TransmissionControlProtocol
- * {
- *     private DuplexTransport transport;
- *
- *     void received(in ubyte[] data) @nogc
- *     {
- *         ubyte[512] buffer;
- *         buffer[0 .. data.length] = data;
- *         transport.write(buffer[]);
- *     }
- *
- *     void connected(DuplexTransport transport) @nogc
- *     {
- *         this.transport = transport;
- *     }
- *
- *     void disconnected(SocketException e) @nogc
- *     {
- *     }
- * }
- *
- * void main()
- * {
- *     auto address = defaultAllocator.make!InternetAddress("127.0.0.1", cast(ushort) 8192);
- *
- *     version (Windows)
- *     {
- *         auto sock = defaultAllocator.make!OverlappedStreamSocket(AddressFamily.inet);
- *     }
- *     else
- *     {
- *         auto sock = defaultAllocator.make!StreamSocket(AddressFamily.inet);
- *         sock.blocking = false;
- *     }
- *
- *     sock.bind(address);
- *     sock.listen(5);
- *
- *     auto io = defaultAllocator.make!ConnectionWatcher(sock);
- *     io.setProtocol!EchoProtocol;
- *
- *     defaultLoop.start(io);
- *     defaultLoop.run();
- *
- *     sock.shutdown();
- *     defaultAllocator.dispose(io);
- *     defaultAllocator.dispose(sock);
- *     defaultAllocator.dispose(address);
- * }
- * ---
- *
- * Copyright: Eugene Wissner 2016-2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/async/loop.d,
- *                 tanya/async/loop.d)
- */
-module tanya.async.loop;
-
-import core.time;
-import tanya.async.transport;
-import tanya.async.watcher;
-import tanya.bitmanip;
-import tanya.container.buffer;
-import tanya.container.list;
-import tanya.memory;
-import tanya.network.socket;
-
-version (DisableBackends)
-{
-}
-else version (D_Ddoc)
-{
-}
-else version (linux)
-{
-    import tanya.async.event.epoll;
-    version = Epoll;
-}
-else version (Windows)
-{
-    import tanya.async.event.iocp;
-    version = IOCP;
-}
-else version (OSX)
-{
-    version = Kqueue;
-}
-else version (iOS)
-{
-    version = Kqueue;
-}
-else version (FreeBSD)
-{
-    version = Kqueue;
-}
-else version (OpenBSD)
-{
-    version = Kqueue;
-}
-else version (DragonFlyBSD)
-{
-    version = Kqueue;
-}
-version (unittest)
-{
-    final class TestLoop : Loop
-    {
-        override protected bool reify(SocketWatcher watcher,
-                                      EventMask oldEvents,
-                                      EventMask events) @nogc
-        {
-            return true;
-        }
-
-        override protected void poll() @nogc
-        {
-            assert(!this.done);
-            unloop();
-        }
-
-        override protected @property uint maxEvents()
-        const pure nothrow @safe @nogc
-        {
-            return 64U;
-        }
-    }
-}
-
-/**
- * Events.
- */
-enum Event : uint
-{
-    none   = 0x00,       /// No events.
-    read   = 0x01,       /// Non-blocking read call.
-    write  = 0x02,       /// Non-blocking write call.
-    accept = 0x04,       /// Connection made.
-    error  = 0x80000000, /// Sent when an error occurs.
-}
-
-alias EventMask = BitFlags!Event;
-
-/**
- * Event loop.
- */
-abstract class Loop
-{
-    private bool done = true;
-
-    /// Pending watchers.
-    protected DList!Watcher pendings;
-
-    /**
-     * Returns: Maximal event count can be got at a time
-     *          (should be supported by the backend).
-     */
-    protected @property uint maxEvents()
-    const pure nothrow @safe @nogc
-    {
-        return 128U;
-    }
-
-    @nogc @system unittest
-    {
-        auto loop = defaultAllocator.make!TestLoop;
-        assert(loop.maxEvents == 64);
-
-        defaultAllocator.dispose(loop);
-    }
-
-    /**
-     * Initializes the loop.
-     */
-    this() @nogc
-    {
-    }
-
-    /**
-     * Frees loop internals.
-     */
-    ~this() @nogc
-    {
-        for (; !this.pendings.empty; this.pendings.removeFront())
-        {
-            defaultAllocator.dispose(this.pendings.front);
-        }
-    }
-
-    /**
-     * Starts the loop.
-     */
-    void run() @nogc
-    {
-        this.done = false;
-        do
-        {
-            poll();
-
-            // Invoke pendings
-            for (; !this.pendings.empty; this.pendings.removeFront())
-            {
-                this.pendings.front.invoke();
-            }
-        }
-        while (!this.done);
-    }
-
-    /**
-     * Break out of the loop.
-     */
-    void unloop() @safe pure nothrow @nogc
-    {
-        this.done = true;
-    }
-
-    @nogc @system unittest
-    {
-        auto loop = defaultAllocator.make!TestLoop;
-        assert(loop.done);
-
-        loop.run();
-        assert(loop.done);
-
-        defaultAllocator.dispose(loop);
-    }
-
-    @nogc @system unittest
-    {
-        auto loop = defaultAllocator.make!TestLoop;
-        auto watcher = defaultAllocator.make!DummyWatcher;
-        loop.pendings.insertBack(watcher);
-
-        assert(!watcher.invoked);
-        loop.run();
-        assert(watcher.invoked);
-
-        defaultAllocator.dispose(loop);
-        defaultAllocator.dispose(watcher);
-    }
-
-    /**
-     * Start watching.
-     *
-     * Params:
-     *  watcher = Watcher.
-     */
-    void start(ConnectionWatcher watcher) @nogc
-    {
-        if (watcher.active)
-        {
-            return;
-        }
-        watcher.active = true;
-
-        reify(watcher, EventMask(Event.none), EventMask(Event.accept));
-    }
-
-    /**
-     * Stop watching.
-     *
-     * Params:
-     *  watcher = Watcher.
-     */
-    void stop(ConnectionWatcher watcher) @nogc
-    {
-        if (!watcher.active)
-        {
-            return;
-        }
-        watcher.active = false;
-
-        reify(watcher, EventMask(Event.accept), EventMask(Event.none));
-    }
-
-    /**
-     * Should be called if the backend configuration changes.
-     *
-     * Params:
-     *  watcher   = Watcher.
-     *  oldEvents = The events were already set.
-     *  events    = The events should be set.
-     *
-     * Returns: $(D_KEYWORD true) if the operation was successful.
-     */
-    abstract protected bool reify(SocketWatcher watcher,
-                                  EventMask oldEvents,
-                                  EventMask events) @nogc;
-
-    /**
-     * Returns: The blocking time.
-     */
-    protected @property inout(Duration) blockTime()
-    inout @safe pure nothrow @nogc
-    {
-        // Don't block if we have to do.
-        return pendings.empty ? blockTime_ : Duration.zero;
-    }
-
-    /**
-     * Sets the blocking time for IO watchers.
-     *
-     * Params:
-     *  blockTime = The blocking time. Cannot be larger than
-     *              $(D_PSYMBOL maxBlockTime).
-     */
-    protected @property void blockTime(in Duration blockTime) @safe pure nothrow @nogc
-    in
-    {
-        assert(blockTime <= 1.dur!"hours", "Too long to wait.");
-        assert(!blockTime.isNegative);
-    }
-    do
-    {
-        blockTime_ = blockTime;
-    }
-
-    @nogc @system unittest
-    {
-        auto loop = defaultAllocator.make!TestLoop;
-        assert(loop.blockTime == 1.dur!"minutes");
-
-        loop.blockTime = 2.dur!"minutes";
-        assert(loop.blockTime == 2.dur!"minutes");
-
-        defaultAllocator.dispose(loop);
-    }
-
-    /**
-     * Does the actual polling.
-     */
-    abstract protected void poll() @nogc;
-
-    /// Maximal block time.
-    protected Duration blockTime_ = 1.dur!"minutes";
-}
-
-/**
- * Exception thrown on errors in the event loop.
- */
-class BadLoopException : Exception
-{
-    /**
-     * Params:
-     *  file = The file where the exception occurred.
-     *  line = The line number where the exception occurred.
-     *  next = The previous exception in the chain of exceptions, if any.
-     */
-    this(string file = __FILE__, size_t line = __LINE__, Throwable next = null)
-    pure nothrow const @safe @nogc
-    {
-        super("Event loop cannot be initialized.", file, line, next);
-    }
-}
-
-/**
- * Returns the event loop used by default. If an event loop wasn't set with
- * $(D_PSYMBOL defaultLoop) before, $(D_PSYMBOL defaultLoop) will try to
- * choose an event loop supported on the system.
- *
- * Returns: The default event loop.
- */
-@property Loop defaultLoop() @nogc
-{
-    if (defaultLoop_ !is null)
-    {
-        return defaultLoop_;
-    }
-    version (Epoll)
-    {
-        defaultLoop_ = defaultAllocator.make!EpollLoop;
-    }
-    else version (IOCP)
-    {
-        defaultLoop_ = defaultAllocator.make!IOCPLoop;
-    }
-    else version (Kqueue)
-    {
-        import tanya.async.event.kqueue;
-        defaultLoop_ = defaultAllocator.make!KqueueLoop;
-    }
-    return defaultLoop_;
-}
-
-/**
- * Sets the default event loop.
- *
- * This property makes it possible to implement your own backends or event
- * loops, for example, if the system is not supported or if you want to
- * extend the supported implementation. Just extend $(D_PSYMBOL Loop) and pass
- * your implementation to this property.
- *
- * Params:
- *  loop = The event loop.
- */
-@property void defaultLoop(Loop loop) @nogc
-in
-{
-    assert(loop !is null);
-}
-do
-{
-    defaultLoop_ = loop;
-}
-
-private Loop defaultLoop_;
-
-@nogc @system unittest
-{
-    auto oldLoop = defaultLoop_;
-    auto loop = defaultAllocator.make!TestLoop;
-
-    defaultLoop = loop;
-    assert(defaultLoop_ is loop);
-    assert(defaultLoop is loop);
-
-    defaultLoop_ = oldLoop;
-    defaultAllocator.dispose(loop);
-}
--- a/source/tanya/async/package.d
+++ b/source/tanya/async/package.d
@ -1,20 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * This package provides asynchronous capabilities.
- *
- * Copyright: Eugene Wissner 2016-2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/async/package.d,
- *                 tanya/async/package.d)
- */
-module tanya.async;
-
-public import tanya.async.loop;
-public import tanya.async.protocol;
-public import tanya.async.transport;
-public import tanya.async.watcher;
--- a/source/tanya/async/protocol.d
+++ b/source/tanya/async/protocol.d
@ -1,58 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * This module contains protocol which handle data in asynchronous
- * applications.
- *
- * When an event from the network arrives, a protocol method gets
- * called and can respond to the event.
- *
- * Copyright: Eugene Wissner 2016-2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/async/protocol.d,
- *                 tanya/async/protocol.d)
- */
-module tanya.async.protocol;
-
-import tanya.async.transport;
-import tanya.network.socket;
-
-/**
- * Common protocol interface.
- */
-interface Protocol
-{
-    /**
-     * Params:
-     *  data = Read data.
-     */
-    void received(in ubyte[] data) @nogc;
-
-    /**
-     * Called when a connection is made.
-     *
-     * Params:
-     *  transport = Protocol transport.
-     */
-    void connected(DuplexTransport transport) @nogc;
-
-    /**
-     * Called when a connection is lost.
-     *
-     * Params:
-     *  exception = $(D_PSYMBOL Exception) if an error caused
-     *              the disconnect, $(D_KEYWORD null) otherwise.
-     */
-    void disconnected(SocketException exception) @nogc;
-}
-
-/**
- * Interface for TCP.
- */
-interface TransmissionControlProtocol  : Protocol
-{
-}
--- a/source/tanya/async/transport.d
+++ b/source/tanya/async/transport.d
@ -1,104 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * This module contains transports which are responsible for data dilvery
- * between two parties of an asynchronous communication.
- *
- * Copyright: Eugene Wissner 2016-2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/async/transport.d,
- *                 tanya/async/transport.d)
- */
-module tanya.async.transport;
-
-import tanya.async.protocol;
-import tanya.network.socket;
-
-/**
- * Base transport interface.
- */
-interface Transport
-{
-}
-
-/**
- * Interface for read-only transports.
- */
-interface ReadTransport : Transport
-{
-}
-
-/**
- * Interface for write-only transports.
- */
-interface WriteTransport : Transport
-{
-    /**
-     * Write some data to the transport.
-     *
-     * Params:
-     *  data = Data to send.
-     */
-    void write(ubyte[] data) @nogc;
-}
-
-/**
- * Represents a bidirectional transport.
- */
-interface DuplexTransport : ReadTransport, WriteTransport
-{
-    /**
-     * Returns: Application protocol.
-     *
-     * Postcondition: $(D_INLINECODE protocol !is null)
-     */
-    @property Protocol protocol() pure nothrow @safe @nogc
-    out (protocol)
-    {
-        assert(protocol !is null);
-    }
-
-    /**
-     * Switches the protocol.
-     *
-     * The protocol is deallocated by the event loop.
-     *
-     * Params:
-     *  protocol = Application protocol.
-     *
-     * Precondition: $(D_INLINECODE protocol !is null)
-     */
-    @property void protocol(Protocol protocol) pure nothrow @safe @nogc
-    in
-    {
-        assert(protocol !is null);
-    }
-
-
-    /**
-     * Returns $(D_PARAM true) if the transport is closing or closed.
-     */
-    bool isClosing() const pure nothrow @safe @nogc;
-
-    /**
-     * Close the transport.
-     *
-     * Buffered data will be flushed.  No more data will be received.
-     */
-    void close() @nogc;
-}
-
-/**
- * Represents a socket transport.
- */
-interface SocketTransport : Transport
-{
-    /**
-     * Returns: Socket.
-     */
-    @property Socket socket() pure nothrow @safe @nogc;
-}
--- a/source/tanya/async/watcher.d
+++ b/source/tanya/async/watcher.d
@ -1,130 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Watchers register user's interest in some event.
- *
- * Copyright: Eugene Wissner 2016-2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/async/watcher.d,
- *                 tanya/async/watcher.d)
- */
-module tanya.async.watcher;
-
-import tanya.async.loop;
-import tanya.async.protocol;
-import tanya.async.transport;
-import tanya.container.buffer;
-import tanya.container.list;
-import tanya.memory;
-import tanya.network.socket;
-
-/**
- * A watcher is an opaque structure that you allocate and register to record
- * your interest in some event. 
- */
-abstract class Watcher
-{
-    /// Whether the watcher is active.
-    bool active;
-
-    /**
-     * Invoke some action on event.
-     */
-    void invoke() @nogc;
-}
-
-version (unittest)
-{
-    final class DummyWatcher : Watcher
-    {
-        bool invoked;
-
-        override void invoke() @nogc
-        {
-            this.invoked = true;
-        }
-    }
-}
-
-/**
- * Socket watcher.
- */
-abstract class SocketWatcher : Watcher
-{
-    /// Watched socket.
-    protected Socket socket_;
-
-    /**
-     * Params:
-     *  socket = Socket.
-     *
-     * Precondition: $(D_INLINECODE socket !is null)
-     */
-    this(Socket socket) pure nothrow @safe @nogc
-    in
-    {
-        assert(socket !is null);
-    }
-    do
-    {
-        socket_ = socket;
-    }
-
-    /**
-     * Returns: Socket.
-     */
-    @property Socket socket() pure nothrow @safe @nogc
-    {
-        return socket_;
-    }
-}
-
-/**
- * Connection watcher.
- */
-class ConnectionWatcher : SocketWatcher
-{
-    /// Incoming connection queue.
-    DList!DuplexTransport incoming;
-
-    private Protocol delegate() @nogc protocolFactory;
-
-    /**
-     * Params:
-     *  socket = Socket.
-     */
-    this(Socket socket) @nogc
-    {
-        super(socket);
-    }
-
-    /**
-     * Params:
-     *  P = Protocol should be used.
-     */
-    void setProtocol(P : Protocol)() @nogc
-    {
-        this.protocolFactory = () @nogc => cast(Protocol) defaultAllocator.make!P;
-    }
-
-    /**
-     * Invokes new connection callback.
-     */
-    override void invoke() @nogc
-    in
-    {
-        assert(protocolFactory !is null, "Protocol isn't set.");
-    }
-    do
-    {
-        for (; !this.incoming.empty; this.incoming.removeFront())
-        {
-            this.incoming.front.protocol = protocolFactory();
-            this.incoming.front.protocol.connected(this.incoming.front);
-        }
-    }
-}
--- a/source/tanya/bitmanip.d
+++ b/source/tanya/bitmanip.d
@ -1,359 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Bit manipulation.
- *
- * Copyright: Eugene Wissner 2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/bitmanip.d,
- *                 tanya/bitmanip.d)
- */
-module tanya.bitmanip;
-
-import tanya.meta.metafunction;
-import tanya.meta.trait;
-import tanya.meta.transform;
-
-/**
- * Determines whether $(D_PARAM E) is a $(D_KEYWORD enum), whose members can be
- * used as bit flags.
- *
- * This is the case if all members of $(D_PARAM E) are integral numbers that
- * are either 0 or positive integral powers of 2.
- *
- * Params:
- *  E = Some $(D_KEYWORD enum).
- *
- * Returns: $(D_KEYWORD true) if $(D_PARAM E) contains only bit flags,
- *          $(D_KEYWORD false) otherwise.
- */
-template isBitFlagEnum(E)
-{
-    enum bool isValid(OriginalType!E x) = x == 0
-                                       || (x > 0 && ((x & (x - 1)) == 0));
-    static if (isIntegral!E)
-    {
-        enum bool isBitFlagEnum = allSatisfy!(isValid, EnumMembers!E);
-    }
-    else
-    {
-        enum bool isBitFlagEnum = false;
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    enum Valid
-    {
-        none = 0,
-        one = 1 << 0,
-        two = 1 << 1,
-    }
-    static assert(isBitFlagEnum!Valid);
-
-    enum Invalid
-    {
-        one,
-        two,
-        three,
-        four,
-    }
-    static assert(!isBitFlagEnum!Invalid);
-
-    enum Negative
-    {
-        one = -1,
-        two = -2,
-    }
-    static assert(!isBitFlagEnum!Negative);
-}
-
-/**
- * Validates that $(D_PARAM field) contains only bits from $(D_PARAM E).
- *
- * Params:
- *  E     = Some $(D_KEYWORD enum).
- *  field = Bit field.
- *
- * Returns: $(D_KEYWORD true) if $(D_PARAM field) is valid, $(D_KEYWORD false)
- *          otherwise.
- */
-bool containsBitFlags(E)(E field)
-if (isBitFlagEnum!E)
-{
-    OriginalType!E fillField()
-    {
-        typeof(return) full;
-        static foreach (member; EnumMembers!E)
-        {
-            full |= member;
-        }
-        return full;
-    }
-    enum OriginalType!E full = fillField();
-    return (field & ~full) == OriginalType!E.init;
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    enum E
-    {
-        one,
-        two,
-        three,
-    }
-    assert(containsBitFlags(E.one | E.two));
-    assert(!containsBitFlags(cast(E) 0x8));
-}
-
-/**
- * Allows to use $(D_KEYWORD enum) values as a set of bit flags.
- *
- * $(D_PSYMBOL BitFlags) behaves the same as a bit field of type $(D_PARAM E),
- * but does additional cheks to ensure that the bit field contains only valid
- * values, this is only values from $(D_PARAM E).
- *
- * Params:
- *  E = Some $(D_KEYWORD enum).
- */
-struct BitFlags(E)
-if (isBitFlagEnum!E)
-{
-    private OriginalType!E field;
-
-    /**
-     * Constructs $(D_PSYMBOL BitFlags) from $(D_PARAM field).
-     *
-     * Params:
-     *  field = Bits to be set.
-     */
-    this(E field)
-    {
-        this.field = field;
-    }
-
-    /**
-     * Converts $(D_PSYMBOL BitFlags) to a boolean.
-     *
-     * It is $(D_KEYWORD true) if any bit is set, $(D_KEYWORD false) otherwise.
-     *
-     * Returns: $(D_KEYWORD true) if this $(D_PSYMBOL BitFlags) contains any
-     *          set bits, $(D_KEYWORD false) otherwise.
-     */
-    bool opCast(T : bool)()
-    {
-        return this.field != 0;
-    }
-
-    /**
-     * Converts to the original type of $(D_PARAM E) ($(D_KEYWORD int) by
-     * default).
-     *
-     * Returns: $(D_KEYWORD this) as $(D_INLINECODE OriginalType!T).
-     */
-    OriginalType!E opCast(T : OriginalType!E)() const
-    {
-        return this.field;
-    }
-
-    /**
-     * Tests (&), sets (|) or toggles (^) bits.
-     *
-     * Params:
-     *  op   = Operation.
-     *  that = 0 or more bit flags.
-     *
-     * Returns: New $(D_PSYMBOL BitFlags) object.
-     */
-    BitFlags opBinary(string op)(E that) const
-    if (op == "&" || op == "|" || op == "^")
-    {
-        BitFlags result = this;
-        mixin("return result " ~ op ~ "= that;");
-    }
-
-    /// ditto
-    BitFlags opBinary(string op)(BitFlags that) const
-    if (op == "&" || op == "|" || op == "^")
-    {
-        BitFlags result = this;
-        mixin("return result " ~ op ~ "= that;");
-    }
-
-    /// ditto
-    BitFlags opBinaryRight(string op)(E that) const
-    if (op == "&" || op == "|" || op == "^")
-    {
-        BitFlags result = this;
-        mixin("return result " ~ op ~ "= that;");
-    }
-
-    /**
-     * Tests (&), sets (|) or toggles (^) bits.
-     *
-     * Params:
-     *  op   = Operation.
-     *  that = 0 or more bit flags.
-     *
-     * Returns: $(D_KEYWORD this).
-     */
-    ref BitFlags opOpAssign(string op)(E that)
-    if (op == "&" || op == "|" || op == "^")
-    {
-        mixin("this.field " ~ op ~ "= that;");
-        return this;
-    }
-
-    /// ditto
-    ref BitFlags opOpAssign(string op)(BitFlags that)
-    if (op == "&" || op == "|" || op == "^")
-    {
-        mixin("this.field " ~ op ~ "= that.field;");
-        return this;
-    }
-
-    /**
-     * Inverts all bit flags.
-     *
-     * Returns: New $(D_PSYMBOL BitFlags) object with all bits inverted.
-     */
-    BitFlags opUnary(string op : "~")() const
-    {
-        BitFlags result;
-        result.field  = ~this.field;
-        return result;
-    }
-
-    /**
-     * Assigns a bit field.
-     *
-     * Params:
-     *  that = Bit field of type $(D_PARAM E).
-     *
-     * Returns: $(D_KEYWORD this).
-     */
-    ref BitFlags opAssign(E that)
-    {
-        this.field = that;
-        return this;
-    }
-
-    /**
-     * Compares this $(D_PSYMBOL BitFlags) object to another bit field.
-     *
-     * Params:
-     *  that = $(D_PSYMBOL BitFlags) object or a bit field of type
-     *         $(D_PARAM E).
-     *
-     * Returns: $(D_KEYWORD true) if $(D_KEYWORD this) and $(D_PARAM that)
-     *          contain the same bits ,$(D_KEYWORD false) otherwise.
-     */
-    bool opEquals(E that) const
-    {
-        return this.field == that;
-    }
-
-    /// ditto
-    bool opEquals(BitFlags that) const
-    {
-        return this.field == that.field;
-    }
-
-    /**
-     * Generates a hash value of this object.
-     *
-     * Returns: Hash value.
-     */
-    size_t toHash() const
-    {
-        return cast(size_t) this.field;
-    }
-}
-
-@nogc nothrow pure @safe unittest
-{
-    enum E : int
-    {
-        one = 1,
-    }
-
-    // Casts to a boolean
-    assert(BitFlags!E(E.one));
-    assert(!BitFlags!E());
-
-    // Assigns to and compares with a single value
-    {
-        BitFlags!E bitFlags;
-        bitFlags = E.one;
-        assert(bitFlags == E.one);
-    }
-    // Assigns to and compares with the same type
-    {
-        auto bitFlags1 = BitFlags!E(E.one);
-        BitFlags!E bitFlags2;
-        bitFlags2 = bitFlags1;
-        assert(bitFlags1 == bitFlags2);
-    }
-    assert((BitFlags!E() | E.one) == BitFlags!E(E.one));
-    assert((BitFlags!E() | BitFlags!E(E.one)) == BitFlags!E(E.one));
-
-    assert(!(BitFlags!E() & BitFlags!E(E.one)));
-
-    assert(!(BitFlags!E(E.one) ^ E.one));
-    assert(BitFlags!E() ^ BitFlags!E(E.one));
-
-    assert(~BitFlags!E());
-
-    assert(BitFlags!E().toHash() == 0);
-    assert(BitFlags!E(E.one).toHash() != 0);
-
-    // opBinaryRight is allowed
-    static assert(is(typeof({ E.one | BitFlags!E(); })));
-}
-
-/**
- * Creates a $(D_PSYMBOL BitFlags) object initialized with $(D_PARAM field).
- *
- * Params:
- *  E     = Some $(D_KEYWORD enum).
- *  field = Bits to be set.
- */
-BitFlags!E bitFlags(E)(E field)
-if (isBitFlagEnum!E)
-{
-    return BitFlags!E(field);
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    enum E
-    {
-        one = 1 << 0,
-        two = 1 << 1,
-        three = 1 << 2,
-    }
-    // Construct with E.one and E.two set
-    auto flags = bitFlags(E.one | E.two);
-
-    // Test wheter E.one is set
-    assert(flags & E.one);
-
-    // Toggle E.one
-    flags ^= E.one;
-    assert(!(flags & E.one));
-
-    // Set E.three
-    flags |= E.three;
-    assert(flags & E.three);
-
-    // Clear E.three
-    flags &= ~E.three;
-    assert(!(flags & E.three));
-}
--- a/source/tanya/container/array.d
+++ b/source/tanya/container/array.d
@ -5,7 +5,7 @@
 /**
 * Single-dimensioned array.
 *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2021.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -15,15 +15,15 @@
 module tanya.container.array;

 import core.checkedint;
-import tanya.algorithm.comparison;
+import std.algorithm.comparison;
+import std.algorithm.iteration;
+import std.algorithm.mutation : bringToFront;
 import tanya.algorithm.mutation;
-import tanya.exception;
-import tanya.functional;
-import tanya.memory;
+import tanya.memory.allocator;
+import tanya.memory.lifetime;
 import tanya.meta.trait;
 import tanya.meta.transform;
 import tanya.range;
-version (unittest) import tanya.test.stub;

 /**
 * Random-access range for the $(D_PSYMBOL Array).
@ -45,7 +45,8 @@ struct Range(A)
        assert(this.end <= this.container.data + this.container.length);
    }

-    private this(ref A container, E* begin, E* end) @trusted
+    private this(return ref A container, return E* begin, return E* end)
+    @trusted
    in
    {
        assert(begin <= end);
@ -160,7 +161,7 @@ struct Range(A)
        return typeof(return)(*this.container, this.begin + i, this.begin + j);
    }

-    inout(E)[] get() inout @trusted
+    inout(E)[] get() inout
    {
        return this.begin[0 .. length];
    }
@ -212,7 +213,7 @@ struct Array(T)
     *  init      = Values to initialize the array with.
     *  allocator = Allocator.
     */
-    this(R)(R init, shared Allocator allocator = defaultAllocator)
+    this(R)(scope R init, shared Allocator allocator = defaultAllocator)
    if (!isInfinite!R
     && isInputRange!R
     && isImplicitlyConvertible!(ElementType!R, T))
@ -265,7 +266,7 @@ struct Array(T)
        {
            // Move each element.
            reserve(init.length_);
-            foreach (ref target; this.data[0 .. init.length_])
+            foreach (ref target; slice(init.length_))
            {
                moveEmplace(*init.data++, target);
            }
@ -348,8 +349,13 @@ struct Array(T)
     */
    ~this()
    {
-        clear();
-        (() @trusted => allocator.deallocate(slice(capacity)))();
+        destroyAll(slice(this.length_));
+        deallocate();
+    }
+
+    private void deallocate() @trusted
+    {
+        allocator.deallocate(slice(capacity));
    }

    static if (isCopyable!T)
@ -498,7 +504,7 @@ struct Array(T)
                    destroy(*src);
                }
            }
-            allocator.deallocate(this.data[0 .. this.capacity_]);
+            deallocate();
            this.data = cast(T*) buf;
        }
        this.capacity_ = size;
@ -641,7 +647,7 @@ struct Array(T)
     *
     * Precondition: $(D_PARAM r) refers to a region of $(D_KEYWORD this).
     */
-    Range remove(Range r)
+    Range remove(scope Range r)
    in
    {
        assert(r.container is &this);
@ -720,7 +726,7 @@ struct Array(T)
    }

    /// ditto
-    size_t insertBack(R)(R el)
+    size_t insertBack(R)(scope R el)
    if (!isInfinite!R
     && isInputRange!R
     && isImplicitlyConvertible!(ElementType!R, T))
@ -729,12 +735,7 @@ struct Array(T)
        {
            reserve(length + el.length);
        }
-        size_t retLength;
-        foreach (e; el)
-        {
-            retLength += insertBack(e);
-        }
-        return retLength;
+        return fold!((acc, e) => acc + insertBack(e))(el, size_t.init);
    }

    /// ditto
@ -799,7 +800,7 @@ struct Array(T)
     *
     * Precondition: $(D_PARAM r) refers to a region of $(D_KEYWORD this).
     */
-    size_t insertAfter(R)(Range r, R el)
+    size_t insertAfter(R)(Range r, scope R el)
    if (!isInfinite!R
     && isInputRange!R
     && isImplicitlyConvertible!(ElementType!R, T))
@ -815,7 +816,7 @@ struct Array(T)
        const after = r.end - this.data;
        const inserted = insertBack(el);

-        rotate(this.data[after .. oldLength], this.data[oldLength .. length]);
+        bringToFront(this.data[after .. oldLength], this.data[oldLength .. length]);
        return inserted;
    }

@ -854,16 +855,16 @@ struct Array(T)
        {
            moveBack(el);
        }
-        rotate(this.data[offset .. oldLen], this.data[oldLen .. length]);
+        bringToFront(this.data[offset .. oldLen], this.data[oldLen .. length]);

        return 1;
    }

    /// ditto
-    size_t insertBefore(R)(Range r, R el)
+    size_t insertBefore(R)(Range r, scope R el)
    if (!isInfinite!R
-     && isInputRange!R
-     && isImplicitlyConvertible!(ElementType!R, T))
+        && isInputRange!R
+        && isImplicitlyConvertible!(ElementType!R, T))
    in
    {
        assert(r.container is &this);
@ -910,7 +911,7 @@ struct Array(T)
        {
            moveBack(el);
        }
-        rotate(this.data[offset .. oldLen], this.data[oldLen .. length]);
+        bringToFront(this.data[offset .. oldLen], this.data[oldLen .. length]);

        return 1;
    }
@ -1123,7 +1124,8 @@ struct Array(T)
    }

    /// ditto
-    bool opEquals(Range that)
+    bool opEquals(R)(R that)
+    if (is(R == Range))
    {
        return equal(opIndex(), that);
    }
@ -1371,13 +1373,13 @@ struct Array(T)
     *
     * Returns: The array with elements of this array.
     */
-    inout(T[]) get() inout @trusted
+    inout(T[]) get() inout
    {
        return this.data[0 .. length];
    }

    ///
-    @nogc nothrow pure @safe unittest
+    @nogc nothrow pure @system unittest
    {
        auto v = Array!int([1, 2, 4]);
        auto data = v.get();
@ -1433,7 +1435,7 @@ struct Array(T)
     *
     * Returns: $(D_KEYWORD this).
     */
-    ref typeof(this) opAssign(R)(R that)
+    ref typeof(this) opAssign(R)(scope R that)
    if (!isInfinite!R
     && isInputRange!R
     && isImplicitlyConvertible!(ElementType!R, T))
@ -1493,198 +1495,3 @@ struct Array(T)
    assert(r.front == 7);
    assert(r.front == v.front);
 }
-
-@nogc nothrow pure @safe unittest
-{
-    const v1 = Array!int();
-    const Array!int v2;
-    const v3 = Array!int([1, 5, 8]);
-    static assert(is(PointerTarget!(typeof(v3.data)) == const(int)));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    // Test that const arrays return usable ranges.
-    auto v = const Array!int([1, 2, 4]);
-    auto r1 = v[];
-
-    assert(r1.back == 4);
-    r1.popBack();
-    assert(r1.back == 2);
-    r1.popBack();
-    assert(r1.back == 1);
-    r1.popBack();
-    assert(r1.length == 0);
-
-    static assert(!is(typeof(r1[0] = 5)));
-    static assert(!is(typeof(v[0] = 5)));
-
-    const r2 = r1[];
-    static assert(is(typeof(r2[])));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    Array!int v1;
-    const Array!int v2;
-
-    auto r1 = v1[];
-    auto r2 = v1[];
-
-    assert(r1.length == 0);
-    assert(r2.empty);
-    assert(r1 == r2);
-
-    v1.insertBack([1, 2, 4]);
-    assert(v1[] == v1);
-    assert(v2[] == v2);
-    assert(v2[] != v1);
-    assert(v1[] != v2);
-    assert(v1[].equal(v1[]));
-    assert(v2[].equal(v2[]));
-    assert(!v1[].equal(v2[]));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    struct MutableEqualsStruct
-    {
-        bool opEquals(typeof(this) that) @nogc nothrow pure @safe
-        {
-            return true;
-        }
-    }
-    struct ConstEqualsStruct
-    {
-        bool opEquals(const typeof(this) that) const @nogc nothrow pure @safe
-        {
-            return true;
-        }
-    }
-    auto v1 = Array!ConstEqualsStruct();
-    auto v2 = Array!ConstEqualsStruct();
-    assert(v1 == v2);
-    assert(v1[] == v2);
-    assert(v1 == v2[]);
-    assert(v1[].equal(v2[]));
-
-    auto v3 = const Array!ConstEqualsStruct();
-    auto v4 = const Array!ConstEqualsStruct();
-    assert(v3 == v4);
-    assert(v3[] == v4);
-    assert(v3 == v4[]);
-    assert(v3[].equal(v4[]));
-
-    auto v7 = Array!MutableEqualsStruct(1, MutableEqualsStruct());
-    auto v8 = Array!MutableEqualsStruct(1, MutableEqualsStruct());
-    assert(v7 == v8);
-    assert(v7[] == v8);
-    assert(v7 == v8[]);
-    assert(v7[].equal(v8[]));
-}
-
-// Destructor can destroy empty arrays
-@nogc nothrow pure @safe unittest
-{
-    auto v = Array!WithDtor();
-}
-
-@nogc nothrow pure @safe unittest
-{
-    class A
-    {
-    }
-    A a1, a2;
-    auto v1 = Array!A([a1, a2]);
-
-    static assert(is(Array!(A*)));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    auto v = Array!int([5, 15, 8]);
-    {
-        size_t i;
-
-        foreach (e; v)
-        {
-            assert(i != 0 || e == 5);
-            assert(i != 1 || e == 15);
-            assert(i != 2 || e == 8);
-            ++i;
-        }
-        assert(i == 3);
-    }
-    {
-        size_t i = 3;
-
-        foreach_reverse (e; v)
-        {
-            --i;
-            assert(i != 2 || e == 8);
-            assert(i != 1 || e == 15);
-            assert(i != 0 || e == 5);
-        }
-        assert(i == 0);
-    }
-}
-
-// const constructor tests
-@nogc nothrow pure @safe unittest
-{
-    auto v1 = const Array!int([1, 2, 3]);
-    auto v2 = Array!int(v1);
-    assert(v1.data !is v2.data);
-    assert(v1 == v2);
-
-    auto v3 = const Array!int(Array!int([1, 2, 3]));
-    assert(v1 == v3);
-    assert(v3.length == 3);
-    assert(v3.capacity == 3);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    auto v1 = Array!int(defaultAllocator);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    Array!int v;
-    auto r = v[];
-    assert(r.length == 0);
-    assert(r.empty);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    auto v1 = const Array!int([5, 15, 8]);
-    Array!int v2;
-    v2 = v1[0 .. 2];
-    assert(equal(v1[0 .. 2], v2[]));
-}
-
-// Move assignment
-@nogc nothrow pure @safe unittest
-{
-    Array!int v1;
-    v1 = Array!int([5, 15, 8]);
-}
-
-// Postblit is safe
-@nogc nothrow pure @safe unittest
-{
-    auto array = Array!int(3);
-    void func(Array!int arg)
-    {
-        assert(arg.capacity == 3);
-    }
-    func(array);
-}
-
-// Can have non-copyable elements
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(Array!NonCopyable));
-    static assert(is(typeof({ Array!NonCopyable.init[0] = NonCopyable(); })));
-}
--- a/source/tanya/container/buffer.d
+++ b/source/tanya/container/buffer.d
@ -5,7 +5,7 @@
 /**
 * This module contains buffers designed for C-style input/output APIs.
 *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -14,7 +14,8 @@
 */
 module tanya.container.buffer;

-import tanya.memory;
+import std.traits : isScalarType;
+import tanya.memory.allocator;
 import tanya.meta.trait;

 version (unittest)
@ -188,7 +189,7 @@ if (isScalarType!T)
     * Returns: $(D_KEYWORD this).
     */
    ref ReadBuffer opOpAssign(string op)(size_t length)
-        if (op == "+")
+    if (op == "+")
    {
        this.length_ += length;
        ring = start;
@ -293,11 +294,6 @@ if (isScalarType!T)
    mixin DefaultAllocator;
 }

-@nogc nothrow pure @safe unittest
-{
-    static assert(is(ReadBuffer!int));
-}
-
 /**
 * Circular, self-expanding buffer with overflow support. Can be used with
 * functions returning the number of the transferred bytes.
@ -331,7 +327,8 @@ if (isScalarType!T)
    invariant
    {
        assert(this.blockSize > 0);
-        // Position can refer to an element outside the buffer if the buffer is full.
+        // Position can refer to an element outside the buffer if the buffer is
+        // full.
        assert(this.position <= this.buffer_.length);
    }

@ -435,7 +432,7 @@ if (isScalarType!T)
     *  buffer = Buffer chunk got with $(D_PSYMBOL opIndex).
     */
    ref WriteBuffer opOpAssign(string op)(const T[] buffer)
-        if (op == "~")
+    if (op == "~")
    {
        size_t end, start;

@ -509,7 +506,7 @@ if (isScalarType!T)
     * Returns: $(D_KEYWORD this).
     */
    ref WriteBuffer opOpAssign(string op)(size_t length)
-        if (op == "+")
+    if (op == "+")
    in
    {
        assert(length <= this.length);
@ -649,11 +646,6 @@ if (isScalarType!T)
    mixin DefaultAllocator;
 }

-@nogc nothrow pure @safe unittest
-{
-    static assert(is(typeof(WriteBuffer!int(5))));
-}
-
@nogc nothrow pure @system unittest
 {
    auto b = WriteBuffer!ubyte(4);
--- a/source/tanya/container/entry.d
+++ b/source/tanya/container/entry.d
@ -5,7 +5,7 @@
 /*
 * Internal package used by containers that rely on entries/nodes.
 *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2022.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -14,13 +14,11 @@
 */
 module tanya.container.entry;

-import tanya.algorithm.mutation;
 import tanya.container.array;
 import tanya.memory.allocator;
+import tanya.memory.lifetime;
 import tanya.meta.trait;
 import tanya.meta.transform;
-import tanya.typecons;
-version (unittest) import tanya.test.stub;

 package struct SEntry(T)
 {
@ -55,7 +53,11 @@ package struct Bucket(K, V = void)
    }
    else
    {
-        alias KV = Tuple!(K, "key", V, "value");
+        package struct KV
+        {
+            package K key;
+            package V value;
+        }
        KV kv;
    }
    BucketStatus status = BucketStatus.empty;
@ -117,7 +119,7 @@ package static immutable size_t[33] primes = [
    805306457, 1610612741, 3221225473
 ];

-package struct HashArray(alias hasher, K, V = void)
+package(tanya.container) struct HashArray(alias hasher, K, V = void)
 {
    alias Key = K;
    alias Value = V;
@ -327,13 +329,3 @@ package struct HashArray(alias hasher, K, V = void)
        return false;
    }
 }
-
-// Can be constructed with non-copyable key/values
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(Bucket!NonCopyable));
-    static assert(is(Bucket!(NonCopyable, NonCopyable)));
-
-    static assert(is(HashArray!((ref NonCopyable) => 0U, NonCopyable)));
-    static assert(is(HashArray!((ref NonCopyable) => 0U, NonCopyable, NonCopyable)));
-}
--- a/source/tanya/container/hashtable.d
+++ b/source/tanya/container/hashtable.d
@ -5,7 +5,7 @@
 /**
 * Hash table.
 *
- * Copyright: Eugene Wissner 2018.
+ * Copyright: Eugene Wissner 2018-2021.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -14,15 +14,16 @@
 */
 module tanya.container.hashtable;

+import std.algorithm.iteration;
 import tanya.algorithm.mutation;
 import tanya.container.array;
 import tanya.container.entry;
 import tanya.hash.lookup;
-import tanya.memory;
+import tanya.memory.allocator;
+import tanya.memory.lifetime;
 import tanya.meta.trait;
 import tanya.meta.transform;
 import tanya.range.primitive;
-version (unittest) import tanya.test.stub;

 /**
 * Bidirectional range whose element type is a tuple of a key and the
@ -209,7 +210,7 @@ struct ByKey(T)
        assert(!empty);
        assert(this.dataRange.back.status == BucketStatus.used);
    }
-    out
+    out 
    {
        assert(empty || this.dataRange.back.status == BucketStatus.used);
    }
@ -501,8 +502,8 @@ if (isHashFunction!(hasher, Key))
     *
     * Precondition: $(D_INLINECODE allocator !is null).
     */
-    this(R)(R range, shared Allocator allocator = defaultAllocator)
-    if (isForwardRange!R && is(ElementType!R == KeyValue))
+    this(R)(scope R range, shared Allocator allocator = defaultAllocator)
+    if (isForwardRange!R && is(ElementType!R == KeyValue) && !isInfinite!R)
    in
    {
        assert(allocator !is null);
@ -543,6 +544,7 @@ if (isHashFunction!(hasher, Key))
    }
    do
    {
+        this(allocator);
        insert(array[]);
    }

@ -811,15 +813,10 @@ if (isHashFunction!(hasher, Key))
     *
     * Returns: The number of the inserted elements with a unique key.
     */
-    size_t insert(R)(R range)
-    if (isForwardRange!R && is(ElementType!R == KeyValue))
+    size_t insert(R)(scope R range)
+    if (isForwardRange!R && is(ElementType!R == KeyValue) && !isInfinite!R)
    {
-        size_t count;
-        foreach (e; range)
-        {
-            count += insert(e);
-        }
-        return count;
+        return fold!((acc, x) => acc + insert(x))(range, size_t.init);
    }

    ///
@ -1085,129 +1082,3 @@ if (isHashFunction!(hasher, Key))
    dinos.clear();
    assert(dinos.empty);
 }
-
-@nogc nothrow pure @safe unittest
-{
-    import tanya.range.primitive : isForwardRange;
-    static assert(is(HashTable!(string, int) a));
-    static assert(is(const HashTable!(string, int)));
-    static assert(isForwardRange!(HashTable!(string, int).Range));
-
-    static assert(is(HashTable!(int, int, (ref const int) => size_t.init)));
-    static assert(is(HashTable!(int, int, (int) => size_t.init)));
-}
-
-// Constructs by reference
-@nogc nothrow pure @safe unittest
-{
-    auto hashTable1 = HashTable!(string, int)(7);
-    auto hashTable2 = HashTable!(string, int)(hashTable1);
-    assert(hashTable1.length == hashTable2.length);
-    assert(hashTable1.capacity == hashTable2.capacity);
-}
-
-// Constructs by value
-@nogc nothrow pure @safe unittest
-{
-    auto hashTable = HashTable!(string, int)(HashTable!(string, int)(7));
-    assert(hashTable.capacity == 7);
-}
-
-// Assigns by reference
-@nogc nothrow pure @safe unittest
-{
-    auto hashTable1 = HashTable!(string, int)(7);
-    HashTable!(string, int) hashTable2;
-    hashTable1 = hashTable2;
-    assert(hashTable1.length == hashTable2.length);
-    assert(hashTable1.capacity == hashTable2.capacity);
-}
-
-// Assigns by value
-@nogc nothrow pure @safe unittest
-{
-    HashTable!(string, int) hashTable;
-    hashTable = HashTable!(string, int)(7);
-    assert(hashTable.capacity == 7);
-}
-
-// Postblit copies
-@nogc nothrow pure @safe unittest
-{
-    auto hashTable = HashTable!(string, int)(7);
-    void testFunc(HashTable!(string, int) hashTable)
-    {
-        assert(hashTable.capacity == 7);
-    }
-    testFunc(hashTable);
-}
-
-// Issue 53: https://github.com/caraus-ecms/tanya/issues/53
-@nogc nothrow pure @safe unittest
-{
-    {
-        HashTable!(uint, uint) hashTable;
-        foreach (uint i; 0 .. 14)
-        {
-            hashTable[i + 1] = i;
-        }
-        assert(hashTable.length == 14);
-    }
-    {
-        HashTable!(int, int) hashtable;
-
-        hashtable[1194250162] = 3;
-        hashtable[-1131293824] = 6;
-        hashtable[838100082] = 9;
-
-        hashtable.rehash(11);
-
-        assert(hashtable[-1131293824] == 6);
-    }
-}
-
-@nogc nothrow pure @safe unittest
-{
-    static struct String
-    {
-        bool opEquals(string) const @nogc nothrow pure @safe
-        {
-            return true;
-        }
-
-        bool opEquals(ref const string) const @nogc nothrow pure @safe
-        {
-            return true;
-        }
-
-        bool opEquals(String) const @nogc nothrow pure @safe
-        {
-            return true;
-        }
-
-        bool opEquals(ref const String) const @nogc nothrow pure @safe
-        {
-            return true;
-        }
-
-        size_t toHash() const @nogc nothrow pure @safe
-        {
-            return 0;
-        }
-    }
-    static assert(is(typeof("asdf" in HashTable!(String, int)())));
-    static assert(is(typeof(HashTable!(String, int)()["asdf"])));
-}
-
-// Can have non-copyable keys and elements
-@nogc nothrow pure @safe unittest
-{
-    @NonCopyable @Hashable
-    static struct S
-    {
-        mixin StructStub;
-    }
-    static assert(is(HashTable!(S, int)));
-    static assert(is(HashTable!(int, S)));
-    static assert(is(HashTable!(S, S)));
-}
--- a/source/tanya/container/list.d
+++ b/source/tanya/container/list.d
@ -6,7 +6,7 @@
 * This module contains singly-linked ($(D_PSYMBOL SList)) and doubly-linked
 * ($(D_PSYMBOL DList)) lists.
 *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2021.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -15,15 +15,15 @@
 */
 module tanya.container.list;

-import tanya.algorithm.comparison;
-import tanya.algorithm.mutation;
+import std.algorithm.comparison;
+import std.algorithm.iteration;
 import tanya.container.entry;
-import tanya.memory;
+import tanya.memory.allocator;
+import tanya.memory.lifetime;
 import tanya.meta.trait;
 import tanya.meta.transform;
 import tanya.range.array;
 import tanya.range.primitive;
-version (unittest) import tanya.test.stub;

 /**
 * Forward range for the $(D_PSYMBOL SList).
@ -43,7 +43,7 @@ struct SRange(L)
        assert(this.head !is null);
    }

-    private this(ref EntryPointer head) @trusted
+    private this(return ref EntryPointer head) @trusted
    {
        this.head = &head;
    }
@ -139,7 +139,7 @@ struct SList(T)
     *  init      = Values to initialize the list with.
     *  allocator = Allocator.
     */
-    this(R)(R init, shared Allocator allocator = defaultAllocator)
+    this(R)(scope R init, shared Allocator allocator = defaultAllocator)
    if (!isInfinite!R
     && isInputRange!R
     && isImplicitlyConvertible!(ElementType!R, T))
@ -392,7 +392,7 @@ struct SList(T)
    }

    /// ditto
-    size_t insertFront(R)(R el) @trusted
+    size_t insertFront(R)(scope R el) @trusted
    if (!isInfinite!R
     && isInputRange!R
     && isImplicitlyConvertible!(ElementType!R, T))
@ -497,10 +497,10 @@ struct SList(T)
    }

    /// ditto
-    size_t insertBefore(R)(Range r, R el)
+    size_t insertBefore(R)(Range r, scope R el)
    if (!isInfinite!R
-     && isInputRange!R
-     && isImplicitlyConvertible!(ElementType!R, T))
+        && isInputRange!R
+        && isImplicitlyConvertible!(ElementType!R, T))
    in
    {
        assert(checkRangeBelonging(r));
@ -704,7 +704,7 @@ struct SList(T)
     *
     * Precondition: $(D_PARAM r) is extracted from this list.
     */
-    Range remove(Range r)
+    Range remove(scope Range r)
    in
    {
        assert(checkRangeBelonging(r));
@ -846,7 +846,7 @@ struct SList(T)
     *
     * Returns: $(D_KEYWORD this).
     */
-    ref typeof(this) opAssign(R)(R that) @trusted
+    ref typeof(this) opAssign(R)(scope R that) @trusted
    if (!isInfinite!R
     && isInputRange!R
     && isImplicitlyConvertible!(ElementType!R, T))
@ -924,46 +924,6 @@ struct SList(T)
    assert(i == 3);
 }

-@nogc nothrow pure @safe unittest
-{
-    interface Stuff
-    {
-    }
-    static assert(is(SList!Stuff));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    auto l = SList!int(0, 0);
-    assert(l.empty);
-}
-
-// foreach called using opIndex().
-@nogc nothrow pure @safe unittest
-{
-    SList!int l;
-    size_t i;
-
-    l.insertFront(5);
-    l.insertFront(4);
-    l.insertFront(9);
-    foreach (e; l)
-    {
-        assert(i != 0 || e == 9);
-        assert(i != 1 || e == 4);
-        assert(i != 2 || e == 5);
-        ++i;
-    }
-}
-
-@nogc nothrow pure @safe unittest
-{
-    auto l1 = SList!int();
-    auto l2 = SList!int([9, 4]);
-    l1 = l2[];
-    assert(l1 == l2);
-}
-
 /**
 * Bidirectional range for the $(D_PSYMBOL DList).
 *
@ -984,7 +944,8 @@ struct DRange(L)
        assert(this.tail !is null);
    }

-    private this(ref EntryPointer head, ref EntryPointer tail) @trusted
+    private this(return ref EntryPointer head, return ref EntryPointer tail)
+    @trusted
    {
        this.head = &head;
        this.tail = &tail;
@ -1083,12 +1044,14 @@ struct DList(T)
    // 0th and the last elements of the list.
    private Entry* head, tail;

-    invariant
+    static if (__VERSION__ < 2086) // Bug #20171.
    {
-        assert((this.tail is null && this.head is null)
-            || (this.tail !is null && this.head !is null));
-        assert(this.tail is null || this.tail.next is null);
-        assert(this.head is null || this.head.prev is null);
+        invariant
+        {
+            assert((this.tail is null) == (this.head is null));
+            assert(this.tail is null || this.tail.next is null);
+            assert(this.head is null || this.head.prev is null);
+        }
    }

    /**
@ -1120,7 +1083,7 @@ struct DList(T)
     *  init      = Values to initialize the list with.
     *  allocator = Allocator.
     */
-    this(R)(R init, shared Allocator allocator = defaultAllocator)
+    this(R)(scope R init, shared Allocator allocator = defaultAllocator)
    if (!isInfinite!R
     && isInputRange!R
     && isImplicitlyConvertible!(ElementType!R, T))
@ -1383,11 +1346,12 @@ struct DList(T)

    // Creates a lsit of linked entries from a range.
    // Returns count of the elements in the list.
-    private size_t makeList(R)(ref R el, out Entry* head, out Entry* tail) @trusted
+    private size_t makeList(R)(scope ref R el, out Entry* head, out Entry* tail)
+    @trusted
    out (retLength)
    {
        assert((retLength == 0 && head is null && tail is null)
-            || (retLength > 0 && head !is null && tail !is null));
+                 || (retLength > 0 && head !is null && tail !is null));
    }
    do
    {
@ -1457,7 +1421,7 @@ struct DList(T)
    }

    /// ditto
-    size_t insertFront(R)(R el)
+    size_t insertFront(R)(scope R el)
    if (!isInfinite!R
     && isInputRange!R
     && isImplicitlyConvertible!(ElementType!R, T))
@ -1576,7 +1540,7 @@ struct DList(T)
    }

    /// ditto
-    size_t insertBack(R)(R el) @trusted
+    size_t insertBack(R)(scope R el) @trusted
    if (!isInfinite!R
     && isInputRange!R
     && isImplicitlyConvertible!(ElementType!R, T))
@ -1711,10 +1675,10 @@ struct DList(T)
    }

    /// ditto
-    size_t insertBefore(R)(Range r, R el)
+    size_t insertBefore(R)(Range r, scope R el)
    if (!isInfinite!R
-     && isInputRange!R
-     && isImplicitlyConvertible!(ElementType!R, T))
+        && isInputRange!R
+        && isImplicitlyConvertible!(ElementType!R, T))
    in
    {
        assert(checkRangeBelonging(r));
@ -1828,22 +1792,17 @@ struct DList(T)
    }

    /// ditto
-    size_t insertAfter(R)(Range r, R el)
+    size_t insertAfter(R)(Range r, scope R el)
    if (!isInfinite!R
-     && isInputRange!R
-     && isImplicitlyConvertible!(ElementType!R, T))
+        && isInputRange!R
+        && isImplicitlyConvertible!(ElementType!R, T))
    in
    {
        assert(checkRangeBelonging(r));
    }
    do
    {
-        size_t inserted;
-        foreach (e; el)
-        {
-            inserted += insertAfter(r, e);
-        }
-        return inserted;
+        return fold!((acc, x) => acc + insertAfter(r, x))(el, size_t.init);
    }

    ///
@ -2071,7 +2030,7 @@ struct DList(T)
     *
     * Precondition: $(D_PARAM r) is extracted from this list.
     */
-    Range remove(Range r)
+    Range remove(scope Range r)
    in
    {
        assert(checkRangeBelonging(r));
@ -2241,7 +2200,7 @@ struct DList(T)
     *
     * Returns: $(D_KEYWORD this).
     */
-    ref typeof(this) opAssign(R)(R that) @trusted
+    ref typeof(this) opAssign(R)(scope R that) @trusted
    if (!isInfinite!R
     && isInputRange!R
     && isImplicitlyConvertible!(ElementType!R, T))
@ -2318,82 +2277,3 @@ struct DList(T)
    }
    assert(i == 3);
 }
-
-@nogc nothrow pure @safe unittest
-{
-    class A
-    {
-    }
-    static assert(is(SList!(A*)));
-    static assert(is(DList!(A*)));
-}
-
-// Removes all elements
-@nogc nothrow pure @safe unittest
-{
-    auto l = DList!int([5]);
-    assert(l.remove(l[]).empty);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    auto l1 = DList!int([5, 234, 30, 1]);
-    auto l2 = DList!int([5, 1]);
-    auto r = l1[];
-
-    r.popFront();
-    r.popBack();
-    assert(r.front == 234);
-    assert(r.back == 30);
-
-    assert(!l1.remove(r).empty);
-    assert(l1 == l2);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    auto l = DList!int(0, 0);
-    assert(l.empty);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    auto l1 = DList!int([5, 234]);
-    assert(l1.head is l1.head.next.prev);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    DList!int l;
-    l.insertAfter(l[], 234);
-    assert(l.front == 234);
-    assert(l.back == 234);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    auto l1 = DList!int();
-    auto l2 = DList!int([9, 4]);
-    l1 = l2[];
-    assert(l1 == l2);
-}
-
-// Sets the new head
-@nogc nothrow pure @safe unittest
-{
-    auto l1 = DList!int([5, 234, 30, 1]);
-    auto l2 = DList!int([1]);
-    auto r = l1[];
-
-    r.popBack();
-
-    assert(!l1.remove(r).empty);
-    assert(l1 == l2);
-}
-
-// Can have non-copyable elements
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(SList!NonCopyable));
-    static assert(is(DList!NonCopyable));
-}
--- a/source/tanya/container/package.d
+++ b/source/tanya/container/package.d
@ -5,7 +5,7 @@
 /**
 * Abstract data types whose instances are collections of other objects.
 *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
--- a/source/tanya/container/set.d
+++ b/source/tanya/container/set.d
@ -6,7 +6,7 @@
 * This module implements a $(D_PSYMBOL Set) container that stores unique
 * values without any particular order.
 *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -18,11 +18,11 @@ module tanya.container.set;
 import tanya.container.array;
 import tanya.container.entry;
 import tanya.hash.lookup;
-import tanya.memory;
+import tanya.memory.allocator;
+import tanya.memory.lifetime;
 import tanya.meta.trait;
 import tanya.meta.transform;
 import tanya.range.primitive;
-version (unittest) import tanya.test.stub;

 /**
 * Bidirectional range that iterates over the $(D_PSYMBOL Set)'s values.
@ -172,7 +172,7 @@ if (isHashFunction!(hasher, T))
    {
        assert(this.data.lengthIndex < primes.length);
        assert(this.data.array.length == 0
-            || this.data.array.length == primes[this.data.lengthIndex]);
+                || this.data.array.length == primes[this.data.lengthIndex]);
    }

    /**
@ -259,14 +259,17 @@ if (isHashFunction!(hasher, T))
     *
     * Precondition: $(D_INLINECODE allocator !is null).
     */
-    this(R)(R range, shared Allocator allocator = defaultAllocator)
-    if (isForwardRange!R && isImplicitlyConvertible!(ElementType!R, T))
+    this(R)(scope R range, shared Allocator allocator = defaultAllocator)
+    if (isForwardRange!R
+     && isImplicitlyConvertible!(ElementType!R, T)
+     && !isInfinite!R)
    in
    {
        assert(allocator !is null);
    }
    do
    {
+        this(allocator);
        insert(range);
    }

@ -297,6 +300,7 @@ if (isHashFunction!(hasher, T))
    }
    do
    {
+        this(allocator);
        insert(array[]);
    }

@ -509,8 +513,10 @@ if (isHashFunction!(hasher, T))
     *
     * Returns: The number of new elements inserted.
     */
-    size_t insert(R)(R range)
-    if (isForwardRange!R && isImplicitlyConvertible!(ElementType!R, T))
+    size_t insert(R)(scope R range)
+    if (isForwardRange!R
+     && isImplicitlyConvertible!(ElementType!R, T)
+     && !isInfinite!R)
    {
        size_t count;
        foreach (e; range)
@ -638,150 +644,3 @@ if (isHashFunction!(hasher, T))
        assert(set[].back == 8);
    }
 }
-
-// Basic insertion logic.
-@nogc nothrow pure @safe unittest
-{
-    Set!int set;
-
-    assert(set.insert(5) == 1);
-    assert(5 in set);
-    assert(set.data.array.length == 3);
-
-    assert(set.insert(5) == 0);
-    assert(5 in set);
-    assert(set.data.array.length == 3);
-
-    assert(set.insert(9) == 1);
-    assert(9 in set);
-    assert(5 in set);
-    assert(set.data.array.length == 3);
-
-    assert(set.insert(7) == 1);
-    assert(set.insert(8) == 1);
-    assert(8 in set);
-    assert(5 in set);
-    assert(9 in set);
-    assert(7 in set);
-    assert(set.data.array.length == 7);
-
-    assert(set.insert(16) == 1);
-    assert(16 in set);
-    assert(set.data.array.length == 7);
-}
-
-// Static checks.
-@nogc nothrow pure @safe unittest
-{
-    import tanya.range.primitive;
-
-    static assert(isBidirectionalRange!(Set!int.ConstRange));
-    static assert(isBidirectionalRange!(Set!int.Range));
-
-    static assert(!isInfinite!(Set!int.Range));
-    static assert(!hasLength!(Set!int.Range));
-
-    static assert(is(Set!uint));
-    static assert(is(Set!long));
-    static assert(is(Set!ulong));
-    static assert(is(Set!short));
-    static assert(is(Set!ushort));
-    static assert(is(Set!bool));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    const Set!int set;
-    assert(set[].empty);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    Set!int set;
-    set.insert(8);
-
-    auto r1 = set[];
-    auto r2 = r1.save();
-
-    r1.popFront();
-    assert(r1.empty);
-
-    r2.popBack();
-    assert(r2.empty);
-}
-
-// Initial capacity is 0.
-@nogc nothrow pure @safe unittest
-{
-    auto set = Set!int(defaultAllocator);
-    assert(set.capacity == 0);
-}
-
-// Capacity is set to a prime.
-@nogc nothrow pure @safe unittest
-{
-    auto set = Set!int(8);
-    assert(set.capacity == 13);
-}
-
-// Constructs by reference
-@nogc nothrow pure @safe unittest
-{
-    auto set1 = Set!int(7);
-    auto set2 = Set!int(set1);
-    assert(set1.length == set2.length);
-    assert(set1.capacity == set2.capacity);
-}
-
-// Constructs by value
-@nogc nothrow pure @safe unittest
-{
-    auto set = Set!int(Set!int(7));
-    assert(set.capacity == 7);
-}
-
-// Assigns by reference
-@nogc nothrow pure @safe unittest
-{
-    auto set1 = Set!int(7);
-    Set!int set2;
-    set1 = set2;
-    assert(set1.length == set2.length);
-    assert(set1.capacity == set2.capacity);
-}
-
-// Assigns by value
-@nogc nothrow pure @safe unittest
-{
-    Set!int set;
-    set = Set!int(7);
-    assert(set.capacity == 7);
-}
-
-// Postblit copies
-@nogc nothrow pure @safe unittest
-{
-    auto set = Set!int(7);
-    void testFunc(Set!int set)
-    {
-        assert(set.capacity == 7);
-    }
-    testFunc(set);
-}
-
-// Hasher can take argument by ref
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(Set!(int, (const ref x) => cast(size_t) x)));
-}
-
-// Can have non-copyable elements
-@nogc nothrow pure @safe unittest
-{
-    @NonCopyable @Hashable
-    static struct S
-    {
-        mixin StructStub;
-    }
-    static assert(is(Set!S));
-}
--- a/source/tanya/container/string.d
+++ b/source/tanya/container/string.d
@ -17,7 +17,7 @@
 * Internally $(D_PSYMBOL String) is represented by a sequence of
 * $(D_KEYWORD char)s.
 *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -26,20 +26,17 @@
 */
 module tanya.container.string;

-import tanya.algorithm.comparison;
+import std.algorithm.comparison;
+import std.algorithm.mutation : bringToFront;
 import tanya.algorithm.mutation;
 import tanya.hash.lookup;
-import tanya.memory;
+import tanya.memory.allocator;
+import tanya.memory.lifetime;
 import tanya.meta.trait;
 import tanya.meta.transform;
 import tanya.range.array;
 import tanya.range.primitive;

-version (unittest)
-{
-    import tanya.test.assertion;
-}
-
 /**
 * Thrown on encoding errors.
 */
@ -339,7 +336,7 @@ struct String
    private char* data;
    private size_t capacity_;

-    pure nothrow @safe @nogc invariant
+    @nogc nothrow pure @safe invariant
    {
        assert(this.length_ <= this.capacity_);
    }
@ -497,12 +494,6 @@ struct String
        }
    }

-    @nogc nothrow pure @safe unittest
-    {
-        auto s = String(0, 'K');
-        assert(s.length == 0);
-    }
-
    this(this) @nogc nothrow pure @trusted
    {
        auto buf = this.data[0 .. this.length_];
@ -602,13 +593,6 @@ struct String
        return ret;
    }

-    // Allocates enough space for 3-byte character.
-    @nogc pure @safe unittest
-    {
-        String s;
-        s.insertBack('\u8100');
-    }
-
    /// ditto
    size_t insertBack(const dchar chr) @nogc pure @trusted
    {
@ -630,12 +614,6 @@ struct String
        }
    }

-    @nogc pure @safe unittest
-    {
-        assertThrown!UTFException(() => String(1, cast(dchar) 0xd900));
-        assertThrown!UTFException(() => String(1, cast(wchar) 0xd900));
-    }
-
    /**
     * Inserts a stringish range at the end of the string.
     *
@ -1281,29 +1259,29 @@ struct String
    int opCmp(S)(auto ref S that) const @trusted
    if (is(Unqual!S == String))
    {
-        return compare(this.data[0 .. length], that.data[0 .. that.length]);
+        return cmp(this.data[0 .. length], that.data[0 .. that.length]);
    }

    /// ditto
    int opCmp(S)(ByCodeUnit!S that) const @trusted
    if (is(Unqual!S == char))
    {
-        return compare(this.data[0 .. length],
-                       that.begin[0 .. that.end - that.begin]);
+        return cmp(this.data[0 .. length],
+            that.begin[0 .. that.end - that.begin]);
    }

    /// ditto
    int opCmp(S)(ByCodePoint!S that) const @trusted
    if (is(Unqual!S == char))
    {
-        return compare(this.data[0 .. length],
-                       that.begin[0 .. that.end - that.begin]);
+        return cmp(this.data[0 .. length],
+            that.begin[0 .. that.end - that.begin]);
    }

    /// ditto
    int opCmp()(const char[] that) const @trusted
    {
-        return compare(this.data[0 .. length], that);
+        return cmp(this.data[0 .. length], that);
    }

    ///
@ -1418,40 +1396,18 @@ struct String
        return opSliceAssign(value, 0, length);
    }

-    @nogc nothrow pure @safe unittest
-    {
-        auto s1 = String("Buttercup");
-        auto s2 = String("Cap");
-        s2[] = s1[6 .. $];
-        assert(s2 == "cup");
-    }
-
    /// ditto
    ByCodeUnit!char opIndexAssign(const char value) @nogc nothrow pure @safe
    {
        return opSliceAssign(value, 0, length);
    }

-    @nogc nothrow pure @safe unittest
-    {
-        auto s1 = String("Wow");
-        s1[] = 'a';
-        assert(s1 == "aaa");
-    }
-
    /// ditto
    ByCodeUnit!char opIndexAssign(const char[] value) @nogc nothrow pure @safe
    {
        return opSliceAssign(value, 0, length);
    }

-    @nogc nothrow pure @safe unittest
-    {
-        auto s1 = String("ö");
-        s1[] = "oe";
-        assert(s1 == "oe");
-    }
-
    /**
     * Remove all characters beloning to $(D_PARAM r).
     *
@ -1483,7 +1439,7 @@ struct String
    ///
    @nogc pure @safe unittest
    {
-        import tanya.algorithm.searching : count;
+        import std.algorithm.searching : count;

        auto s = String("Из пословицы слова не выкинешь.");

@ -1518,9 +1474,9 @@ struct String
     */
    size_t insertAfter(T, R)(R r, T el) @trusted
    if ((isSomeChar!T || (!isInfinite!T
-     && isInputRange!T
-     && isSomeChar!(ElementType!T)))
-     && (is(R == ByCodeUnit!char) || is(R == ByCodePoint!char)))
+        && isInputRange!T
+        && isSomeChar!(ElementType!T)))
+        && (is(R == ByCodeUnit!char) || is(R == ByCodePoint!char)))
    in
    {
        assert(r.container is &this);
@ -1533,7 +1489,7 @@ struct String
        const after = r.end - this.data;
        const inserted = insertBack(el);

-        rotate(this.data[after .. oldLength], this.data[oldLength .. length]);
+        bringToFront(this.data[after .. oldLength], this.data[oldLength .. length]);
        return inserted;
    }

@ -1552,9 +1508,9 @@ struct String
    ///
    size_t insertBefore(T, R)(R r, T el) @trusted
    if ((isSomeChar!T || (!isInfinite!T
-     && isInputRange!T
-     && isSomeChar!(ElementType!T)))
-     && (is(R == ByCodeUnit!char) || is(R == ByCodePoint!char)))
+        && isInputRange!T
+        && isSomeChar!(ElementType!T)))
+        && (is(R == ByCodeUnit!char) || is(R == ByCodePoint!char)))
    in
    {
        assert(r.container is &this);
@ -1590,76 +1546,3 @@ struct String

    mixin DefaultAllocator;
 }
-
-// Postblit works
-@nogc nothrow pure @safe unittest
-{
-    void internFunc(String arg)
-    {
-    }
-    void middleFunc(S...)(S args)
-    {
-        foreach (arg; args)
-        {
-            internFunc(arg);
-        }
-    }
-    void topFunc(String args)
-    {
-        middleFunc(args);
-    }
-    topFunc(String("asdf"));
-}
-
-// Const range produces mutable ranges
-@nogc pure @safe unittest
-{
-    auto s = const String("И снизу лед, и сверху - маюсь между.");
-    {
-        const constRange = s[];
-
-        auto fromConstRange = constRange[];
-        fromConstRange.popFront();
-        assert(fromConstRange.front == s[1]);
-
-        fromConstRange = constRange[0 .. $];
-        fromConstRange.popFront();
-        assert(fromConstRange.front == s[1]);
-
-        assert(constRange.get() is s.get());
-    }
-    {
-        const constRange = s.byCodePoint();
-
-        auto fromConstRange = constRange[];
-        fromConstRange.popFront();
-        assert(fromConstRange.front == ' ');
-    }
-}
-
-// Can pop multibyte characters
-@nogc pure @safe unittest
-{
-    auto s = String("\U00024B62\U00002260");
-    auto range = s.byCodePoint();
-
-    range.popFront();
-    assert(!range.empty);
-
-    range.popFront();
-    assert(range.empty);
-
-    range = s.byCodePoint();
-    range.popFront();
-    s[$ - 3] = 0xf0;
-    assertThrown!UTFException(&(range.popFront));
-}
-
-// Inserts own char range correctly
-@nogc nothrow pure @safe unittest
-{
-    auto s1 = String(`ü`);
-    String s2;
-    s2.insertBack(s1[]);
-    assert(s1 == s2);
-}
--- a/source/tanya/conv.d
+++ b/source/tanya/conv.d
@ -5,7 +5,7 @@
 /**
 * This module provides functions for converting between different types.
 *
- * Copyright: Eugene Wissner 2017-2019.
+ * Copyright: Eugene Wissner 2017-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -14,284 +14,12 @@
 */
 module tanya.conv;

-import tanya.algorithm.mutation;
+import std.traits : Unsigned, isNumeric;
 import tanya.container.string;
-import tanya.format;
-import tanya.memory;
-import tanya.memory.op;
+import tanya.memory.allocator;
 import tanya.meta.trait;
 import tanya.meta.transform;
-import tanya.range.array;
-import tanya.range.primitive;
-
-version (unittest)
-{
-    import tanya.test.assertion;
-    import tanya.test.stub;
-}
-
-/**
- * Constructs a new object of type $(D_PARAM T) in $(D_PARAM memory) with the
- * given arguments.
- *
- * If $(D_PARAM T) is a $(D_KEYWORD class), emplace returns a class reference
- * of type $(D_PARAM T), otherwise a pointer to the constructed object is
- * returned.
- *
- * If $(D_PARAM T) is a nested class inside another class, $(D_PARAM outer)
- * should be an instance of the outer class.
- *
- * $(D_PARAM args) are arguments for the constructor of $(D_PARAM T). If
- * $(D_PARAM T) isn't an aggregate type and doesn't have a constructor,
- * $(D_PARAM memory) can be initialized to `args[0]` if `Args.length == 1`,
- * `Args[0]` should be implicitly convertible to $(D_PARAM T) then.
- *
- * Params:
- *  T     = Constructed type.
- *  U     = Type of the outer class if $(D_PARAM T) is a nested class.
- *  Args  = Types of the constructor arguments if $(D_PARAM T) has a constructor
- *          or the type of the initial value.
- *  outer = Outer class instance if $(D_PARAM T) is a nested class.
- *  args  = Constructor arguments if $(D_PARAM T) has a constructor or the
- *          initial value.
- *
- * Returns: New instance of type $(D_PARAM T) constructed in $(D_PARAM memory).
- *
- * Precondition: `memory.length == stateSize!T`.
- * Postcondition: $(D_PARAM memory) and the result point to the same memory.
- */
-T emplace(T, U, Args...)(void[] memory, U outer, auto ref Args args)
-if (!isAbstractClass!T && isInnerClass!T && is(typeof(T.outer) == U))
-in (memory.length >= stateSize!T)
-out (result; memory.ptr is (() @trusted => cast(void*) result)())
-{
-    copy(typeid(T).initializer, memory);
-
-    auto result = (() @trusted => cast(T) memory.ptr)();
-    result.outer = outer;
-
-    static if (is(typeof(result.__ctor(args))))
-    {
-        result.__ctor(args);
-    }
-
-    return result;
-}
-
-/// ditto
-T emplace(T, Args...)(void[] memory, auto ref Args args)
-if (is(T == class) && !isAbstractClass!T && !isInnerClass!T)
-in (memory.length == stateSize!T)
-out (result; memory.ptr is (() @trusted => cast(void*) result)())
-{
-    copy(typeid(T).initializer, memory);
-
-    auto result = (() @trusted => cast(T) memory.ptr)();
-    static if (is(typeof(result.__ctor(args))))
-    {
-        result.__ctor(args);
-    }
-    return result;
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    import tanya.memory : stateSize;
-
-    class C
-    {
-        int i = 5;
-        class Inner
-        {
-            int i;
-
-            this(int param) pure nothrow @safe @nogc
-            {
-                this.i = param;
-            }
-        }
-    }
-    ubyte[stateSize!C] memory1;
-    ubyte[stateSize!(C.Inner)] memory2;
-
-    auto c = emplace!C(memory1);
-    assert(c.i == 5);
-
-    auto inner = emplace!(C.Inner)(memory2, c, 8);
-    assert(c.i == 5);
-    assert(inner.i == 8);
-    assert(inner.outer is c);
-}
-
-/// ditto
-T* emplace(T, Args...)(void[] memory, auto ref Args args)
-if (!isAggregateType!T && (Args.length <= 1))
-in (memory.length >= T.sizeof)
-out (result; memory.ptr is result)
-{
-    auto result = (() @trusted => cast(T*) memory.ptr)();
-    static if (Args.length == 1)
-    {
-        *result = T(args[0]);
-    }
-    else
-    {
-        *result = T.init;
-    }
-    return result;
-}
-
-private void initializeOne(T)(ref void[] memory, ref T* result) @trusted
-{
-    static if (!hasElaborateAssign!T && isAssignable!T)
-    {
-        *result = T.init;
-    }
-    else static if (__VERSION__ >= 2083 // __traits(isZeroInit) available.
-        && __traits(isZeroInit, T))
-    {
-        memory.ptr[0 .. T.sizeof].fill!0;
-    }
-    else
-    {
-        static immutable T init = T.init;
-        copy((&init)[0 .. 1], memory);
-    }
-}
-
-/// ditto
-T* emplace(T, Args...)(void[] memory, auto ref Args args)
-if (!isPolymorphicType!T && isAggregateType!T)
-in (memory.length >= T.sizeof)
-out (result; memory.ptr is result)
-{
-    auto result = (() @trusted => cast(T*) memory.ptr)();
-
-    static if (Args.length == 0)
-    {
-        static assert(is(typeof({ static T t; })),
-                      "Default constructor is disabled");
-        initializeOne(memory, result);
-    }
-    else static if (is(typeof(result.__ctor(args))))
-    {
-        initializeOne(memory, result);
-        result.__ctor(args);
-    }
-    else static if (Args.length == 1 && is(typeof({ T t = args[0]; })))
-    {
-        ((ref arg) @trusted =>
-            copy((cast(void*) &arg)[0 .. T.sizeof], memory))(args[0]);
-        static if (hasElaborateCopyConstructor!T)
-        {
-            result.__postblit();
-        }
-    }
-    else static if (is(typeof({ T t = T(args); })))
-    {
-        auto init = T(args);
-        (() @trusted => moveEmplace(init, *result))();
-    }
-    else
-    {
-        static assert(false,
-                      "Unable to construct value with the given arguments");
-    }
-    return result;
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    ubyte[4] memory;
-
-    auto i = emplace!int(memory);
-    static assert(is(typeof(i) == int*));
-    assert(*i == 0);
-
-    i = emplace!int(memory, 5);
-    assert(*i == 5);
-
-    static struct S
-    {
-        int i;
-        @disable this();
-        @disable this(this);
-        this(int i) @nogc nothrow pure @safe
-        {
-            this.i = i;
-        }
-    }
-    auto s = emplace!S(memory, 8);
-    static assert(is(typeof(s) == S*));
-    assert(s.i == 8);
-}
-
-// Handles "Cannot access frame pointer" error.
-@nogc nothrow pure @safe unittest
-{
-    struct F
-    {
-        ~this() @nogc nothrow pure @safe
-        {
-        }
-    }
-    static assert(is(typeof(emplace!F((void[]).init))));
-}
-
-// Can emplace structs without a constructor
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(typeof(emplace!WithDtor(null, WithDtor()))));
-    static assert(is(typeof(emplace!WithDtor(null))));
-}
-
-// Doesn't call a destructor on uninitialized elements
-@nogc nothrow pure @system unittest
-{
-    static struct SWithDtor
-    {
-        private bool canBeInvoked = false;
-        ~this() @nogc nothrow pure @safe
-        {
-            assert(this.canBeInvoked);
-        }
-    }
-    void[SWithDtor.sizeof] memory = void;
-    auto actual = emplace!SWithDtor(memory[], SWithDtor(true));
-    assert(actual.canBeInvoked);
-}
-
-// Initializes structs if no arguments are given
-@nogc nothrow pure @safe unittest
-{
-    static struct SEntry
-    {
-        byte content;
-    }
-    ubyte[1] mem = [3];
-
-    assert(emplace!SEntry(cast(void[]) mem[0 .. 1]).content == 0);
-}
-
-// Postblit is called when emplacing a struct
-@nogc nothrow pure @system unittest
-{
-    static struct S
-    {
-        bool called = false;
-        this(this) @nogc nothrow pure @safe
-        {
-            this.called = true;
-        }
-    }
-    S target;
-    S* sp = &target;
-
-    emplace!S(sp[0 .. 1], S());
-    assert(target.called);
-}
+import tanya.range;

 /**
 * Thrown if a type conversion fails.
@ -332,9 +60,9 @@ final class ConvException : Exception
 */
 package T readIntegral(T, R)(ref R range, const ubyte base = 10)
 if (isInputRange!R
- && isSomeChar!(ElementType!R)
- && isIntegral!T
- && isUnsigned!T)
+        && isSomeChar!(ElementType!R)
+        && isIntegral!T
+        && isUnsigned!T)
 in
 {
    assert(base >= 2);
@ -408,86 +136,6 @@ do
    return n;
 }

-// ':' is not a hex value
-@nogc nothrow pure @safe unittest
-{
-    string colon = ":";
-    auto actual = readIntegral!ubyte(colon, 16);
-    assert(actual == 0);
-    assert(colon.length == 1);
-}
-
-// reads ubyte.max
-@nogc nothrow pure @safe unittest
-{
-    string number = "255";
-    assert(readIntegral!ubyte(number) == 255);
-    assert(number.empty);
-}
-
-// detects integer overflow
-@nogc nothrow pure @safe unittest
-{
-    string number = "500";
-    readIntegral!ubyte(number);
-    assert(number.front == '0');
-    assert(number.length == 1);
-}
-
-// stops on a non-digit
-@nogc nothrow pure @safe unittest
-{
-    string number = "10-";
-    readIntegral!ubyte(number);
-    assert(number.front == '-');
-}
-
-// returns false if the number string is empty
-@nogc nothrow pure @safe unittest
-{
-    string number = "";
-    readIntegral!ubyte(number);
-    assert(number.empty);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    string number = "29";
-    assert(readIntegral!ubyte(number) == 29);
-    assert(number.empty);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    string number = "25467";
-    readIntegral!ubyte(number);
-    assert(number.front == '6');
-}
-
-// Converts lower case hexadecimals
-@nogc nothrow pure @safe unittest
-{
-    string number = "a";
-    assert(readIntegral!ubyte(number, 16) == 10);
-    assert(number.empty);
-}
-
-// Converts upper case hexadecimals
-@nogc nothrow pure @safe unittest
-{
-    string number = "FF";
-    assert(readIntegral!ubyte(number, 16) == 255);
-    assert(number.empty);
-}
-
-// Handles small overflows
-@nogc nothrow pure @safe unittest
-{
-    string number = "256";
-    assert(readIntegral!ubyte(number, 10) == 25);
-    assert(number.front == '6');
-}
-
 /**
 * If the source type $(D_PARAM From) and the target type $(D_PARAM To) are
 * equal, does nothing. If $(D_PARAM From) can be implicitly converted to
@ -527,12 +175,6 @@ template to(To)
    static assert(is(typeof(val) == int));
 }

-@nogc nothrow pure @safe unittest
-{
-    int val = 5;
-    assert(val.to!int() == 5);
-}
-
 /**
 * Performs checked conversion from an integral type $(D_PARAM From) to an
 * integral type $(D_PARAM To).
@ -595,83 +237,6 @@ if (isIntegral!From
    }
 }

-@nogc nothrow pure @safe unittest
-{
-    // ubyte -> ushort
-    assert((cast(ubyte) 0).to!ushort == 0);
-    assert((cast(ubyte) 1).to!ushort == 1);
-    assert((cast(ubyte) (ubyte.max - 1)).to!ushort == ubyte.max - 1);
-    assert((cast(ubyte) ubyte.max).to!ushort == ubyte.max);
-
-    // ubyte -> short
-    assert((cast(ubyte) 0).to!short == 0);
-    assert((cast(ubyte) 1).to!short == 1);
-    assert((cast(ubyte) (ubyte.max - 1)).to!short == ubyte.max - 1);
-    assert((cast(ubyte) ubyte.max).to!short == ubyte.max);
-}
-
-@nogc pure @safe unittest
-{
-    // ubyte <- ushort
-    assert((cast(ushort) 0).to!ubyte == 0);
-    assert((cast(ushort) 1).to!ubyte == 1);
-    assert((cast(ushort) (ubyte.max - 1)).to!ubyte == ubyte.max - 1);
-    assert((cast(ushort) ubyte.max).to!ubyte == ubyte.max);
-
-    // ubyte <- short
-    assert((cast(short) 0).to!ubyte == 0);
-    assert((cast(short) 1).to!ubyte == 1);
-    assert((cast(short) (ubyte.max - 1)).to!ubyte == ubyte.max - 1);
-    assert((cast(short) ubyte.max).to!ubyte == ubyte.max);
-
-    // short <-> int
-    assert(short.min.to!int == short.min);
-    assert((short.min + 1).to!int == short.min + 1);
-    assert((cast(short) -1).to!int == -1);
-    assert((cast(short) 0).to!int == 0);
-    assert((cast(short) 1).to!int == 1);
-    assert((short.max - 1).to!int == short.max - 1);
-    assert(short.max.to!int == short.max);
-
-    assert((cast(int) short.min).to!short == short.min);
-    assert((cast(int) short.min + 1).to!short == short.min + 1);
-    assert((cast(int) -1).to!short == -1);
-    assert((cast(int) 0).to!short == 0);
-    assert((cast(int) 1).to!short == 1);
-    assert((cast(int) short.max - 1).to!short == short.max - 1);
-    assert((cast(int) short.max).to!short == short.max);
-
-    // uint <-> int
-    assert((cast(uint) 0).to!int == 0);
-    assert((cast(uint) 1).to!int == 1);
-    assert((cast(uint) (int.max - 1)).to!int == int.max - 1);
-    assert((cast(uint) int.max).to!int == int.max);
-
-    assert((cast(int) 0).to!uint == 0);
-    assert((cast(int) 1).to!uint == 1);
-    assert((cast(int) (int.max - 1)).to!uint == int.max - 1);
-    assert((cast(int) int.max).to!uint == int.max);
-}
-
-@nogc pure @safe unittest
-{
-    assertThrown!ConvException(&to!(short, int), int.min);
-    assertThrown!ConvException(&to!(short, int), int.max);
-    assertThrown!ConvException(&to!(ushort, uint), uint.max);
-    assertThrown!ConvException(&to!(uint, int), -1);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    enum Test : int
-    {
-        one,
-        two,
-    }
-    assert(Test.one.to!int == 0);
-    assert(Test.two.to!int == 1);
-}
-
 /**
 * Converts a floating point number to an integral type.
 *
@ -714,13 +279,6 @@ if (isFloatingPoint!From
    assert(2147483646.5.to!uint == 2147483646);
 }

-@nogc pure @safe unittest
-{
-    assertThrown!ConvException(&to!(int, double), 2147483647.5);
-    assertThrown!ConvException(&to!(int, double), -2147483648.5);
-    assertThrown!ConvException(&to!(uint, double), -21474.5);
-}
-
 /**
 * Performs checked conversion from an integral type $(D_PARAM From) to an
 * $(D_KEYWORD enum).
@ -762,16 +320,6 @@ if (isIntegral!From && is(To == enum))
    assert(1.to!Test == Test.two);
 }

-@nogc pure @safe unittest
-{
-    enum Test : uint
-    {
-        one,
-        two,
-    }
-    assertThrown!ConvException(&to!(Test, int), 5);
-}
-
 /**
 * Converts $(D_PARAM from) to a boolean.
 *
@ -823,12 +371,6 @@ if (isNumeric!From && is(Unqual!To == bool) && !is(Unqual!To == Unqual!From))
    assert(1.to!bool);
 }

-@nogc pure @safe unittest
-{
-    assertThrown!ConvException(&to!(bool, int), -1);
-    assertThrown!ConvException(&to!(bool, int), 2);
-}
-
 /// ditto
 To to(To, From)(auto ref const From from)
 if ((is(From == String) || isSomeString!From) && is(Unqual!To == bool))
@ -855,11 +397,6 @@ if ((is(From == String) || isSomeString!From) && is(Unqual!To == bool))

 }

-@nogc pure @safe unittest
-{
-    assertThrown!ConvException(() => "1".to!bool);
-}
-
 /**
 * Converts a boolean to $(D_PARAM To).
 *
@ -1026,12 +563,5 @@ if (isInputRange!From && isSomeChar!(ElementType!From) && isIntegral!To)
    assert("010".to!int() == 8);
    assert("-010".to!int() == -8);

-
    assert("-128".to!byte == cast(byte) -128);
-
-    assertThrown!ConvException(() => "".to!int);
-    assertThrown!ConvException(() => "-".to!int);
-    assertThrown!ConvException(() => "-5".to!uint);
-    assertThrown!ConvException(() => "-129".to!byte);
-    assertThrown!ConvException(() => "256".to!ubyte);
 }
--- a/source/tanya/encoding/ascii.d
+++ b/source/tanya/encoding/ascii.d
@ -1,501 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Functions operating on ASCII characters.
- *
- * ASCII is $(B A)merican $(B S)tandard $(B C)ode for $(B I)nformation
- * $(B I)nterchange.
- *
- * Copyright: Eugene Wissner 2017-2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/encoding/ascii.d,
- *                 tanya/encoding/ascii.d)
- */
-module tanya.encoding.ascii;
-
-import tanya.meta.trait;
-
-immutable string fullHexDigits = "0123456789ABCDEFabcdef"; /// 0..9A..Fa..f.
-immutable string hexDigits = "0123456789ABCDEF"; /// 0..9A..F.
-immutable string lowerHexDigits = "0123456789abcdef"; /// 0..9a..f.
-immutable string digits = "0123456789"; /// 0..9.
-immutable string octalDigits = "01234567"; /// 0..7.
-
-/// A..Za..z.
-immutable string letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-immutable string uppercase = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; /// A..Z.
-immutable string lowercase = "abcdefghijklmnopqrstuvwxyz"; /// a..z.
-
-/**
- * Whitespace, Horizontal Tab (HT), Line Feed (LF), Carriage Return (CR),
- * Vertical Tab (VT) or Form Feed (FF).
- */
-immutable string whitespace = "\t\n\v\f\r ";
-
-/// Letter case specifier.
-enum LetterCase : bool
-{
-    upper, /// Uppercase.
-    lower, /// Lowercase.
-}
-
-/**
- * Checks for an uppecase alphabetic character.
- *
- * Params:
- *  C = Some character type.
- *  c = Some character.
- *
- * Returns: $(D_KEYWORD true) if $(D_PARAM c) is an uppercase alphabetic
- *          character, $(D_KEYWORD false) otherwise.
- */
-bool isUpper(C)(C c)
-if (isSomeChar!C)
-{
-    return (c >= 'A') && (c <= 'Z');
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    assert(isUpper('A'));
-    assert(isUpper('Z'));
-    assert(isUpper('L'));
-    assert(!isUpper('a'));
-    assert(!isUpper('!'));
-}
-
-/**
- * Checks for a lowercase alphabetic character.
- *
- * Params:
- *  C = Some character type.
- *  c = Some character.
- *
- * Returns: $(D_KEYWORD true) if $(D_PARAM c) is a lowercase alphabetic
- *          character, $(D_KEYWORD false) otherwise.
- */
-bool isLower(C)(C c)
-if (isSomeChar!C)
-{
-    return (c >= 'a') && (c <= 'z');
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    assert(isLower('a'));
-    assert(isLower('z'));
-    assert(isLower('l'));
-    assert(!isLower('A'));
-    assert(!isLower('!'));
-}
-
-/**
- * Checks for an alphabetic character (upper- or lowercase).
- *
- * Params:
- *  C = Some character type.
- *  c = Some character.
- *
- * Returns: $(D_KEYWORD true) if $(D_PARAM c) is an alphabetic character,
- *          $(D_KEYWORD false) otherwise.
- */
-bool isAlpha(C)(C c)
-if (isSomeChar!C)
-{
-    return isUpper(c) || isLower(c);
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    assert(isAlpha('A'));
-    assert(isAlpha('Z'));
-    assert(isAlpha('L'));
-    assert(isAlpha('a'));
-    assert(isAlpha('z'));
-    assert(isAlpha('l'));
-    assert(!isAlpha('!'));
-}
-
-/**
- * Checks for a digit.
- *
- * Params:
- *  C = Some character type.
- *  c = Some character.
- *
- * Returns: $(D_KEYWORD true) if $(D_PARAM c) is a digit,
- *          $(D_KEYWORD false) otherwise.
- */
-bool isDigit(C)(C c)
-if (isSomeChar!C)
-{
-    return (c >= '0') && (c <= '9');
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    assert(isDigit('0'));
-    assert(isDigit('1'));
-    assert(isDigit('2'));
-    assert(isDigit('3'));
-    assert(isDigit('4'));
-    assert(isDigit('5'));
-    assert(isDigit('6'));
-    assert(isDigit('7'));
-    assert(isDigit('8'));
-    assert(isDigit('9'));
-    assert(!isDigit('a'));
-    assert(!isDigit('!'));
-}
-
-/**
- * Checks for an alphabetic character (upper- or lowercase) or a digit.
- *
- * Params:
- *  C = Some character type.
- *  c = Some character.
- *
- * Returns: $(D_KEYWORD true) if $(D_PARAM c) is an alphabetic character or a
- *          digit, $(D_KEYWORD false) otherwise.
- */
-bool isAlphaNum(C)(C c)
-if (isSomeChar!C)
-{
-    return isAlpha(c) || isDigit(c);
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    assert(isAlphaNum('0'));
-    assert(isAlphaNum('1'));
-    assert(isAlphaNum('9'));
-    assert(isAlphaNum('A'));
-    assert(isAlphaNum('Z'));
-    assert(isAlphaNum('L'));
-    assert(isAlphaNum('a'));
-    assert(isAlphaNum('z'));
-    assert(isAlphaNum('l'));
-    assert(!isAlphaNum('!'));
-}
-
-/**
- * Checks for a 7-bit ASCII character.
- *
- * Params:
- *  C = Some character type.
- *  c = Some character.
- *
- * Returns: $(D_KEYWORD true) if $(D_PARAM c) is an ASCII character,
- *          $(D_KEYWORD false) otherwise.
- */
-bool isASCII(C)(C c)
-if (isSomeChar!C)
-{
-    return c < 128;
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    assert(isASCII('0'));
-    assert(isASCII('L'));
-    assert(isASCII('l'));
-    assert(isASCII('!'));
-    assert(!isASCII('©'));
-    assert(!isASCII('§'));
-    assert(!isASCII(char.init)); // 0xFF
-    assert(!isASCII(wchar.init)); // 0xFFFF
-    assert(!isASCII(dchar.init)); // 0xFFFF
-}
-
-/**
- * Checks for a control character.
- *
- * Control characters are non-printable characters. Their ASCII codes are those
- * between 0x00 (NUL) and 0x1f (US), and 0x7f (DEL).
- *
- * Params:
- *  C = Some character type.
- *  c = Some character.
- *
- * Returns: $(D_KEYWORD true) if $(D_PARAM c) is a control character,
- *          $(D_KEYWORD false) otherwise.
- *
- * See_Also: $(D_PSYMBOL isPrintable),  $(D_PSYMBOL isGraphical).
- */
-bool isControl(C)(C c)
-if (isSomeChar!C)
-{
-    return (c <= 0x1f) || (c == 0x7f);
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    assert(isControl('\t'));
-    assert(isControl('\0'));
-    assert(isControl('\u007f'));
-    assert(!isControl(' '));
-    assert(!isControl('a'));
-    assert(!isControl(char.init)); // 0xFF
-    assert(!isControl(wchar.init)); // 0xFFFF
-}
-
-/**
- * Checks for a whitespace character.
- *
- * Whitespace characters are:
- *
- * $(UL
- *  $(LI Whitespace)
- *  $(LI Horizontal Tab (HT))
- *  $(LI Line Feed (LF))
- *  $(LI Carriage Return (CR))
- *  $(LI Vertical Tab (VT))
- *  $(LI Form Feed (FF))
- * )
- *
- * Params:
- *  C = Some character type.
- *  c = Some character.
- *
- * Returns: $(D_KEYWORD true) if $(D_PARAM c) is a whitespace character,
- *          $(D_KEYWORD false) otherwise.
- *
- * See_Also: $(D_PSYMBOL whitespace).
- */
-bool isWhite(C)(C c)
-if (isSomeChar!C)
-{
-    return ((c >= 0x09) && (c <= 0x0d)) || (c == 0x20);
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    assert(isWhite('\t'));
-    assert(isWhite('\n'));
-    assert(isWhite('\v'));
-    assert(isWhite('\f'));
-    assert(isWhite('\r'));
-    assert(isWhite(' '));
-}
-
-/**
- * Checks for a graphical character.
- *
- * Graphical characters are printable characters but whitespace characters.
- *
- * Params:
- *  C = Some character type.
- *  c = Some character.
- *
- * Returns: $(D_KEYWORD true) if $(D_PARAM c) is a control character,
- *          $(D_KEYWORD false) otherwise.
- *
- * See_Also: $(D_PSYMBOL isControl), $(D_PSYMBOL isWhite).
- */
-bool isGraphical(C)(C c)
-if (isSomeChar!C)
-{
-    return (c > 0x20) && (c < 0x7f);
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    assert(isGraphical('a'));
-    assert(isGraphical('0'));
-    assert(!isGraphical('\u007f'));
-    assert(!isGraphical('§'));
-    assert(!isGraphical('\n'));
-    assert(!isGraphical(' '));
-}
-
-/**
- * Checks for a printable character.
- *
- * This is the opposite of a control character.
- *
- * Params:
- *  C = Some character type.
- *  c = Some character.
- *
- * Returns: $(D_KEYWORD true) if $(D_PARAM c) is a control character,
- *          $(D_KEYWORD false) otherwise.
- *
- * See_Also: $(D_PSYMBOL isControl).
- */
-bool isPrintable(C)(C c)
-if (isSomeChar!C)
-{
-    return (c >= 0x20) && (c < 0x7f);
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    assert(isPrintable('a'));
-    assert(isPrintable('0'));
-    assert(!isPrintable('\u007f'));
-    assert(!isPrintable('§'));
-    assert(!isPrintable('\n'));
-    assert(isPrintable(' '));
-}
-
-/**
- * Checks for a hexadecimal digit.
- *
- * Params:
- *  C = Some character type.
- *  c = Some character.
- *
- * Returns: $(D_KEYWORD true) if $(D_PARAM c) is a hexadecimal digit,
- *          $(D_KEYWORD false) otherwise.
- */
-bool isHexDigit(C)(C c)
-if (isSomeChar!C)
-{
-    return ((c >= '0') && (c <= '9'))
-        || ((c >= 'a') && (c <= 'f'))
-        || ((c >= 'A') && (c <= 'F'));
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    assert(isHexDigit('0'));
-    assert(isHexDigit('1'));
-    assert(isHexDigit('8'));
-    assert(isHexDigit('9'));
-    assert(isHexDigit('A'));
-    assert(isHexDigit('F'));
-    assert(!isHexDigit('G'));
-    assert(isHexDigit('a'));
-    assert(isHexDigit('f'));
-    assert(!isHexDigit('g'));
-}
-
-/**
- * Checks for an octal character.
- *
- * Params:
- *  C = Some character type.
- *  c = Some character.
- *
- * Returns: $(D_KEYWORD true) if $(D_PARAM c) is an octal character,
- *          $(D_KEYWORD false) otherwise.
- */
-bool isOctalDigit(C)(C c)
-if (isSomeChar!C)
-{
-    return (c >= '0') && (c <= '7');
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    assert(isOctalDigit('0'));
-    assert(isOctalDigit('1'));
-    assert(isOctalDigit('2'));
-    assert(isOctalDigit('3'));
-    assert(isOctalDigit('4'));
-    assert(isOctalDigit('5'));
-    assert(isOctalDigit('6'));
-    assert(isOctalDigit('7'));
-    assert(!isOctalDigit('8'));
-}
-
-/**
- * Checks for a octal character.
- *
- * Params:
- *  C = Some character type.
- *  c = Some character.
- *
- * Returns: $(D_KEYWORD true) if $(D_PARAM c) is a octal character,
- *          $(D_KEYWORD false) otherwise.
- */
-bool isPunctuation(C)(C c)
-if (isSomeChar!C)
-{
-    return ((c >= 0x21) && (c <= 0x2f))
-        || ((c >= 0x3a) && (c <= 0x40))
-        || ((c >= 0x5b) && (c <= 0x60))
-        || ((c >= 0x7b) && (c <= 0x7e));
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    assert(isPunctuation('!'));
-    assert(isPunctuation(':'));
-    assert(isPunctuation('\\'));
-    assert(isPunctuation('|'));
-    assert(!isPunctuation('0'));
-    assert(!isPunctuation(' '));
-}
-
-/**
- * Converts $(D_PARAM c) to uppercase.
- *
- * If $(D_PARAM c) is not a lowercase character, $(D_PARAM c) is returned
- * unchanged.
- *
- * Params:
- *  C = Some character type.
- *  c = Some character.
- *
- * Returns: The lowercase of $(D_PARAM c) if available, just $(D_PARAM c)
- *          otherwise.
- */
-C toUpper(C)(C c)
-if (isSomeChar!C)
-{
-    return isLower(c) ? (cast(C) (c - 32)) : c;
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    assert(toUpper('a') == 'A');
-    assert(toUpper('A') == 'A');
-    assert(toUpper('!') == '!');
-}
-
-/**
- * Converts $(D_PARAM c) to lowercase.
- *
- * If $(D_PARAM c) is not an uppercase character, $(D_PARAM c) is returned
- * unchanged.
- *
- * Params:
- *  C = Some character type.
- *  c = Some character.
- *
- * Returns: The uppercase of $(D_PARAM c) if available, just $(D_PARAM c)
- *          otherwise.
- */
-C toLower(C)(C c)
-if (isSomeChar!C)
-{
-    return isUpper(c) ? (cast(C) (c + 32)) : c;
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    assert(toLower('A') == 'a');
-    assert(toLower('a') == 'a');
-    assert(toLower('!') == '!');
-}
--- a/source/tanya/encoding/package.d
+++ b/source/tanya/encoding/package.d
@ -1,17 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * This package provides tools to work with text encodings.
- *
- * Copyright: Eugene Wissner 2017-2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/encoding/package.d,
- *                 tanya/encoding/package.d)
- */
-module tanya.encoding;
-
-public import tanya.encoding.ascii;
--- a/source/tanya/exception.d
+++ b/source/tanya/exception.d
@ -1,66 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Common exceptions and errors.
- *
- * Copyright: Eugene Wissner 2017-2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/exception.d,
- *                 tanya/exception.d)
- */
-module tanya.exception;
-
-import tanya.conv;
-import tanya.memory;
-
-/**
- * Error thrown if memory allocation fails.
- */
-final class OutOfMemoryError : Error
-{
-    /**
-     * Constructs new error.
-     *
-     * Params:
-     *  msg  = The message for the exception.
-     *  file = The file where the exception occurred.
-     *  line = The line number where the exception occurred.
-     *  next = The previous exception in the chain of exceptions, if any.
-     */
-    this(string msg = "Out of memory",
-         string file = __FILE__,
-         size_t line = __LINE__,
-         Throwable next = null) @nogc nothrow pure @safe
-    {
-        super(msg, file, line, next);
-    }
-
-    /// ditto
-    this(string msg,
-         Throwable next,
-         string file = __FILE__,
-         size_t line = __LINE__) @nogc nothrow pure @safe
-    {
-        super(msg, file, line, next);
-    }
-}
-
-/**
- * Allocates $(D_PSYMBOL OutOfMemoryError) in a static storage and throws it.
- *
- * Params:
- *  msg = Custom error message.
- *
- * Throws: $(D_PSYMBOL OutOfMemoryError).
- */
-void onOutOfMemoryError(string msg = "Out of memory")
-@nogc nothrow pure @trusted
-{
-    static ubyte[stateSize!OutOfMemoryError] memory;
-    alias PureType = OutOfMemoryError function(string) @nogc nothrow pure;
-    throw (cast(PureType) () => emplace!OutOfMemoryError(memory))(msg);
-}
--- a/source/tanya/format.d
+++ b/source/tanya/format.d
@ -17,11 +17,19 @@
 * To escape `{` or `}`, use `{{` and `}}` respectively. `{{` will be outputted
 * as a single `{`, `}}` - as a single `}`.
 *
- * If a custom data type (like $(D_KEYWORD struct) or $(D_KEYWORD class))
- * defines a `stringify()` function that is callable without arguments and
- * returns a $(D_PSYMBOL String), this function is used to produce a string
- * representation for the value. String conversions for the most built-in
- * data types a also available.
+ * To define the string representation for a custom data type (like
+ * $(D_KEYWORD class) or $(D_KEYWORD struct)), `toString()`-function can be
+ * implemented for that type. `toString()` should be $(D_KEYWORD const) and
+ * accept exactly one argument: an output range for `const(char)[]`. It should
+ * return the same output range, advanced after putting the corresponding value
+ * into it. That is `toString()` signature should look like:
+ *
+ * ---
+ * OR toString(OR)(OR range) const
+ * if (isOutputRange!(OR, const(char)[]));
+ * ---
+ *
+ * String conversions for the most built-in data types a also available.
 *
 * $(D_KEYWORD char), $(D_KEYWORD wchar) and $(D_KEYWORD dchar) ranges are
 * outputted as plain strings (without any delimiters between their elements).
@ -30,7 +38,7 @@
 *
 * More advanced formatting is currently not implemented.
 *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2022.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -39,17 +47,15 @@
 */
 module tanya.format;

-import tanya.algorithm.comparison;
+import std.algorithm.comparison;
+import std.ascii;
 import tanya.container.string;
-import tanya.encoding.ascii;
 import tanya.math;
 static import tanya.memory.op;
 import tanya.meta.metafunction;
 import tanya.meta.trait;
 import tanya.meta.transform;
-import tanya.range.array;
-import tanya.range.primitive;
-import tanya.typecons : Tuple;
+import tanya.range;

 // Returns the last part of buffer with converted number.
 package(tanya) char[] integral2String(T)(T number, return ref char[21] buffer)
@ -117,18 +123,6 @@ if (isIntegral!T)
    return buffer[$ - l - 1 .. $ - 1];
 }

-// Converting an integer to string.
-@nogc nothrow pure @system unittest
-{
-    char[21] buf;
-
-    assert(integral2String(80, buf) == "80");
-    assert(integral2String(-80, buf) == "-80");
-    assert(integral2String(0, buf) == "0");
-    assert(integral2String(uint.max, buf) == "4294967295");
-    assert(integral2String(int.min, buf) == "-2147483648");
-}
-
 private int frexp(const double x) @nogc nothrow pure @safe
 {
    const FloatBits!double bits = { x };
@ -945,6 +939,12 @@ private struct uint128
 {
    ulong[2] data;

+    private struct DivMod
+    {
+        uint128 quotient;
+        uint128 remainder;
+    }
+
    this(ulong upper, ulong lower) @nogc nothrow pure @safe
    {
        this.data[0] = upper;
@ -1179,7 +1179,7 @@ private struct uint128
        return this.data[1];
    }

-    Tuple!(uint128, uint128) divMod(ulong rhs) const @nogc nothrow pure @safe
+    DivMod divMod(ulong rhs) const @nogc nothrow pure @safe
    in
    {
        assert(rhs != uint128(), "Division by 0");
@ -1202,22 +1202,22 @@ private struct uint128
        typeof(return) result;
        for (ubyte x = this.bits; x > 0; --x)
        {
-            result[0]  = result[0] << 1;
-            result[1] = result[1] << 1;
+            result.quotient  = result.quotient << 1;
+            result.remainder = result.remainder << 1;

            if ((this >> (x - 1U)) & 1)
            {
-                ++result[1];
+                ++result.remainder;
            }

-            if (result[1] >= rhs)
+            if (result.remainder >= rhs)
            {
-                if (result[1].data[1] < rhs)
+                if (result.remainder.data[1] < rhs)
                {
-                    --result[1].data[0];
+                    --result.remainder.data[0];
                }
-                result[1].data[1] -= rhs;
-                ++result[0];
+                result.remainder.data[1] -= rhs;
+                ++result.quotient;
            }
        }
        return result;
@ -1225,12 +1225,12 @@ private struct uint128

    uint128 opBinary(string op : "/")(ulong rhs)
    {
-        return divMod(rhs)[0];
+        return divMod(rhs).quotient;
    }

    uint128 opBinary(string op : "%")(ulong rhs) const
    {
-        return divMod(rhs)[1];
+        return divMod(rhs).remainder;
    }
 }

@ -1282,8 +1282,8 @@ private int indexMismatch(ulong low, ulong high) @nogc nothrow pure @safe
 }

 private char[] errol2(double value,
-                      return ref char[512] buffer,
-                      out int exponent) @nogc nothrow pure @safe
+        return ref char[512] buffer,
+        out int exponent) @nogc nothrow pure @safe
 in
 {
    assert(value > 9.007199254740992e15 && value < 3.40282366920938e38);
@ -1307,12 +1307,12 @@ do
    enum ulong power19 = cast(ulong) 1e19;

    auto qr = leftBoundary.divMod(power19);
-    auto low = cast(ulong) qr[1];
-    const lowFactor = cast(ulong) (qr[0] % power19);
+    auto low = cast(ulong) qr.remainder;
+    const lowFactor = cast(ulong) (qr.quotient % power19);

    qr = rightBoundary.divMod(power19);
-    auto high = cast(ulong) qr[1];
-    const highFactor = cast(ulong) (qr[0] % power19);
+    auto high = cast(ulong) qr.remainder;
+    const highFactor = cast(ulong) (qr.quotient % power19);
    size_t digitIndex;

    if (lowFactor != highFactor)
@ -1371,8 +1371,8 @@ do
 }

 private char[] errolFixed(double value,
-                          return ref char[512] buffer,
-                          out int exponent) @nogc nothrow pure @safe
+        return ref char[512] buffer,
+        out int exponent) @nogc nothrow pure @safe
 in
 {
    assert(value >= 16.0 && value <= 9.007199254740992e15);
@ -1945,7 +1945,7 @@ private char[] errol3(double value,
 * $(D_PARAM sign).
 */
 private const(char)[] real2String(double value,
-                                  ref char[512] buffer,
+                                  return ref char[512] buffer,
                                  out int exponent,
                                  out bool sign) @nogc nothrow pure @trusted
 {
@ -1989,7 +1989,7 @@ private const(char)[] real2String(double value,
    }
 }

-private void formatReal(T)(ref T arg, ref String result)
+private void formatReal(T, OR)(ref T arg, OR result)
 if (isFloatingPoint!T)
 {
    char[512] buffer; // Big enough for e+308 or e-307.
@ -2017,11 +2017,11 @@ if (isFloatingPoint!T)

    if (negative)
    {
-        result.insertBack('-');
+        put(result, "-");
    }
    if (decimalPoint == special)
    {
-        result.insertBack(realString);
+        put(result, realString);
        return;
    }

@ -2181,11 +2181,11 @@ if (isFloatingPoint!T)
    // Get the length that we've copied.
    length = cast(uint) (buffer.length - bufferSlice.length);

-    result.insertBack(buffer[64 .. length]); // Number.
-    result.insertBack(tail[1 .. tail[0] + 1]); // Tail.
+    put(result, buffer[64 .. length]); // Number.
+    put(result, tail[1 .. tail[0] + 1]); // Tail.
 }

-private void formatStruct(T)(ref T arg, ref String result)
+private void formatStruct(T, OR)(ref T arg, OR result)
 if (is(T == struct))
 {
    template pred(alias f)
@ -2202,24 +2202,24 @@ if (is(T == struct))
    }
    alias fields = Filter!(pred, __traits(allMembers, T));

-    result.insertBack(T.stringof);
-    result.insertBack('(');
+    put(result, T.stringof);
+    put(result, "(");
    static if (fields.length > 0)
    {
        printToString!"{}"(result, __traits(getMember, arg, fields[0]));
        foreach (field; fields[1 .. $])
        {
-            result.insertBack(", ");
+            put(result, ", ");
            printToString!"{}"(result, __traits(getMember, arg, field));
        }
    }
-    result.insertBack(')');
+    put(result, ")");
 }

-private void formatRange(T)(ref T arg, ref String result)
+private void formatRange(T, OR)(ref T arg, OR result)
 if (isInputRange!T && !isInfinite!T)
 {
-    result.insertBack('[');
+    put(result, "[");
    if (!arg.empty)
    {
        printToString!"{}"(result, arg.front);
@ -2227,24 +2227,24 @@ if (isInputRange!T && !isInfinite!T)
    }
    foreach (e; arg)
    {
-        result.insertBack(", ");
+        put(result, ", ");
        printToString!"{}"(result, e);
    }
-    result.insertBack(']');
+    put(result, "]");
 }

-private ref String printToString(string fmt, Args...)(return ref String result,
-                                                      auto ref Args args)
+private void printToString(string fmt, OR, Args...)(ref OR result,
+                                                    auto ref Args args)
 {
    alias Arg = Args[0];

    static if (is(Unqual!Arg == typeof(null))) // null
    {
-        result.insertBack("null");
+        put(result, "null");
    }
    else static if (is(Unqual!Arg == bool)) // Boolean
    {
-        result.insertBack(args[0] ? "true" : "false");
+        put(result, args[0] ? "true" : "false");
    }
    else static if (is(Arg == enum)) // Enum
    {
@ -2252,49 +2252,49 @@ private ref String printToString(string fmt, Args...)(return ref String result,
        {
            if (args[0] == __traits(getMember, Arg, m))
            {
-                result.insertBack(m);
+                put(result, m);
            }
        }
    }
    else static if (isSomeChar!Arg || isSomeString!Arg) // String or char
    {
-        result.insertBack(args[0]);
+        put(result, args[0]);
    }
    else static if (isInputRange!Arg
                 && !isInfinite!Arg
                 && isSomeChar!(ElementType!Arg)) // Stringish range
    {
-        result.insertBack(args[0]);
+        put(result, args[0]);
    }
    else static if (isInputRange!Arg && !isInfinite!Arg)
    {
        formatRange(args[0], result);
    }
-    else static if (is(Unqual!(typeof(args[0].stringify())) == String))
+    else static if (is(typeof(args[0].toString(result)) == OR))
    {
        static if (is(Arg == class) || is(Arg == interface))
        {
            if (args[0] is null)
            {
-                result.insertBack("null");
+                put(result, "null");
            }
            else
            {
-                result.insertBack(args[0].stringify()[]);
+                result = args[0].toString(result);
            }
        }
        else
        {
-            result.insertBack(args[0].stringify()[]);
+            result = args[0].toString(result);
        }
    }
    else static if (is(Arg == class))
    {
-        result.insertBack(args[0] is null ? "null" : args[0].toString());
+        put(result, args[0] is null ? "null" : args[0].toString());
    }
    else static if (is(Arg == interface))
    {
-        result.insertBack(Arg.classinfo.name);
+        put(result, Arg.classinfo.name);
    }
    else static if (is(Arg == struct))
    {
@ -2302,7 +2302,7 @@ private ref String printToString(string fmt, Args...)(return ref String result,
    }
    else static if (is(Arg == union))
    {
-        result.insertBack(Arg.stringof);
+        put(result, Arg.stringof);
    }
    else static if (isFloatingPoint!Arg) // Float
    {
@ -2321,21 +2321,19 @@ private ref String printToString(string fmt, Args...)(return ref String result,
        }
        while (address != 0);

-        result.insertBack("0x");
-        result.insertBack(buffer[position .. $]);
+        put(result, "0x");
+        put(result, buffer[position .. $]);
    }
    else static if (isIntegral!Arg) // Integer
    {
        char[21] buffer;
-        result.insertBack(integral2String(args[0], buffer));
+        put(result, integral2String(args[0], buffer));
    }
    else
    {
        static assert(false,
                      "Formatting type " ~ Arg.stringof ~ " is not supported");
    }
-
-    return result;
 }

 /**
@ -2351,265 +2349,47 @@ private ref String printToString(string fmt, Args...)(return ref String result,
 String format(string fmt, Args...)(auto ref Args args)
 {
    String formatted;
+    sformat!fmt(backInserter(formatted), args);
+    return formatted;
+}

+/**
+ * Produces a string according to the specified format and writes it into an
+ * output range. $(D_PSYMBOL sformat) writes the final string in chunks, so the
+ * output range should be in output range for `const(char)[]`.
+ *
+ * Params:
+ *  fmt    = Format.
+ *  R      = Output range type.
+ *  output = Output range.
+ *  args   = Arguments.
+ *
+ * Returns: $(D_PARAM output).
+ */
+R sformat(string fmt, R, Args...)(R output, auto ref Args args)
+if (isOutputRange!(R, const(char)[]))
+{
    alias Specs = ParseFmt!fmt;
    enum bool FormatSpecFilter(alias spec) = is(typeof(spec) == FormatSpec);
    static assert((Filter!(FormatSpecFilter, ParseFmt!fmt)).length == Args.length,
-                  "Number of the arguments doesn't match the format strign");
+                  "Number of the arguments doesn't match the format string");

    foreach (spec; Specs)
    {
        static if (FormatSpecFilter!spec)
        {
-            printToString!"{}"(formatted, args[spec.position]);
+            printToString!"{}"(output, args[spec.position]);
        }
        else static if (isSomeString!(typeof(spec)))
        {
-            formatted.insertBack(spec);
+            put(output, spec);
        }
        else
        {
            static assert(false, "Format string parsed incorrectly");
        }
    }
-    return formatted;
-}
-
-// doesn't print the first argument repeatedly
-@nogc nothrow pure @safe unittest
-{
-    assert(format!"{}{}"(1, 2) == "12");
-}
-
-@nogc nothrow pure @safe unittest
-{
-    assert(format!"Without arguments"() == "Without arguments");
-    assert(format!""().length == 0);
-
-    static assert(!is(typeof(format!"{}"())));
-    static assert(!is(typeof(format!"{j}"(5))));
-}
-
-// Enum.
-@nogc nothrow pure @safe unittest
-{
-    enum E1 : int
-    {
-        one,
-        two,
-    }
-    assert(format!"{}"(E1.one) == "one");
-
-    const E1 e1;
-    assert(format!"{}"(e1) == "one");
-}
-
-// One argument tests.
-@nogc pure @safe unittest
-{
-    // Modifiers.
-    assert(format!"{}"(8.5) == "8.5");
-    assert(format!"{}"(8.6) == "8.6");
-    assert(format!"{}"(1000) == "1000");
-    assert(format!"{}"(1) == "1");
-    assert(format!"{}"(10.25) == "10.25");
-    assert(format!"{}"(1) == "1");
-    assert(format!"{}"(0.01) == "0.01");
-
-    // String printing.
-    assert(format!"{}"("Some weired string") == "Some weired string");
-    assert(format!"{}"(cast(string) null) == "");
-    assert(format!"{}"('c') == "c");
-
-    // Integer.
-    assert(format!"{}"(8) == "8");
-    assert(format!"{}"(8) == "8");
-    assert(format!"{}"(-8) == "-8");
-    assert(format!"{}"(-8L) == "-8");
-    assert(format!"{}"(8) == "8");
-    assert(format!"{}"(100000001) == "100000001");
-    assert(format!"{}"(99999999L) == "99999999");
-    assert(format!"{}"(10) == "10");
-    assert(format!"{}"(10L) == "10");
-
-    // Floating point.
-    assert(format!"{}"(0.1234) == "0.1234");
-    assert(format!"{}"(0.3) == "0.3");
-    assert(format!"{}"(0.333333333333) == "0.333333");
-    assert(format!"{}"(38234.1234) == "38234.1");
-    assert(format!"{}"(-0.3) == "-0.3");
-    assert(format!"{}"(0.000000000000000006) == "6e-18");
-    assert(format!"{}"(0.0) == "0");
-    assert(format!"{}"(double.init) == "NaN");
-    assert(format!"{}"(-double.init) == "-NaN");
-    assert(format!"{}"(double.infinity) == "Inf");
-    assert(format!"{}"(-double.infinity) == "-Inf");
-    assert(format!"{}"(0.000000000000000000000000003) == "3e-27");
-    assert(format!"{}"(0.23432e304) == "2.3432e+303");
-    assert(format!"{}"(-0.23432e8) == "-2.3432e+07");
-    assert(format!"{}"(1e-307) == "1e-307");
-    assert(format!"{}"(1e+8) == "1e+08");
-    assert(format!"{}"(111234.1) == "111234");
-    assert(format!"{}"(0.999) == "0.999");
-    assert(format!"{}"(0x1p-16382L) == "0");
-    assert(format!"{}"(1e+3) == "1000");
-    assert(format!"{}"(38234.1234) == "38234.1");
-    assert(format!"{}"(double.max) == "1.79769e+308");
-
-    // typeof(null).
-    assert(format!"{}"(null) == "null");
-
-    // Boolean.
-    assert(format!"{}"(true) == "true");
-    assert(format!"{}"(false) == "false");
-}
-
-// Unsafe tests with pointers.
-@nogc pure @system unittest
-{
-    // Pointer convesions
-    assert(format!"{}"(cast(void*) 1) == "0x1");
-    assert(format!"{}"(cast(void*) 20) == "0x14");
-    assert(format!"{}"(cast(void*) null) == "0x0");
-}
-
-// Structs.
-@nogc pure @safe unittest
-{
-    static struct WithoutStringify1
-    {
-        int a;
-        void func()
-        {
-        }
-    }
-    assert(format!"{}"(WithoutStringify1(6)) == "WithoutStringify1(6)");
-
-    static struct WithoutStringify2
-    {
-    }
-    assert(format!"{}"(WithoutStringify2()) == "WithoutStringify2()");
-
-    static struct WithoutStringify3
-    {
-        int a = -2;
-        int b = 8;
-    }
-    assert(format!"{}"(WithoutStringify3()) == "WithoutStringify3(-2, 8)");
-
-    struct Nested
-    {
-        int i;
-
-        void func()
-        {
-        }
-    }
-    assert(format!"{}"(Nested()) == "Nested(0)");
-
-    static struct WithStringify
-    {
-        String stringify() const @nogc nothrow pure @safe
-        {
-            return String("stringify method");
-        }
-    }
-    assert(format!"{}"(WithStringify()) == "stringify method");
-}
-
-// Aggregate types.
-@system unittest // Object.toString has no attributes.
-{
-    import tanya.memory;
-    import tanya.memory.smartref;
-
-    interface I
-    {
-    }
-    class A : I
-    {
-    }
-    auto instance = defaultAllocator.unique!A();
-    assert(format!"{}"(instance.get()) == instance.get().toString());
-    assert(format!"{}"(cast(I) instance.get()) == I.classinfo.name);
-    assert(format!"{}"(cast(A) null) == "null");
-
-    class B
-    {
-        String stringify() @nogc nothrow pure @safe
-        {
-            return String("Class B");
-        }
-    }
-    assert(format!"{}"(cast(B) null) == "null");
-}
-
-// Unions.
-unittest
-{
-    union U
-    {
-        int i;
-        char c;
-    }
-    assert(format!"{}"(U(2)) == "U");
-}
-
-// Ranges.
-@nogc pure @safe unittest
-{
-    static struct Stringish
-    {
-        private string content = "Some content";
-
-        immutable(char) front() const @nogc nothrow pure @safe
-        {
-            return this.content[0];
-        }
-
-        void popFront() @nogc nothrow pure @safe
-        {
-            this.content = this.content[1 .. $];
-        }
-
-        bool empty() const @nogc nothrow pure @safe
-        {
-            return this.content.length == 0;
-        }
-    }
-    assert(format!"{}"(Stringish()) == "Some content");
-
-    static struct Intish
-    {
-        private int front_ = 3;
-
-        int front() const @nogc nothrow pure @safe
-        {
-            return this.front_;
-        }
-
-        void popFront() @nogc nothrow pure @safe
-        {
-            --this.front_;
-        }
-
-        bool empty() const @nogc nothrow pure @safe
-        {
-            return this.front == 0;
-        }
-    }
-    assert(format!"{}"(Intish()) == "[3, 2, 1]");
-}
-
-// Typeid.
-nothrow pure @safe unittest
-{
-    assert(format!"{}"(typeid(int[])) == "int[]");
-
-    class C
-    {
-    }
-    assert(format!"{}"(typeid(C)) == typeid(C).toString());
+    return output;
 }

 private struct FormatSpec
--- a/source/tanya/functional.d
+++ b/source/tanya/functional.d
@ -1,78 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Functions that manipulate other functions and their argument lists.
- *
- * Copyright: Eugene Wissner 2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/functional.d,
- *                 tanya/functional.d)
- */
-module tanya.functional;
-
-import tanya.algorithm.mutation;
-import tanya.meta.metafunction;
-
-/**
- * Forwards its argument list preserving $(D_KEYWORD ref) and $(D_KEYWORD out)
- * storage classes.
- *
- * $(D_PSYMBOL forward) accepts a list of variables or literals. It returns an
- * argument list of the same length that can be for example passed to a
- * function accepting the arguments of this type.
- *
- * Params:
- *  args = Argument list.
- *
- * Returns: $(D_PARAM args) with their original storage classes.
- */
-template forward(args...)
-{
-    static if (args.length == 0)
-    {
-        alias forward = AliasSeq!();
-    }
-    else static if (__traits(isRef, args[0]) || __traits(isOut, args[0]))
-    {
-        static if (args.length == 1)
-        {
-            alias forward = args[0];
-        }
-        else
-        {
-            alias forward = AliasSeq!(args[0], forward!(args[1 .. $]));
-        }
-    }
-    else
-    {
-        @property auto forwardOne()
-        {
-            return move(args[0]);
-        }
-        static if (args.length == 1)
-        {
-            alias forward = forwardOne;
-        }
-        else
-        {
-            alias forward = AliasSeq!(forwardOne, forward!(args[1 .. $]));
-        }
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(typeof((int i) { int v = forward!i; })));
-    static assert(is(typeof((ref int i) { int v = forward!i; })));
-    static assert(is(typeof({
-        void f(int i, ref int j, out int k)
-        {
-            f(forward!(i, j, k));
-        }
-    })));
-}
--- a/source/tanya/hash/lookup.d
+++ b/source/tanya/hash/lookup.d
@ -5,7 +5,7 @@
 /**
 * Non-cryptographic, lookup hash functions.
 *
- * Copyright: Eugene Wissner 2018.
+ * Copyright: Eugene Wissner 2018-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -14,11 +14,11 @@
 */
 module tanya.hash.lookup;

+import std.traits : isScalarType;
 import tanya.meta.trait;
 import tanya.range.primitive;
-version (unittest) import tanya.test.stub;

-private struct FNV
+private struct Hasher
 {
    static if (size_t.sizeof == 4)
    {
@ -50,11 +50,33 @@ private struct FNV
        }
        else static if (isScalarType!T || isPointer!T)
        {
-            (() @trusted => add((cast(const ubyte*) &key)[0 .. T.sizeof]))();
+            // Treat as an array of words
+            static if (T.sizeof % size_t.sizeof == 0
+                    && T.alignof >= size_t.alignof)
+                alias CastT = size_t;
+            // (64-bit or 128-bit) Treat as an array of ints
+            else static if (T.sizeof % uint.sizeof == 0
+                    && T.alignof >= uint.alignof)
+                alias CastT = uint;
+            // Treat as an array of bytes
+            else
+                alias CastT = ubyte;
+            add((() @trusted => (cast(const CastT*) &key)[0 .. T.sizeof / CastT.sizeof])());
        }
        else static if (isArray!T && isScalarType!(ElementType!T))
        {
-            add(cast(const ubyte[]) key);
+            // Treat as an array of words
+            static if (ElementType!T.sizeof % size_t.sizeof == 0
+                    && ElementType!T.alignof >= size_t.alignof)
+                alias CastT = size_t;
+            // (64-bit or 128-bit) Treat as an array of ints
+            else static if (ElementType!T.sizeof % uint.sizeof == 0
+                    && ElementType!T.alignof >= uint.alignof)
+                alias CastT = uint;
+            // Treat as an array of bytes
+            else
+                alias CastT = ubyte;
+            add(cast(const CastT[]) key);
        }
        else static if (is(T == typeof(null)))
        {
@ -73,13 +95,166 @@ private struct FNV
        }
    }

-    void add(const ubyte[] key) @nogc nothrow pure @safe
+    void add(scope const ubyte[] key) @nogc nothrow pure @safe
    {
+        // FNV-1a
        foreach (c; key)
        {
            this.hash = (this.hash ^ c) * prime;
        }
    }
+
+    void add(scope const size_t[] key) @nogc nothrow pure @safe
+    {
+        static if (size_t.sizeof == 4)
+        {
+            // Partial MurmurHash3_x86_32 (no finalization)
+            enum uint c1 = 0xcc9e2d51;
+            enum uint c2 = 0x1b873593;
+            alias h1 = hash;
+            foreach (x; key)
+            {
+                auto k1 = x * c1;
+                k1 = (k1 << 15) | (k1 >> (32 - 15));
+                k1 *= c2;
+
+                h1 ^= k1;
+                h1 = (h1 << 13) | (h1 >> (32 - 13));
+                h1 = h1 * 5 + 0xe6546b64;
+            }
+        }
+        else static if (size_t.sizeof == 8)
+        {
+            // Partial 64-bit MurmurHash64A (no finalization)
+            alias h = hash;
+            enum ulong m = 0xc6a4a7935bd1e995UL;
+            foreach (x; key)
+            {
+                auto k = x * m;
+                k ^= k >>> 47;
+                k *= m;
+
+                h ^= k;
+                h *= m;
+            }
+        }
+        else static if (size_t.sizeof == 16)
+        {
+            // Partial MurmurHash3_x64_128 (no finalization)
+            // treating each size_t as a pair of ulong.
+            ulong h1 = cast(ulong) hash;
+            ulong h2 = cast(ulong) (hash >> 64);
+
+            enum ulong c1 = 0x87c37b91114253d5UL;
+            enum ulong c2 = 0x4cf5ad432745937fUL;
+
+            foreach (x; key)
+            {
+                auto k1 = cast(ulong) x;
+                auto k2 = cast(ulong) (x >> 64);
+
+                k1 *= c1; k1 = (k1 << 32) | (k1 >> (64 - 31)); k1 *= c2; h1 ^= k1;
+                h1 = (h1 << 27) | (h1 >> (64 - 27)); h1 += h2; h1 = h1*5+0x52dce729;
+                k2 *= c2; k2 = (k2 << 33) | (k2 >> (64 - 33)); k2 *= c1; h2 ^= k2;
+                h2 = (h2 << 31) | (h2 >> (64 - 31)); h2 += h1; h2 = h2*5+0x38495ab5;
+            }
+
+            hash = cast(size_t) h1 + ((cast(size_t) h2) << 64);
+        }
+        else
+        {
+            static assert(0, "Hash length must be either 32, 64, or 128 bits.");
+        }
+    }
+
+    static if (size_t.sizeof != uint.sizeof)
+    void add(scope const uint[] key) @nogc nothrow pure @trusted
+    {
+        static if (size_t.sizeof == 8)
+        {
+            // Partial 32-bit MurmurHash64B (no finalization)
+            enum uint m = 0x5bd1e995;
+            enum r = 24;
+
+            uint h1 = cast(uint) hash;
+            uint h2 = cast(uint) (hash >> 32);
+            const(uint)* data = key.ptr;
+            auto len = key.length;
+
+            for (; len >= 2; data += 2, len -= 2)
+            {
+                uint k1 = data[0];
+                k1 *= m; k1 ^= k1 >> r; k1 *= m;
+                h1 *= m; h1 ^= k1;
+
+                uint k2 = data[1];
+                k2 *= m; k2 ^= k2 >> r; k2 *= m;
+                h2 *= m; h2 ^= k2;
+            }
+            if (len)
+            {
+                uint k1 = data[0];
+                k1 *= m; k1 ^= k1 >> r; k1 *= m;
+                h1 *= m; h1 ^= k1;
+            }
+            hash = cast(ulong) h1 + ((cast(ulong) h2) << 32);
+        }
+        else static if (size_t.sizeof == 16)
+        {
+            // Partial MurmurHash3_x86_128 (no finalization)
+            enum uint c1 = 0x239b961b;
+            enum uint c2 = 0xab0e9789;
+            enum uint c3 = 0x38b34ae5;
+            enum uint c4 = 0xa1e38b93;
+
+            uint h1 = cast(uint) hash;
+            uint h2 = cast(uint) (hash >> 32);
+            uint h3 = cast(uint) (hash >> 64);
+            uint h4 = cast(uint) (hash >> 96);
+            const(uint)* data = key.ptr;
+            auto len = key.length;
+
+            for (; len >= 4; data += 4, len -= 4)
+            {
+                uint k1 = data[0];
+                uint k2 = data[1];
+                uint k3 = data[2];
+                uint k4 = data[3];
+
+                h1 = (h1 << 19) | (h1 >> (32 - 19)); h1 += h2; h1 = h1*5+0x561ccd1b;
+                k2 *= c2; k2 = (k2 << 16) | (k2 >> (32 - 16)); k2 *= c3; h2 ^= k2;
+                h2 = (h2 << 17) | (h2 >> (32 - 17)); h2 += h3; h2 = h2*5+0x0bcaa747;
+                k3 *= c3; k3 = (k3 << 17) | (k3 >> (32 - 17)); k3 *= c4; h3 ^= k3;
+                h3 = (h3 << 15) | (h3 >> (32 - 15)); h3 += h4; h3 = h3*5+0x96cd1c35;
+                k4 *= c4; k4 = (k4 << 18) | (k4 >> (32 - 18)); k4 *= c1; h4 ^= k4;
+                h4 = (h4 << 13) | (h4 >> (32 - 13)); h4 += h1; h4 = h4*5+0x32ac3b17;
+            }
+            uint k1, k2, k3;
+            switch (len) // 0, 1, 2, 3
+            {
+                case 3:
+                    k3 = data[2];
+                    k3 *= c3; k3 = (k3 << 17) | (k3 >> (32 - 17)); k3 *= c4; h3 ^= k3;
+                    goto case;
+                case 2:
+                    k2 = data[1];
+                    k2 *= c2; k2 = (k2 << 16) | (k2 >> (32 - 16)); k2 *= c3; h2 ^= k2;
+                    goto case;
+                case 1:
+                    k1 = data[0];
+                    k1 *= c1; k1 = (k1 << 15) | (k1 >> (32 - 15)); k1 *= c2; h1 ^= k1;
+                    break;
+            }
+            hash = cast(size_t) h1 +
+                   ((cast(size_t) h2) << 32) +
+                   ((cast(size_t) h3) << 64) +
+                   ((cast(size_t) h4) << 96);
+        }
+        else
+        {
+            static assert(0, "Hash length must be either 32, 64, or 128 bits.");
+        }
+    }
 }

 /**
@ -98,7 +273,8 @@ private struct FNV
 * For pointers and for scalar types implicitly convertible to `size_t` this
 * is an identity operation (i.e. the value is cast to `size_t` and returned
 * unaltered). Integer types wider than `size_t` are XOR folded down to
- * `size_t`. Other scalar types use the FNV-1a (Fowler-Noll-Vo) hash function.
+ * `size_t`. Other scalar types use an architecture-dependent hash function
+ * based on their width and alignment.
 * If the type provides a `toHash`-function, only `toHash()` is called and its
 * result is returned.
 *
@ -134,507 +310,12 @@ size_t hash(T)(auto ref T key)
    }
    else
    {
-        FNV fnv;
-        fnv(key);
-        return fnv.hash;
+        Hasher hasher;
+        hasher(key);
+        return hasher.hash;
    }
 }

-version (unittest)
-{
-    enum string r10(string x) = x ~ x ~ x ~ x ~ x ~ x ~ x ~ x ~ x ~ x;
-    enum string r100(string x) = r10!x ~ r10!x ~ r10!x ~ r10!x ~ r10!x
-                               ~ r10!x ~ r10!x ~ r10!x ~ r10!x ~ r10!x;
-    enum string r500(string x) = r100!x ~ r100!x ~ r100!x ~ r100!x ~ r100!x;
-
-    private static struct HashRange
-    {
-        string fo = "fo";
-
-        @property ubyte front() const @nogc nothrow pure @safe
-        {
-            return this.fo[0];
-        }
-
-        void popFront() @nogc nothrow pure @safe
-        {
-            this.fo = this.fo[1 .. $];
-        }
-
-        @property bool empty() const @nogc nothrow pure @safe
-        {
-            return this.fo.length == 0;
-        }
-    }
-
-    private static struct ToHashRange
-    {
-        bool empty_;
-
-        @property Hashable front() const @nogc nothrow pure @safe
-        {
-            return Hashable();
-        }
-
-        void popFront() @nogc nothrow pure @safe
-        {
-            this.empty_ = true;
-        }
-
-         @property bool empty() const @nogc nothrow pure @safe
-         {
-             return this.empty_;
-         }
-    }
-}
-
-// Tests that work for any hash size
-@nogc nothrow pure @safe unittest
-{
-    assert(hash(null) == 0);
-    assert(hash(Hashable()) == 0U);
-    assert(hash('a') == 'a');
-}
-
-static if (size_t.sizeof == 4) @nogc nothrow pure @safe unittest
-{
-    assert(hash(HashRange()) == 0x6222e842U);
-    assert(hash(ToHashRange()) == 1268118805U);
-}
-static if (size_t.sizeof == 8) @nogc nothrow pure @safe unittest
-{
-    assert(hash(HashRange()) == 0x08985907b541d342UL);
-    assert(hash(ToHashRange()) == 12161962213042174405UL);
-}
-
-static if (size_t.sizeof == 4) @nogc nothrow pure @system unittest
-{
-    assert(hash(cast(void*) 0x6e6f6863) == 0x6e6f6863);
-}
-static if (size_t.sizeof == 8) @nogc nothrow pure @system unittest
-{
-    assert(hash(cast(void*) 0x77206f676e6f6863) == 0x77206f676e6f6863);
-}
-
-/*
- * These are official FNV-1a test vectors and they are in the public domain.
- */
-// FNV-1a 32 bit test vectors
-static if (size_t.sizeof == 4) @nogc nothrow pure @safe unittest
-{
-    assert(hash("") == 0x811c9dc5U);
-    assert(hash("a") == 0xe40c292cU);
-    assert(hash("b") == 0xe70c2de5U);
-    assert(hash("c") == 0xe60c2c52U);
-    assert(hash("d") == 0xe10c2473U);
-    assert(hash("e") == 0xe00c22e0U);
-    assert(hash("f") == 0xe30c2799U);
-    assert(hash("fo") == 0x6222e842U);
-    assert(hash("foo") == 0xa9f37ed7U);
-    assert(hash("foob") == 0x3f5076efU);
-    assert(hash("fooba") == 0x39aaa18aU);
-    assert(hash("foobar") == 0xbf9cf968U);
-    assert(hash("\0") == 0x050c5d1fU);
-    assert(hash("a\0") == 0x2b24d044U);
-    assert(hash("b\0") == 0x9d2c3f7fU);
-    assert(hash("c\0") == 0x7729c516U);
-    assert(hash("d\0") == 0xb91d6109U);
-    assert(hash("e\0") == 0x931ae6a0U);
-    assert(hash("f\0") == 0x052255dbU);
-    assert(hash("fo\0") == 0xbef39fe6U);
-    assert(hash("foo\0") == 0x6150ac75U);
-    assert(hash("foob\0") == 0x9aab3a3dU);
-    assert(hash("fooba\0") == 0x519c4c3eU);
-    assert(hash("foobar\0") == 0x0c1c9eb8U);
-    assert(hash("ch") == 0x5f299f4eU);
-    assert(hash("cho") == 0xef8580f3U);
-    assert(hash("chon") == 0xac297727U);
-    assert(hash("chong") == 0x4546b9c0U);
-    assert(hash("chongo") == 0xbd564e7dU);
-    assert(hash("chongo ") == 0x6bdd5c67U);
-    assert(hash("chongo w") == 0xdd77ed30U);
-    assert(hash("chongo wa") == 0xf4ca9683U);
-    assert(hash("chongo was") == 0x4aeb9bd0U);
-    assert(hash("chongo was ") == 0xe0e67ad0U);
-    assert(hash("chongo was h") == 0xc2d32fa8U);
-    assert(hash("chongo was he") == 0x7f743fb7U);
-    assert(hash("chongo was her") == 0x6900631fU);
-    assert(hash("chongo was here") == 0xc59c990eU);
-    assert(hash("chongo was here!") == 0x448524fdU);
-    assert(hash("chongo was here!\n") == 0xd49930d5U);
-    assert(hash("ch\0") == 0x1c85c7caU);
-    assert(hash("cho\0") == 0x0229fe89U);
-    assert(hash("chon\0") == 0x2c469265U);
-    assert(hash("chong\0") == 0xce566940U);
-    assert(hash("chongo\0") == 0x8bdd8ec7U);
-    assert(hash("chongo \0") == 0x34787625U);
-    assert(hash("chongo w\0") == 0xd3ca6290U);
-    assert(hash("chongo wa\0") == 0xddeaf039U);
-    assert(hash("chongo was\0") == 0xc0e64870U);
-    assert(hash("chongo was \0") == 0xdad35570U);
-    assert(hash("chongo was h\0") == 0x5a740578U);
-    assert(hash("chongo was he\0") == 0x5b004d15U);
-    assert(hash("chongo was her\0") == 0x6a9c09cdU);
-    assert(hash("chongo was here\0") == 0x2384f10aU);
-    assert(hash("chongo was here!\0") == 0xda993a47U);
-    assert(hash("chongo was here!\n\0") == 0x8227df4fU);
-    assert(hash("cu") == 0x4c298165U);
-    assert(hash("cur") == 0xfc563735U);
-    assert(hash("curd") == 0x8cb91483U);
-    assert(hash("curds") == 0x775bf5d0U);
-    assert(hash("curds ") == 0xd5c428d0U);
-    assert(hash("curds a") == 0x34cc0ea3U);
-    assert(hash("curds an") == 0xea3b4cb7U);
-    assert(hash("curds and") == 0x8e59f029U);
-    assert(hash("curds and ") == 0x2094de2bU);
-    assert(hash("curds and w") == 0xa65a0ad4U);
-    assert(hash("curds and wh") == 0x9bbee5f4U);
-    assert(hash("curds and whe") == 0xbe836343U);
-    assert(hash("curds and whey") == 0x22d5344eU);
-    assert(hash("curds and whey\n") == 0x19a1470cU);
-    assert(hash("cu\0") == 0x4a56b1ffU);
-    assert(hash("cur\0") == 0x70b8e86fU);
-    assert(hash("curd\0") == 0x0a5b4a39U);
-    assert(hash("curds\0") == 0xb5c3f670U);
-    assert(hash("curds \0") == 0x53cc3f70U);
-    assert(hash("curds a\0") == 0xc03b0a99U);
-    assert(hash("curds an\0") == 0x7259c415U);
-    assert(hash("curds and\0") == 0x4095108bU);
-    assert(hash("curds and \0") == 0x7559bdb1U);
-    assert(hash("curds and w\0") == 0xb3bf0bbcU);
-    assert(hash("curds and wh\0") == 0x2183ff1cU);
-    assert(hash("curds and whe\0") == 0x2bd54279U);
-    assert(hash("curds and whey\0") == 0x23a156caU);
-    assert(hash("curds and whey\n\0") == 0x64e2d7e4U);
-    assert(hash("hi") == 0x683af69aU);
-    assert(hash("hi\0") == 0xaed2346eU);
-    assert(hash("hello") == 0x4f9f2cabU);
-    assert(hash("hello\0") == 0x02935131U);
-    assert(hash("\xff\x00\x00\x01") == 0xc48fb86dU);
-    assert(hash("\x01\x00\x00\xff") == 0x2269f369U);
-    assert(hash("\xff\x00\x00\x02") == 0xc18fb3b4U);
-    assert(hash("\x02\x00\x00\xff") == 0x50ef1236U);
-    assert(hash("\xff\x00\x00\x03") == 0xc28fb547U);
-    assert(hash("\x03\x00\x00\xff") == 0x96c3bf47U);
-    assert(hash("\xff\x00\x00\x04") == 0xbf8fb08eU);
-    assert(hash("\x04\x00\x00\xff") == 0xf3e4d49cU);
-    assert(hash("\x40\x51\x4e\x44") == 0x32179058U);
-    assert(hash("\x44\x4e\x51\x40") == 0x280bfee6U);
-    assert(hash("\x40\x51\x4e\x4a") == 0x30178d32U);
-    assert(hash("\x4a\x4e\x51\x40") == 0x21addaf8U);
-    assert(hash("\x40\x51\x4e\x54") == 0x4217a988U);
-    assert(hash("\x54\x4e\x51\x40") == 0x772633d6U);
-    assert(hash("127.0.0.1") == 0x08a3d11eU);
-    assert(hash("127.0.0.1\0") == 0xb7e2323aU);
-    assert(hash("127.0.0.2") == 0x07a3cf8bU);
-    assert(hash("127.0.0.2\0") == 0x91dfb7d1U);
-    assert(hash("127.0.0.3") == 0x06a3cdf8U);
-    assert(hash("127.0.0.3\0") == 0x6bdd3d68U);
-    assert(hash("64.81.78.68") == 0x1d5636a7U);
-    assert(hash("64.81.78.68\0") == 0xd5b808e5U);
-    assert(hash("64.81.78.74") == 0x1353e852U);
-    assert(hash("64.81.78.74\0") == 0xbf16b916U);
-    assert(hash("64.81.78.84") == 0xa55b89edU);
-    assert(hash("64.81.78.84\0") == 0x3c1a2017U);
-    assert(hash("feedface") == 0x0588b13cU);
-    assert(hash("feedface\0") == 0xf22f0174U);
-    assert(hash("feedfacedaffdeed") == 0xe83641e1U);
-    assert(hash("feedfacedaffdeed\0") == 0x6e69b533U);
-    assert(hash("feedfacedeadbeef") == 0xf1760448U);
-    assert(hash("feedfacedeadbeef\0") == 0x64c8bd58U);
-    assert(hash("line 1\nline 2\nline 3") == 0x97b4ea23U);
-    assert(hash("chongo <Landon Curt Noll> /\\../\\") == 0x9a4e92e6U);
-    assert(hash("chongo <Landon Curt Noll> /\\../\\\0") == 0xcfb14012U);
-    assert(hash("chongo (Landon Curt Noll) /\\../\\") == 0xf01b2511U);
-    assert(hash("chongo (Landon Curt Noll) /\\../\\\0") == 0x0bbb59c3U);
-    assert(hash("http://antwrp.gsfc.nasa.gov/apod/astropix.html") == 0xce524afaU);
-    assert(hash("http://en.wikipedia.org/wiki/Fowler_Noll_Vo_hash") == 0xdd16ef45U);
-    assert(hash("http://epod.usra.edu/") == 0x60648bb3U);
-    assert(hash("http://exoplanet.eu/") == 0x7fa4bcfcU);
-    assert(hash("http://hvo.wr.usgs.gov/cam3/") == 0x5053ae17U);
-    assert(hash("http://hvo.wr.usgs.gov/cams/HMcam/") == 0xc9302890U);
-    assert(hash("http://hvo.wr.usgs.gov/kilauea/update/deformation.html") == 0x956ded32U);
-    assert(hash("http://hvo.wr.usgs.gov/kilauea/update/images.html") == 0x9136db84U);
-    assert(hash("http://hvo.wr.usgs.gov/kilauea/update/maps.html") == 0xdf9d3323U);
-    assert(hash("http://hvo.wr.usgs.gov/volcanowatch/current_issue.html") == 0x32bb6cd0U);
-    assert(hash("http://neo.jpl.nasa.gov/risk/") == 0xc8f8385bU);
-    assert(hash("http://norvig.com/21-days.html") == 0xeb08bfbaU);
-    assert(hash("http://primes.utm.edu/curios/home.php") == 0x62cc8e3dU);
-    assert(hash("http://slashdot.org/") == 0xc3e20f5cU);
-    assert(hash("http://tux.wr.usgs.gov/Maps/155.25-19.5.html") == 0x39e97f17U);
-    assert(hash("http://volcano.wr.usgs.gov/kilaueastatus.php") == 0x7837b203U);
-    assert(hash("http://www.avo.alaska.edu/activity/Redoubt.php") == 0x319e877bU);
-    assert(hash("http://www.dilbert.com/fast/") == 0xd3e63f89U);
-    assert(hash("http://www.fourmilab.ch/gravitation/orbits/") == 0x29b50b38U);
-    assert(hash("http://www.fpoa.net/") == 0x5ed678b8U);
-    assert(hash("http://www.ioccc.org/index.html") == 0xb0d5b793U);
-    assert(hash("http://www.isthe.com/cgi-bin/number.cgi") == 0x52450be5U);
-    assert(hash("http://www.isthe.com/chongo/bio.html") == 0xfa72d767U);
-    assert(hash("http://www.isthe.com/chongo/index.html") == 0x95066709U);
-    assert(hash("http://www.isthe.com/chongo/src/calc/lucas-calc") == 0x7f52e123U);
-    assert(hash("http://www.isthe.com/chongo/tech/astro/venus2004.html") == 0x76966481U);
-    assert(hash("http://www.isthe.com/chongo/tech/astro/vita.html") == 0x063258b0U);
-    assert(hash("http://www.isthe.com/chongo/tech/comp/c/expert.html") == 0x2ded6e8aU);
-    assert(hash("http://www.isthe.com/chongo/tech/comp/calc/index.html") == 0xb07d7c52U);
-    assert(hash("http://www.isthe.com/chongo/tech/comp/fnv/index.html") == 0xd0c71b71U);
-    assert(hash("http://www.isthe.com/chongo/tech/math/number/howhigh.html") == 0xf684f1bdU);
-    assert(hash("http://www.isthe.com/chongo/tech/math/number/number.html") == 0x868ecfa8U);
-    assert(hash("http://www.isthe.com/chongo/tech/math/prime/mersenne.html") == 0xf794f684U);
-    assert(hash("http://www.isthe.com/chongo/tech/math/prime/mersenne.html#largest") == 0xd19701c3U);
-    assert(hash("http://www.lavarnd.org/cgi-bin/corpspeak.cgi") == 0x346e171eU);
-    assert(hash("http://www.lavarnd.org/cgi-bin/haiku.cgi") == 0x91f8f676U);
-    assert(hash("http://www.lavarnd.org/cgi-bin/rand-none.cgi") == 0x0bf58848U);
-    assert(hash("http://www.lavarnd.org/cgi-bin/randdist.cgi") == 0x6317b6d1U);
-    assert(hash("http://www.lavarnd.org/index.html") == 0xafad4c54U);
-    assert(hash("http://www.lavarnd.org/what/nist-test.html") == 0x0f25681eU);
-    assert(hash("http://www.macosxhints.com/") == 0x91b18d49U);
-    assert(hash("http://www.mellis.com/") == 0x7d61c12eU);
-    assert(hash("http://www.nature.nps.gov/air/webcams/parks/havoso2alert/havoalert.cfm") == 0x5147d25cU);
-    assert(hash("http://www.nature.nps.gov/air/webcams/parks/havoso2alert/timelines_24.cfm") == 0x9a8b6805U);
-    assert(hash("http://www.paulnoll.com/") == 0x4cd2a447U);
-    assert(hash("http://www.pepysdiary.com/") == 0x1e549b14U);
-    assert(hash("http://www.sciencenews.org/index/home/activity/view") == 0x2fe1b574U);
-    assert(hash("http://www.skyandtelescope.com/") == 0xcf0cd31eU);
-    assert(hash("http://www.sput.nl/~rob/sirius.html") == 0x6c471669U);
-    assert(hash("http://www.systemexperts.com/") == 0x0e5eef1eU);
-    assert(hash("http://www.tq-international.com/phpBB3/index.php") == 0x2bed3602U);
-    assert(hash("http://www.travelquesttours.com/index.htm") == 0xb26249e0U);
-    assert(hash("http://www.wunderground.com/global/stations/89606.html") == 0x2c9b86a4U);
-    assert(hash(r10!"21701") == 0xe415e2bbU);
-    assert(hash(r10!"M21701") == 0x18a98d1dU);
-    assert(hash(r10!"2^21701-1") == 0xb7df8b7bU);
-    assert(hash(r10!"\x54\xc5") == 0x241e9075U);
-    assert(hash(r10!"\xc5\x54") == 0x063f70ddU);
-    assert(hash(r10!"23209") == 0x0295aed9U);
-    assert(hash(r10!"M23209") == 0x56a7f781U);
-    assert(hash(r10!"2^23209-1") == 0x253bc645U);
-    assert(hash(r10!"\x5a\xa9") == 0x46610921U);
-    assert(hash(r10!"\xa9\x5a") == 0x7c1577f9U);
-    assert(hash(r10!"391581216093") == 0x512b2851U);
-    assert(hash(r10!"391581*2^216093-1") == 0x76823999U);
-    assert(hash(r10!"\x05\xf9\x9d\x03\x4c\x81") == 0xc0586935U);
-    assert(hash(r10!"FEDCBA9876543210") == 0xf3415c85U);
-    assert(hash(r10!"\xfe\xdc\xba\x98\x76\x54\x32\x10") == 0x0ae4ff65U);
-    assert(hash(r10!"EFCDAB8967452301") == 0x58b79725U);
-    assert(hash(r10!"\xef\xcd\xab\x89\x67\x45\x23\x01") == 0xdea43aa5U);
-    assert(hash(r10!"0123456789ABCDEF") == 0x2bb3be35U);
-    assert(hash(r10!"\x01\x23\x45\x67\x89\xab\xcd\xef") == 0xea777a45U);
-    assert(hash(r10!"1032547698BADCFE") == 0x8f21c305U);
-    assert(hash(r10!"\x10\x32\x54\x76\x98\xba\xdc\xfe") == 0x5c9d0865U);
-    assert(hash(r500!"\x00") == 0xfa823dd5U);
-    assert(hash(r500!"\x07") == 0x21a27271U);
-    assert(hash(r500!"~") == 0x83c5c6d5U);
-    assert(hash(r500!"\x7f") == 0x813b0881U);
-}
-
-// FNV-1a 64 bit test vectors
-static if (size_t.sizeof == 8) @nogc nothrow pure @safe unittest
-{
-    assert(hash("") == 0xcbf29ce484222325UL);
-    assert(hash("a") == 0xaf63dc4c8601ec8cUL);
-    assert(hash("b") == 0xaf63df4c8601f1a5UL);
-    assert(hash("c") == 0xaf63de4c8601eff2UL);
-    assert(hash("d") == 0xaf63d94c8601e773UL);
-    assert(hash("e") == 0xaf63d84c8601e5c0UL);
-    assert(hash("f") == 0xaf63db4c8601ead9UL);
-    assert(hash("fo") == 0x08985907b541d342UL);
-    assert(hash("foo") == 0xdcb27518fed9d577UL);
-    assert(hash("foob") == 0xdd120e790c2512afUL);
-    assert(hash("fooba") == 0xcac165afa2fef40aUL);
-    assert(hash("foobar") == 0x85944171f73967e8UL);
-    assert(hash("\0") == 0xaf63bd4c8601b7dfUL);
-    assert(hash("a\0") == 0x089be207b544f1e4UL);
-    assert(hash("b\0") == 0x08a61407b54d9b5fUL);
-    assert(hash("c\0") == 0x08a2ae07b54ab836UL);
-    assert(hash("d\0") == 0x0891b007b53c4869UL);
-    assert(hash("e\0") == 0x088e4a07b5396540UL);
-    assert(hash("f\0") == 0x08987c07b5420ebbUL);
-    assert(hash("fo\0") == 0xdcb28a18fed9f926UL);
-    assert(hash("foo\0") == 0xdd1270790c25b935UL);
-    assert(hash("foob\0") == 0xcac146afa2febf5dUL);
-    assert(hash("fooba\0") == 0x8593d371f738acfeUL);
-    assert(hash("foobar\0") == 0x34531ca7168b8f38UL);
-    assert(hash("ch") == 0x08a25607b54a22aeUL);
-    assert(hash("cho") == 0xf5faf0190cf90df3UL);
-    assert(hash("chon") == 0xf27397910b3221c7UL);
-    assert(hash("chong") == 0x2c8c2b76062f22e0UL);
-    assert(hash("chongo") == 0xe150688c8217b8fdUL);
-    assert(hash("chongo ") == 0xf35a83c10e4f1f87UL);
-    assert(hash("chongo w") == 0xd1edd10b507344d0UL);
-    assert(hash("chongo wa") == 0x2a5ee739b3ddb8c3UL);
-    assert(hash("chongo was") == 0xdcfb970ca1c0d310UL);
-    assert(hash("chongo was ") == 0x4054da76daa6da90UL);
-    assert(hash("chongo was h") == 0xf70a2ff589861368UL);
-    assert(hash("chongo was he") == 0x4c628b38aed25f17UL);
-    assert(hash("chongo was her") == 0x9dd1f6510f78189fUL);
-    assert(hash("chongo was here") == 0xa3de85bd491270ceUL);
-    assert(hash("chongo was here!") == 0x858e2fa32a55e61dUL);
-    assert(hash("chongo was here!\n") == 0x46810940eff5f915UL);
-    assert(hash("ch\0") == 0xf5fadd190cf8edaaUL);
-    assert(hash("cho\0") == 0xf273ed910b32b3e9UL);
-    assert(hash("chon\0") == 0x2c8c5276062f6525UL);
-    assert(hash("chong\0") == 0xe150b98c821842a0UL);
-    assert(hash("chongo\0") == 0xf35aa3c10e4f55e7UL);
-    assert(hash("chongo \0") == 0xd1ed680b50729265UL);
-    assert(hash("chongo w\0") == 0x2a5f0639b3dded70UL);
-    assert(hash("chongo wa\0") == 0xdcfbaa0ca1c0f359UL);
-    assert(hash("chongo was\0") == 0x4054ba76daa6a430UL);
-    assert(hash("chongo was \0") == 0xf709c7f5898562b0UL);
-    assert(hash("chongo was h\0") == 0x4c62e638aed2f9b8UL);
-    assert(hash("chongo was he\0") == 0x9dd1a8510f779415UL);
-    assert(hash("chongo was her\0") == 0xa3de2abd4911d62dUL);
-    assert(hash("chongo was here\0") == 0x858e0ea32a55ae0aUL);
-    assert(hash("chongo was here!\0") == 0x46810f40eff60347UL);
-    assert(hash("chongo was here!\n\0") == 0xc33bce57bef63eafUL);
-    assert(hash("cu") == 0x08a24307b54a0265UL);
-    assert(hash("cur") == 0xf5b9fd190cc18d15UL);
-    assert(hash("curd") == 0x4c968290ace35703UL);
-    assert(hash("curds") == 0x07174bd5c64d9350UL);
-    assert(hash("curds ") == 0x5a294c3ff5d18750UL);
-    assert(hash("curds a") == 0x05b3c1aeb308b843UL);
-    assert(hash("curds an") == 0xb92a48da37d0f477UL);
-    assert(hash("curds and") == 0x73cdddccd80ebc49UL);
-    assert(hash("curds and ") == 0xd58c4c13210a266bUL);
-    assert(hash("curds and w") == 0xe78b6081243ec194UL);
-    assert(hash("curds and wh") == 0xb096f77096a39f34UL);
-    assert(hash("curds and whe") == 0xb425c54ff807b6a3UL);
-    assert(hash("curds and whey") == 0x23e520e2751bb46eUL);
-    assert(hash("curds and whey\n") == 0x1a0b44ccfe1385ecUL);
-    assert(hash("cu\0") == 0xf5ba4b190cc2119fUL);
-    assert(hash("cur\0") == 0x4c962690ace2baafUL);
-    assert(hash("curd\0") == 0x0716ded5c64cda19UL);
-    assert(hash("curds\0") == 0x5a292c3ff5d150f0UL);
-    assert(hash("curds \0") == 0x05b3e0aeb308ecf0UL);
-    assert(hash("curds a\0") == 0xb92a5eda37d119d9UL);
-    assert(hash("curds an\0") == 0x73ce41ccd80f6635UL);
-    assert(hash("curds and\0") == 0xd58c2c132109f00bUL);
-    assert(hash("curds and \0") == 0xe78baf81243f47d1UL);
-    assert(hash("curds and w\0") == 0xb0968f7096a2ee7cUL);
-    assert(hash("curds and wh\0") == 0xb425a84ff807855cUL);
-    assert(hash("curds and whe\0") == 0x23e4e9e2751b56f9UL);
-    assert(hash("curds and whey\0") == 0x1a0b4eccfe1396eaUL);
-    assert(hash("curds and whey\n\0") == 0x54abd453bb2c9004UL);
-    assert(hash("hi") == 0x08ba5f07b55ec3daUL);
-    assert(hash("hi\0") == 0x337354193006cb6eUL);
-    assert(hash("hello") == 0xa430d84680aabd0bUL);
-    assert(hash("hello\0") == 0xa9bc8acca21f39b1UL);
-    assert(hash("\xff\x00\x00\x01") == 0x6961196491cc682dUL);
-    assert(hash("\x01\x00\x00\xff") == 0xad2bb1774799dfe9UL);
-    assert(hash("\xff\x00\x00\x02") == 0x6961166491cc6314UL);
-    assert(hash("\x02\x00\x00\xff") == 0x8d1bb3904a3b1236UL);
-    assert(hash("\xff\x00\x00\x03") == 0x6961176491cc64c7UL);
-    assert(hash("\x03\x00\x00\xff") == 0xed205d87f40434c7UL);
-    assert(hash("\xff\x00\x00\x04") == 0x6961146491cc5faeUL);
-    assert(hash("\x04\x00\x00\xff") == 0xcd3baf5e44f8ad9cUL);
-    assert(hash("\x40\x51\x4e\x44") == 0xe3b36596127cd6d8UL);
-    assert(hash("\x44\x4e\x51\x40") == 0xf77f1072c8e8a646UL);
-    assert(hash("\x40\x51\x4e\x4a") == 0xe3b36396127cd372UL);
-    assert(hash("\x4a\x4e\x51\x40") == 0x6067dce9932ad458UL);
-    assert(hash("\x40\x51\x4e\x54") == 0xe3b37596127cf208UL);
-    assert(hash("\x54\x4e\x51\x40") == 0x4b7b10fa9fe83936UL);
-    assert(hash("127.0.0.1") == 0xaabafe7104d914beUL);
-    assert(hash("127.0.0.1\0") == 0xf4d3180b3cde3edaUL);
-    assert(hash("127.0.0.2") == 0xaabafd7104d9130bUL);
-    assert(hash("127.0.0.2\0") == 0xf4cfb20b3cdb5bb1UL);
-    assert(hash("127.0.0.3") == 0xaabafc7104d91158UL);
-    assert(hash("127.0.0.3\0") == 0xf4cc4c0b3cd87888UL);
-    assert(hash("64.81.78.68") == 0xe729bac5d2a8d3a7UL);
-    assert(hash("64.81.78.68\0") == 0x74bc0524f4dfa4c5UL);
-    assert(hash("64.81.78.74") == 0xe72630c5d2a5b352UL);
-    assert(hash("64.81.78.74\0") == 0x6b983224ef8fb456UL);
-    assert(hash("64.81.78.84") == 0xe73042c5d2ae266dUL);
-    assert(hash("64.81.78.84\0") == 0x8527e324fdeb4b37UL);
-    assert(hash("feedface") == 0x0a83c86fee952abcUL);
-    assert(hash("feedface\0") == 0x7318523267779d74UL);
-    assert(hash("feedfacedaffdeed") == 0x3e66d3d56b8caca1UL);
-    assert(hash("feedfacedaffdeed\0") == 0x956694a5c0095593UL);
-    assert(hash("feedfacedeadbeef") == 0xcac54572bb1a6fc8UL);
-    assert(hash("feedfacedeadbeef\0") == 0xa7a4c9f3edebf0d8UL);
-    assert(hash("line 1\nline 2\nline 3") == 0x7829851fac17b143UL);
-    assert(hash("chongo <Landon Curt Noll> /\\../\\") == 0x2c8f4c9af81bcf06UL);
-    assert(hash("chongo <Landon Curt Noll> /\\../\\\0") == 0xd34e31539740c732UL);
-    assert(hash("chongo (Landon Curt Noll) /\\../\\") == 0x3605a2ac253d2db1UL);
-    assert(hash("chongo (Landon Curt Noll) /\\../\\\0") == 0x08c11b8346f4a3c3UL);
-    assert(hash("http://antwrp.gsfc.nasa.gov/apod/astropix.html") == 0x6be396289ce8a6daUL);
-    assert(hash("http://en.wikipedia.org/wiki/Fowler_Noll_Vo_hash") == 0xd9b957fb7fe794c5UL);
-    assert(hash("http://epod.usra.edu/") == 0x05be33da04560a93UL);
-    assert(hash("http://exoplanet.eu/") == 0x0957f1577ba9747cUL);
-    assert(hash("http://hvo.wr.usgs.gov/cam3/") == 0xda2cc3acc24fba57UL);
-    assert(hash("http://hvo.wr.usgs.gov/cams/HMcam/") == 0x74136f185b29e7f0UL);
-    assert(hash("http://hvo.wr.usgs.gov/kilauea/update/deformation.html") == 0xb2f2b4590edb93b2UL);
-    assert(hash("http://hvo.wr.usgs.gov/kilauea/update/images.html") == 0xb3608fce8b86ae04UL);
-    assert(hash("http://hvo.wr.usgs.gov/kilauea/update/maps.html") == 0x4a3a865079359063UL);
-    assert(hash("http://hvo.wr.usgs.gov/volcanowatch/current_issue.html") == 0x5b3a7ef496880a50UL);
-    assert(hash("http://neo.jpl.nasa.gov/risk/") == 0x48fae3163854c23bUL);
-    assert(hash("http://norvig.com/21-days.html") == 0x07aaa640476e0b9aUL);
-    assert(hash("http://primes.utm.edu/curios/home.php") == 0x2f653656383a687dUL);
-    assert(hash("http://slashdot.org/") == 0xa1031f8e7599d79cUL);
-    assert(hash("http://tux.wr.usgs.gov/Maps/155.25-19.5.html") == 0xa31908178ff92477UL);
-    assert(hash("http://volcano.wr.usgs.gov/kilaueastatus.php") == 0x097edf3c14c3fb83UL);
-    assert(hash("http://www.avo.alaska.edu/activity/Redoubt.php") == 0xb51ca83feaa0971bUL);
-    assert(hash("http://www.dilbert.com/fast/") == 0xdd3c0d96d784f2e9UL);
-    assert(hash("http://www.fourmilab.ch/gravitation/orbits/") == 0x86cd26a9ea767d78UL);
-    assert(hash("http://www.fpoa.net/") == 0xe6b215ff54a30c18UL);
-    assert(hash("http://www.ioccc.org/index.html") == 0xec5b06a1c5531093UL);
-    assert(hash("http://www.isthe.com/cgi-bin/number.cgi") == 0x45665a929f9ec5e5UL);
-    assert(hash("http://www.isthe.com/chongo/bio.html") == 0x8c7609b4a9f10907UL);
-    assert(hash("http://www.isthe.com/chongo/index.html") == 0x89aac3a491f0d729UL);
-    assert(hash("http://www.isthe.com/chongo/src/calc/lucas-calc") == 0x32ce6b26e0f4a403UL);
-    assert(hash("http://www.isthe.com/chongo/tech/astro/venus2004.html") == 0x614ab44e02b53e01UL);
-    assert(hash("http://www.isthe.com/chongo/tech/astro/vita.html") == 0xfa6472eb6eef3290UL);
-    assert(hash("http://www.isthe.com/chongo/tech/comp/c/expert.html") == 0x9e5d75eb1948eb6aUL);
-    assert(hash("http://www.isthe.com/chongo/tech/comp/calc/index.html") == 0xb6d12ad4a8671852UL);
-    assert(hash("http://www.isthe.com/chongo/tech/comp/fnv/index.html") == 0x88826f56eba07af1UL);
-    assert(hash("http://www.isthe.com/chongo/tech/math/number/howhigh.html") == 0x44535bf2645bc0fdUL);
-    assert(hash("http://www.isthe.com/chongo/tech/math/number/number.html") == 0x169388ffc21e3728UL);
-    assert(hash("http://www.isthe.com/chongo/tech/math/prime/mersenne.html") == 0xf68aac9e396d8224UL);
-    assert(hash("http://www.isthe.com/chongo/tech/math/prime/mersenne.html#largest") == 0x8e87d7e7472b3883UL);
-    assert(hash("http://www.lavarnd.org/cgi-bin/corpspeak.cgi") == 0x295c26caa8b423deUL);
-    assert(hash("http://www.lavarnd.org/cgi-bin/haiku.cgi") == 0x322c814292e72176UL);
-    assert(hash("http://www.lavarnd.org/cgi-bin/rand-none.cgi") == 0x8a06550eb8af7268UL);
-    assert(hash("http://www.lavarnd.org/cgi-bin/randdist.cgi") == 0xef86d60e661bcf71UL);
-    assert(hash("http://www.lavarnd.org/index.html") == 0x9e5426c87f30ee54UL);
-    assert(hash("http://www.lavarnd.org/what/nist-test.html") == 0xf1ea8aa826fd047eUL);
-    assert(hash("http://www.macosxhints.com/") == 0x0babaf9a642cb769UL);
-    assert(hash("http://www.mellis.com/") == 0x4b3341d4068d012eUL);
-    assert(hash("http://www.nature.nps.gov/air/webcams/parks/havoso2alert/havoalert.cfm") == 0xd15605cbc30a335cUL);
-    assert(hash("http://www.nature.nps.gov/air/webcams/parks/havoso2alert/timelines_24.cfm") == 0x5b21060aed8412e5UL);
-    assert(hash("http://www.paulnoll.com/") == 0x45e2cda1ce6f4227UL);
-    assert(hash("http://www.pepysdiary.com/") == 0x50ae3745033ad7d4UL);
-    assert(hash("http://www.sciencenews.org/index/home/activity/view") == 0xaa4588ced46bf414UL);
-    assert(hash("http://www.skyandtelescope.com/") == 0xc1b0056c4a95467eUL);
-    assert(hash("http://www.sput.nl/~rob/sirius.html") == 0x56576a71de8b4089UL);
-    assert(hash("http://www.systemexperts.com/") == 0xbf20965fa6dc927eUL);
-    assert(hash("http://www.tq-international.com/phpBB3/index.php") == 0x569f8383c2040882UL);
-    assert(hash("http://www.travelquesttours.com/index.htm") == 0xe1e772fba08feca0UL);
-    assert(hash("http://www.wunderground.com/global/stations/89606.html") == 0x4ced94af97138ac4UL);
-    assert(hash(r10!"21701") == 0xc4112ffb337a82fbUL);
-    assert(hash(r10!"M21701") == 0xd64a4fd41de38b7dUL);
-    assert(hash(r10!"2^21701-1") == 0x4cfc32329edebcbbUL);
-    assert(hash(r10!"\x54\xc5") == 0x0803564445050395UL);
-    assert(hash(r10!"\xc5\x54") == 0xaa1574ecf4642ffdUL);
-    assert(hash(r10!"23209") == 0x694bc4e54cc315f9UL);
-    assert(hash(r10!"M23209") == 0xa3d7cb273b011721UL);
-    assert(hash(r10!"2^23209-1") == 0x577c2f8b6115bfa5UL);
-    assert(hash(r10!"\x5a\xa9") == 0xb7ec8c1a769fb4c1UL);
-    assert(hash(r10!"\xa9\x5a") == 0x5d5cfce63359ab19UL);
-    assert(hash(r10!"391581216093") == 0x33b96c3cd65b5f71UL);
-    assert(hash(r10!"391581*2^216093-1") == 0xd845097780602bb9UL);
-    assert(hash(r10!"\x05\xf9\x9d\x03\x4c\x81") == 0x84d47645d02da3d5UL);
-    assert(hash(r10!"FEDCBA9876543210") == 0x83544f33b58773a5UL);
-    assert(hash(r10!"\xfe\xdc\xba\x98\x76\x54\x32\x10") == 0x9175cbb2160836c5UL);
-    assert(hash(r10!"EFCDAB8967452301") == 0xc71b3bc175e72bc5UL);
-    assert(hash(r10!"\xef\xcd\xab\x89\x67\x45\x23\x01") == 0x636806ac222ec985UL);
-    assert(hash(r10!"0123456789ABCDEF") == 0xb6ef0e6950f52ed5UL);
-    assert(hash(r10!"\x01\x23\x45\x67\x89\xab\xcd\xef") == 0xead3d8a0f3dfdaa5UL);
-    assert(hash(r10!"1032547698BADCFE") == 0x922908fe9a861ba5UL);
-    assert(hash(r10!"\x10\x32\x54\x76\x98\xba\xdc\xfe") == 0x6d4821de275fd5c5UL);
-    assert(hash(r500!"\x00") == 0x1fe3fce62bd816b5UL);
-    assert(hash(r500!"\x07") == 0xc23e9fccd6f70591UL);
-    assert(hash(r500!"~") == 0xc1af12bdfe16b5b5UL);
-    assert(hash(r500!"\x7f") == 0x39e9f18f2f85e221UL);
-}
-
 /**
 * Determines whether $(D_PARAM hasher) is hash function for $(D_PARAM T), i.e.
 * it is callable with a value of type $(D_PARAM T) and returns a
--- a/source/tanya/hash/package.d
+++ b/source/tanya/hash/package.d
@ -3,7 +3,7 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 /**
- * Copyright: Eugene Wissner 2018.
+ * Copyright: Eugene Wissner 2018-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
--- a/source/tanya/math/mp.d
+++ b/source/tanya/math/mp.d
--- a/source/tanya/math/nbtheory.d
+++ b/source/tanya/math/nbtheory.d
@ -1,167 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Number theory.
- *
- * Copyright: Eugene Wissner 2017-2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/math/nbtheory.d,
- *                 tanya/math/nbtheory.d)
- */
-module tanya.math.nbtheory;
-
-import tanya.math.mp;
-import tanya.meta.trait;
-import tanya.meta.transform;
-
-version (TanyaNative)
-{
-    private extern float fabs(float) @nogc nothrow pure @safe;
-    private extern double fabs(double) @nogc nothrow pure @safe;
-    private extern real fabs(real) @nogc nothrow pure @safe;
-
-    private extern double log(double) @nogc nothrow pure @safe;
-    private extern float logf(float) @nogc nothrow pure @safe;
-    private extern real logl(real) @nogc nothrow pure @safe;
-}
-else
-{
-    import core.math : fabs;
-    import std.math : log;
-}
-
-/**
- * Calculates the absolute value of a number.
- *
- * Params:
- *  T = Argument type.
- *  x = Argument.
- *
- * Returns: Absolute value of $(D_PARAM x).
- */
-Unqual!T abs(T)(T x)
-if (isIntegral!T)
-{
-    static if (isSigned!T)
-    {
-        return x >= 0 ? x : -x;
-    }
-    else
-    {
-        return x;
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    int i = -1;
-    assert(i.abs == 1);
-    static assert(is(typeof(i.abs) == int));
-
-    uint u = 1;
-    assert(u.abs == 1);
-    static assert(is(typeof(u.abs) == uint));
-}
-
-/// ditto
-Unqual!T abs(T)(T x)
-if (isFloatingPoint!T)
-{
-    return fabs(x);
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    float f = -1.64;
-    assert(f.abs == 1.64F);
-    static assert(is(typeof(f.abs) == float));
-
-    double d = -1.64;
-    assert(d.abs == 1.64);
-    static assert(is(typeof(d.abs) == double));
-
-    real r = -1.64;
-    assert(r.abs == 1.64L);
-    static assert(is(typeof(r.abs) == real));
-}
-
-/// ditto
-T abs(T : Integer)(const auto ref T x)
-{
-    auto result = Integer(x, x.allocator);
-    result.sign = Sign.positive;
-    return result;
-}
-
-/// ditto
-T abs(T : Integer)(T x)
-{
-    x.sign = Sign.positive;
-    return x;
-}
-
-version (D_Ddoc)
-{
-    /**
-     * Calculates natural logarithm of $(D_PARAM x).
-     *
-     * Params:
-     *  T = Argument type.
-     *  x = Argument.
-     *
-     * Returns: Natural logarithm of $(D_PARAM x).
-     */
-    Unqual!T ln(T)(T x)
-    if (isFloatingPoint!T);
-}
-else version (TanyaNative)
-{
-    Unqual!T ln(T)(T x) @nogc nothrow pure @safe
-    if (isFloatingPoint!T)
-    {
-        static if (is(Unqual!T == float))
-        {
-            return logf(x);
-        }
-        else static if (is(Unqual!T == double))
-        {
-            return log(x);
-        }
-        else
-        {
-            return logl(x);
-        }
-    }
-}
-else
-{
-    Unqual!T ln(T)(T x)
-    if (isFloatingPoint!T)
-    {
-        return log(x);
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    import tanya.math;
-
-    assert(isNaN(ln(-7.389f)));
-    assert(isNaN(ln(-7.389)));
-    assert(isNaN(ln(-7.389L)));
-
-    assert(isInfinity(ln(0.0f)));
-    assert(isInfinity(ln(0.0)));
-    assert(isInfinity(ln(0.0L)));
-
-    assert(ln(1.0f) == 0.0f);
-    assert(ln(1.0) == 0.0);
-    assert(ln(1.0L) == 0.0L);
-}
--- a/source/tanya/math/package.d
+++ b/source/tanya/math/package.d
@ -12,7 +12,7 @@
 * be found in its submodules. $(D_PSYMBOL tanya.math) doesn't import any
 * submodules publically, they should be imported explicitly.
 *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2022.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -21,9 +21,7 @@
 */
 module tanya.math;

-import tanya.algorithm.mutation;
-import tanya.math.mp;
-import tanya.math.nbtheory;
+import std.math;
 import tanya.meta.trait;
 import tanya.meta.transform;

@ -255,21 +253,6 @@ if (isFloatingPoint!F)
    assert(classify(-real.infinity) == FloatingPointClass.infinite);
 }

-@nogc nothrow pure @safe unittest
-{
-    static if (ieeePrecision!float == IEEEPrecision.doubleExtended)
-    {
-        assert(classify(1.68105e-10) == FloatingPointClass.normal);
-        assert(classify(1.68105e-4932L) == FloatingPointClass.subnormal);
-
-        // Emulate unnormals, because they aren't generated anymore since i386
-        FloatBits!real unnormal;
-        unnormal.exp = 0x123;
-        unnormal.mantissa = 0x1;
-        assert(classify(unnormal) == FloatingPointClass.subnormal);
-    }
-}
-
 /**
 * Determines whether $(D_PARAM x) is a finite number.
 *
@ -560,182 +543,3 @@ if (isFloatingPoint!F)
    assert(signBit(-1.0L));
    assert(!signBit(1.0L));
 }
-
-/**
- * Computes $(D_PARAM x) to the power $(D_PARAM y) modulo $(D_PARAM z).
- *
- * If $(D_PARAM I) is an $(D_PSYMBOL Integer), the allocator of $(D_PARAM x)
- * is used to allocate the result.
- *
- * Params:
- *  I = Base type.
- *  G = Exponent type.
- *  H = Divisor type:
- *  x = Base.
- *  y = Exponent.
- *  z = Divisor.
- *
- * Returns: Reminder of the division of $(D_PARAM x) to the power $(D_PARAM y)
- *          by $(D_PARAM z).
- *
- * Precondition: $(D_INLINECODE z > 0)
- */
-H pow(I, G, H)(in auto ref I x, in auto ref G y, in auto ref H z)
-if (isIntegral!I && isIntegral!G && isIntegral!H)
-in
-{
-    assert(z > 0, "Division by zero.");
-}
-do
-{
-    G mask = G.max / 2 + 1;
-    H result;
-
-    if (y == 0)
-    {
-        return 1 % z;
-    }
-    else if (y == 1)
-    {
-        return x % z;
-    }
-    do
-    {
-        immutable bit = y & mask;
-        if (!result && bit)
-        {
-            result = x;
-            continue;
-        }
-
-        result *= result;
-        if (bit)
-        {
-            result *= x;
-        }
-        result %= z;
-    }
-    while (mask >>= 1);
-
-    return result;
-}
-
-/// ditto
-I pow(I)(const auto ref I x, const auto ref I y, const auto ref I z)
-if (is(I == Integer))
-in
-{
-    assert(z.length > 0, "Division by zero.");
-}
-do
-{
-    size_t i;
-    auto tmp1 = Integer(x, x.allocator);
-    auto result = Integer(x.allocator);
-
-    if (x.size == 0 && y.size != 0)
-    {
-        i = y.size;
-    }
-    else
-    {
-        result = 1;
-    }
-    while (i < y.size)
-    {
-        for (uint mask = 0x01; mask != 0x10000000; mask <<= 1)
-        {
-            if (y.rep[i] & mask)
-            {
-                result *= tmp1;
-                result %= z;
-            }
-            auto tmp2 = tmp1;
-            tmp1 *= tmp2;
-            tmp1 %= z;
-        }
-        ++i;
-    }
-    return result;
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    assert(pow(3, 5, 7) == 5);
-    assert(pow(2, 2, 1) == 0);
-    assert(pow(3, 3, 3) == 0);
-    assert(pow(7, 4, 2) == 1);
-    assert(pow(53, 0, 2) == 1);
-    assert(pow(53, 1, 3) == 2);
-    assert(pow(53, 2, 5) == 4);
-    assert(pow(0, 0, 5) == 1);
-    assert(pow(0, 5, 5) == 0);
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    assert(pow(Integer(3), Integer(5), Integer(7)) == 5);
-    assert(pow(Integer(2), Integer(2), Integer(1)) == 0);
-    assert(pow(Integer(3), Integer(3), Integer(3)) == 0);
-    assert(pow(Integer(7), Integer(4), Integer(2)) == 1);
-    assert(pow(Integer(53), Integer(0), Integer(2)) == 1);
-    assert(pow(Integer(53), Integer(1), Integer(3)) == 2);
-    assert(pow(Integer(53), Integer(2), Integer(5)) == 4);
-    assert(pow(Integer(0), Integer(0), Integer(5)) == 1);
-    assert(pow(Integer(0), Integer(5), Integer(5)) == 0);
-}
-
-/**
- * Checks if $(D_PARAM x) is a prime.
- *
- * Params:
- *  x = The number should be checked.
- *
- * Returns: $(D_KEYWORD true) if $(D_PARAM x) is a prime number,
- *          $(D_KEYWORD false) otherwise.
- */
-bool isPseudoprime(ulong x) @nogc nothrow pure @safe
-{
-    return pow(2, x - 1, x) == 1;
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    assert(74623.isPseudoprime);
-    assert(104729.isPseudoprime);
-    assert(15485867.isPseudoprime);
-    assert(!15485868.isPseudoprime);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    assert(74653.isPseudoprime);
-    assert(74687.isPseudoprime);
-    assert(74699.isPseudoprime);
-    assert(74707.isPseudoprime);
-    assert(74713.isPseudoprime);
-    assert(74717.isPseudoprime);
-    assert(74719.isPseudoprime);
-    assert(74747.isPseudoprime);
-    assert(74759.isPseudoprime);
-    assert(74761.isPseudoprime);
-    assert(74771.isPseudoprime);
-    assert(74779.isPseudoprime);
-    assert(74797.isPseudoprime);
-    assert(74821.isPseudoprime);
-    assert(74827.isPseudoprime);
-    assert(9973.isPseudoprime);
-    assert(49979693.isPseudoprime);
-    assert(104395303.isPseudoprime);
-    assert(593441861.isPseudoprime);
-    assert(104729.isPseudoprime);
-    assert(15485867.isPseudoprime);
-    assert(49979693.isPseudoprime);
-    assert(104395303.isPseudoprime);
-    assert(593441861.isPseudoprime);
-    assert(899809363.isPseudoprime);
-    assert(982451653.isPseudoprime);
-}
--- a/source/tanya/math/random.d
+++ b/source/tanya/math/random.d
@ -5,7 +5,7 @@
 /**
 * Random number generator.
 *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2022.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -14,9 +14,8 @@
 */
 module tanya.math.random;

-import std.digest.sha;
-import tanya.memory;
-import tanya.typecons;
+import std.typecons;
+import tanya.memory.allocator;

 /// Maximum amount gathered from the entropy sources.
 enum maxGather = 128;
@ -91,8 +90,7 @@ abstract class EntropySource
     * Postcondition: Returned length is less than or equal to
     *                $(D_PARAM output) length.
     */
-    Option!ubyte poll(out ubyte[maxGather] output) @nogc
-    out (length; length.isNothing || length.get <= maxGather);
+    Nullable!ubyte poll(out ubyte[maxGather] output) @nogc;
 }

 version (CRuntime_Bionic)
@ -152,12 +150,17 @@ version (linux)
         * Returns: Number of bytes that were copied to the $(D_PARAM output)
         *          or nothing on error.
         */
-        override Option!ubyte poll(out ubyte[maxGather] output) @nogc nothrow
+        override Nullable!ubyte poll(out ubyte[maxGather] output) @nogc nothrow
+        out (length)
+        {
+            assert(length.isNull || length.get <= maxGather);
+        }
+        do
        {
            // int getrandom(void *buf, size_t buflen, unsigned int flags);
            import mir.linux._asm.unistd : NR_getrandom;
            auto length = syscall(NR_getrandom, output.ptr, output.length, 0);
-            Option!ubyte ret;
+            Nullable!ubyte ret;

            if (length >= 0)
            {
@ -203,11 +206,16 @@ else version (SecureARC4Random)
         * Returns: Number of bytes that were copied to the $(D_PARAM output)
         *          or nothing on error.
         */
-        override Option!ubyte poll(out ubyte[maxGather] output)
+        override Nullable!ubyte poll(out ubyte[maxGather] output)
        @nogc nothrow @safe
+        out (length)
+        {
+            assert(length.isNull || length.get <= maxGather);
+        }
+        do
        {
            (() @trusted => arc4random_buf(output.ptr, output.length))();
-            return Option!ubyte(cast(ubyte) (output.length));
+            return Nullable!ubyte(cast(ubyte) (output.length));
        }
    }
 }
@ -311,10 +319,15 @@ else version (Windows)
         * Returns: Number of bytes that were copied to the $(D_PARAM output)
         *          or nothing on error.
         */
-        override Option!ubyte poll(out ubyte[maxGather] output)
+        override Nullable!ubyte poll(out ubyte[maxGather] output)
        @nogc nothrow @safe
+        out (length)
        {
-            Option!ubyte ret;
+            assert(length.isNull || length.get <= maxGather);
+        }
+        do
+        {
+            Nullable!ubyte ret;

            assert(hProvider > 0, "hProvider not properly initialized");
            if ((() @trusted => CryptGenRandom(hProvider, output.length, cast(PBYTE) output.ptr))())
@ -325,13 +338,3 @@ else version (Windows)
        }
    }
 }
-
-static if (is(PlatformEntropySource)) @nogc @system unittest
-{
-    import tanya.memory.smartref : unique;
-
-    auto source = defaultAllocator.unique!PlatformEntropySource();
-
-    assert(source.threshold == 32);
-    assert(source.strong);
-}
--- a/source/tanya/memory/allocator.d
+++ b/source/tanya/memory/allocator.d
@ -1,81 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * This module contains the interface for implementing custom allocators.
- *
- * Allocators are classes encapsulating memory allocation strategy. This allows
- * to decouple memory management from the algorithms and the data. 
- *
- * Copyright: Eugene Wissner 2016-2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/memory/allocator.d,
- *                 tanya/memory/allocator.d)
- */
-module tanya.memory.allocator;
-
-/**
- * Abstract class implementing a basic allocator.
- */
-interface Allocator
-{
-    /**
-     * Returns: Alignment offered.
-     */
-    @property uint alignment() const shared pure nothrow @safe @nogc;
-
-    /**
-     * Allocates $(D_PARAM size) bytes of memory.
-     *
-     * Params:
-     *  size = Amount of memory to allocate.
-     *
-     * Returns: Pointer to the new allocated memory.
-     */
-    void[] allocate(size_t size) shared pure nothrow @nogc;
-
-    /**
-     * Deallocates a memory block.
-     *
-     * Params:
-     *  p = A pointer to the memory block to be freed.
-     *
-     * Returns: Whether the deallocation was successful.
-     */
-    bool deallocate(void[] p) shared pure nothrow @nogc;
-
-    /**
-     * Increases or decreases the size of a memory block.
-     *
-     * Params:
-     *  p    = A pointer to the memory block.
-     *  size = Size of the reallocated block.
-     *
-     * Returns: Pointer to the allocated memory.
-     */
-    bool reallocate(ref void[] p, size_t size) shared pure nothrow @nogc;
-
-    /**
-     * Reallocates a memory block in place if possible or returns
-     * $(D_KEYWORD false). This function cannot be used to allocate or
-     * deallocate memory, so if $(D_PARAM p) is $(D_KEYWORD null) or
-     * $(D_PARAM size) is `0`, it should return $(D_KEYWORD false).
-     *
-     * Params:
-     *  p    = A pointer to the memory block.
-     *  size = Size of the reallocated block.
-     *
-     * Returns: $(D_KEYWORD true) if successful, $(D_KEYWORD false) otherwise.
-     */
-    bool reallocateInPlace(ref void[] p, size_t size)
-    shared pure nothrow @nogc;
-}
-
-package template GetPureInstance(T : Allocator)
-{
-    alias GetPureInstance = shared(T) function()
-                            pure nothrow @nogc;
-}
--- a/source/tanya/meta/transform.d
+++ b/source/tanya/meta/transform.d
@ -1,981 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Type transformations.
- *
- * Templates in this module can be used to modify type qualifiers or transform
- * types. They take some type as argument and return a different type after
- * perfoming the specified transformation.
- *
- * Copyright: Eugene Wissner 2017-2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/meta/transform.d,
- *                 tanya/meta/transform.d)
- */
-module tanya.meta.transform;
-
-import tanya.meta.metafunction;
-import tanya.meta.trait;
-
-/**
- * Removes any type qualifiers from $(D_PARAM T).
- *
- * Removed qualifiers are:
- * $(UL
- *  $(LI const)
- *  $(LI immutable)
- *  $(LI inout)
- *  $(LI shared)
- * )
- * and combinations of these.
- *
- * If the type $(D_PARAM T) doesn't have any qualifieres,
- * $(D_INLINECODE Unqual!T) becomes an alias for $(D_PARAM T).
- *
- * Params:
- *  T = A type.
- *
- * Returns: $(D_PARAM T) without any type qualifiers.
- */
-template Unqual(T)
-{
-    static if (is(T U == const U)
-            || is(T U == immutable U)
-            || is(T U == inout U)
-            || is(T U == inout const U)
-            || is(T U == shared U)
-            || is(T U == shared const U)
-            || is(T U == shared inout U)
-            || is(T U == shared inout const U))
-    {
-        alias Unqual = U;
-    }
-    else
-    {
-        alias Unqual = T;
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(Unqual!bool == bool));
-    static assert(is(Unqual!(immutable bool) == bool));
-    static assert(is(Unqual!(inout bool) == bool));
-    static assert(is(Unqual!(inout const bool) == bool));
-    static assert(is(Unqual!(shared bool) == bool));
-    static assert(is(Unqual!(shared const bool) == bool));
-    static assert(is(Unqual!(shared inout const bool) == bool));
-}
-
-/**
- * If $(D_PARAM T) is an $(D_KEYWORD enum), $(D_INLINECODE OriginalType!T)
- * evaluates to the most base type of that $(D_KEYWORD enum) and to
- * $(D_PARAM T) otherwise.
- *
- * Params:
- *  T = A type.
- *
- * Returns: Base type of the $(D_KEYWORD enum) $(D_PARAM T) or $(D_PARAM T)
- *          itself.
- */
-template OriginalType(T)
-{
-    static if (is(T U == enum))
-    {
-        alias OriginalType = OriginalType!U;
-    }
-    else
-    {
-        alias OriginalType = T;
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    enum E1 : const(int)
-    {
-        n = 0,
-    }
-    enum E2 : bool
-    {
-        t = true,
-    }
-    enum E3 : E2
-    {
-        t = E2.t,
-    }
-    enum E4 : const(E2)
-    {
-        t = E2.t,
-    }
-
-    static assert(is(OriginalType!E1 == const int));
-    static assert(is(OriginalType!E2 == bool));
-    static assert(is(OriginalType!E3 == bool));
-    static assert(is(OriginalType!E4 == bool));
-    static assert(is(OriginalType!(const E4) == bool));
-}
-
-/**
- * Copies constness of $(D_PARAM From) to $(D_PARAM To).
- *
- * The following type qualifiers affect the constness and hence are copied:
- * $(UL
- *  $(LI const)
- *  $(LI immutable)
- *  $(LI inout)
- *  $(LI inout const)
- * )
- *
- * Params:
- *  From = Source type.
- *  To   = Target type.
- *
- * Returns: $(D_PARAM To) with the constness of $(D_PARAM From).
- *
- * See_Also: $(D_PSYMBOL CopyTypeQualifiers).
- */
-template CopyConstness(From, To)
-{
-    static if (is(From T == immutable T))
-    {
-        alias CopyConstness = immutable To;
-    }
-    else static if (is(From T == const T) || is(From T == shared const T))
-    {
-        alias CopyConstness = const To;
-    }
-    else static if (is(From T == inout T) || is(From T == shared inout T))
-    {
-        alias CopyConstness = inout To;
-    }
-    else static if (is(From T == inout const T)
-                 || is(From T == shared inout const T))
-    {
-        alias CopyConstness = inout const To;
-    }
-    else
-    {
-        alias CopyConstness = To;
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(CopyConstness!(int, char) == char));
-    static assert(is(CopyConstness!(const int, char) == const char));
-    static assert(is(CopyConstness!(immutable int, char) == immutable char));
-    static assert(is(CopyConstness!(inout int, char) == inout char));
-    static assert(is(CopyConstness!(inout const int, char) == inout const char));
-
-    static assert(is(CopyConstness!(shared int, char) == char));
-    static assert(is(CopyConstness!(shared const int, char) == const char));
-    static assert(is(CopyConstness!(shared inout int, char) == inout char));
-    static assert(is(CopyConstness!(shared inout const int, char) == inout const char));
-
-    static assert(is(CopyConstness!(const int, shared char) == shared const char));
-    static assert(is(CopyConstness!(const int, immutable char) == immutable char));
-    static assert(is(CopyConstness!(immutable int, const char) == immutable char));
-}
-
-/**
- * Copies type qualifiers of $(D_PARAM From) to $(D_PARAM To).
- *
- * Type qualifiers copied are:
- * $(UL
- *  $(LI const)
- *  $(LI immutable)
- *  $(LI inout)
- *  $(LI shared)
- * )
- * and combinations of these.
- *
- * Params:
- *  From = Source type.
- *  To   = Target type.
- *
- * Returns: $(D_PARAM To) with the type qualifiers of $(D_PARAM From).
- *
- * See_Also: $(D_PSYMBOL CopyConstness).
- */
-template CopyTypeQualifiers(From, To)
-{
-    static if (is(From T == immutable T))
-    {
-        alias CopyTypeQualifiers = immutable To;
-    }
-    else static if (is(From T == const T))
-    {
-        alias CopyTypeQualifiers = const To;
-    }
-    else static if (is(From T == shared T))
-    {
-        alias CopyTypeQualifiers = shared To;
-    }
-    else static if (is(From T == shared const T))
-    {
-        alias CopyTypeQualifiers = shared const To;
-    }
-    else static if (is(From T == inout T))
-    {
-        alias CopyTypeQualifiers = inout To;
-    }
-    else static if (is(From T == shared inout T))
-    {
-        alias CopyTypeQualifiers = shared inout To;
-    }
-    else static if (is(From T == inout const T))
-    {
-        alias CopyTypeQualifiers = inout const To;
-    }
-    else static if (is(From T == shared inout const T))
-    {
-        alias CopyTypeQualifiers = shared inout const To;
-    }
-    else
-    {
-        alias CopyTypeQualifiers = To;
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(CopyTypeQualifiers!(int, char) == char));
-    static assert(is(CopyTypeQualifiers!(const int, char) == const char));
-    static assert(is(CopyTypeQualifiers!(immutable int, char) == immutable char));
-    static assert(is(CopyTypeQualifiers!(inout int, char) == inout char));
-    static assert(is(CopyTypeQualifiers!(inout const int, char) == inout const char));
-
-    static assert(is(CopyTypeQualifiers!(shared int, char) == shared char));
-    static assert(is(CopyTypeQualifiers!(shared const int, char) == shared const char));
-    static assert(is(CopyTypeQualifiers!(shared inout int, char) == shared inout char));
-    static assert(is(CopyTypeQualifiers!(shared inout const int, char) == shared inout const char));
-}
-
-/**
- * Evaluates to the unsigned counterpart of the integral type $(D_PARAM T) preserving all type qualifiers.
- * If $(D_PARAM T) is already unsigned, $(D_INLINECODE Unsigned!T) aliases $(D_PARAM T).
- *
- * Params:
- *  T = A type.
- *
- * Returns: Unsigned counterpart of $(D_PARAM T).
- *
- * See_Also: $(D_PSYMBOL isSigned).
- */
-template Unsigned(T)
-if (isIntegral!T)
-{
-    alias UnqualedType = Unqual!(OriginalType!T);
-    static if (is(UnqualedType == byte))
-    {
-        alias Unsigned = CopyTypeQualifiers!(T, ubyte);
-    }
-    else static if (is(UnqualedType == short))
-    {
-        alias Unsigned = CopyTypeQualifiers!(T, ushort);
-    }
-    else static if (is(UnqualedType == int))
-    {
-        alias Unsigned = CopyTypeQualifiers!(T, uint);
-    }
-    else static if (is(UnqualedType == long))
-    {
-        alias Unsigned = CopyTypeQualifiers!(T, ulong);
-    }
-    else
-    {
-        alias Unsigned = T;
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(Unsigned!byte == ubyte));
-    static assert(is(Unsigned!short == ushort));
-    static assert(is(Unsigned!int == uint));
-    static assert(is(Unsigned!long == ulong));
-
-    static assert(is(Unsigned!(const byte) == const ubyte));
-    static assert(is(Unsigned!(shared byte) == shared ubyte));
-    static assert(is(Unsigned!(shared const byte) == shared const ubyte));
-
-    static assert(!is(Unsigned!float));
-    static assert(is(Unsigned!ubyte == ubyte));
-}
-
-/**
- * Evaluates to the signed counterpart of the integral type $(D_PARAM T) preserving all type qualifiers.
- * If $(D_PARAM T) is already signed, $(D_INLINECODE Signed!T) aliases $(D_PARAM T).
- *
- * Params:
- *  T = A type.
- *
- * Returns: Signed counterpart of $(D_PARAM T).
- *
- * See_Also: $(D_PSYMBOL isUnsigned).
- */
-template Signed(T)
-if (isIntegral!T)
-{
-    alias UnqualedType = Unqual!(OriginalType!T);
-    static if (is(UnqualedType == ubyte))
-    {
-        alias Signed = CopyTypeQualifiers!(T, byte);
-    }
-    else static if (is(UnqualedType == ushort))
-    {
-        alias Signed = CopyTypeQualifiers!(T, short);
-    }
-    else static if (is(UnqualedType == uint))
-    {
-        alias Signed = CopyTypeQualifiers!(T, int);
-    }
-    else static if (is(UnqualedType == ulong))
-    {
-        alias Signed = CopyTypeQualifiers!(T, long);
-    }
-    else
-    {
-        alias Signed = T;
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(Signed!ubyte == byte));
-    static assert(is(Signed!ushort == short));
-    static assert(is(Signed!uint == int));
-    static assert(is(Signed!ulong == long));
-
-    static assert(is(Signed!(const ubyte) == const byte));
-    static assert(is(Signed!(shared ubyte) == shared byte));
-    static assert(is(Signed!(shared const ubyte) == shared const byte));
-
-    static assert(!is(Signed!float));
-    static assert(is(Signed!byte == byte));
-}
-
-/**
- * Retrieves the target type `U` of a pointer `U*`.
- *
- * Params:
- *  T = Pointer type.
- *
- * Returns: Pointer target type.
- */
-template PointerTarget(T)
-{
-    static if (is(T U : U*))
-    {
-        alias PointerTarget = U;
-    }
-    else
-    {
-        static assert(T.stringof ~ " isn't a pointer type");
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(PointerTarget!(bool*) == bool));
-    static assert(is(PointerTarget!(const bool*) == const bool));
-    static assert(is(PointerTarget!(const shared bool*) == const shared bool));
-    static assert(!is(PointerTarget!bool));
-}
-
-/**
- * Params:
- *  T = The type of the associative array.
- *
- * Returns: The key type of the associative array $(D_PARAM T).
- */
-template KeyType(T)
-{
-    static if (is(T V : V[K], K))
-    {
-        alias KeyType = K;
-    }
-    else
-    {
-        static assert(false, T.stringof ~ " isn't an associative array");
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(KeyType!(int[string]) == string));
-    static assert(!is(KeyType!(int[15])));
-}
-
-/**
- * Params:
- *  T = The type of the associative array.
- *
- * Returns: The value type of the associative array $(D_PARAM T).
- */
-template ValueType(T)
-{
-    static if (is(T V : V[K], K))
-    {
-        alias ValueType = V;
-    }
-    else
-    {
-        static assert(false, T.stringof ~ " isn't an associative array");
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(ValueType!(int[string]) == int));
-    static assert(!is(ValueType!(int[15])));
-}
-
-/**
- * Params:
- *  T = Scalar type.
- *
- * Returns: The type $(D_PARAM T) will promote to.
- *
- * See_Also: $(LINK2 https://dlang.org/spec/type.html#integer-promotions,
- *                   Integer Promotions).
- */
-template Promoted(T)
-if (isScalarType!T)
-{
-    alias Promoted = CopyTypeQualifiers!(T, typeof(T.init + T.init));
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(Promoted!bool == int));
-    static assert(is(Promoted!byte == int));
-    static assert(is(Promoted!ubyte == int));
-    static assert(is(Promoted!short == int));
-    static assert(is(Promoted!ushort == int));
-    static assert(is(Promoted!char == int));
-    static assert(is(Promoted!wchar == int));
-    static assert(is(Promoted!dchar == uint));
-
-    static assert(is(Promoted!(const bool) == const int));
-    static assert(is(Promoted!(shared bool) == shared int));
-}
-
-/**
- * Adds $(D_KEYWORD inout) qualifier to the type $(D_PARAM T).
- *
- * Params:
- *  T = A type.
- *
- * Returns: $(D_INLINECODE inout(T)).
- */
-alias InoutOf(T) = inout(T);
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(InoutOf!int == inout int));
-}
-
-/**
- * Adds $(D_KEYWORD inout) qualifier to the type $(D_PARAM T).
- *
- * Params:
- *  T = A type.
- *
- * Returns: $(D_INLINECODE inout(T)).
- */
-alias ConstOf(T) = const(T);
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(ConstOf!int == const int));
-}
-
-/**
- * Adds $(D_KEYWORD inout) qualifier to the type $(D_PARAM T).
- *
- * Params:
- *  T = A type.
- *
- * Returns: $(D_INLINECODE inout(T)).
- */
-alias SharedOf(T) = shared(T);
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(SharedOf!int == shared int));
-}
-
-/**
- * Adds $(D_KEYWORD inout) qualifier to the type $(D_PARAM T).
- *
- * Params:
- *  T = A type.
- *
- * Returns: $(D_INLINECODE inout(T)).
- */
-alias SharedInoutOf(T) = shared(inout T);
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(SharedInoutOf!int == shared inout int));
-}
-
-/**
- * Adds $(D_KEYWORD shared const) qualifier to the type $(D_PARAM T).
- *
- * Params:
- *  T = A type.
- *
- * Returns: $(D_INLINECODE shared(const T)).
- */
-alias SharedConstOf(T) = shared(const T);
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(SharedConstOf!int == shared const int));
-}
-
-/**
- * Adds $(D_KEYWORD immutable) qualifier to the type $(D_PARAM T).
- *
- * Params:
- *  T = A type.
- *
- * Returns: $(D_INLINECODE immutable(T)).
- */
-alias ImmutableOf(T) = immutable(T);
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(ImmutableOf!int == immutable int));
-}
-
-/**
- * Adds $(D_KEYWORD inout const) qualifier to the type $(D_PARAM T).
- *
- * Params:
- *  T = A type.
- *
- * Returns: $(D_INLINECODE inout(const T)).
- */
-alias InoutConstOf(T) = inout(const T);
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(InoutConstOf!int == inout const int));
-}
-
-/**
- * Adds $(D_KEYWORD shared inout const) qualifier to the type $(D_PARAM T).
- *
- * Params:
- *  T = A type.
- *
- * Returns: $(D_INLINECODE shared(inout const T)).
- */
-alias SharedInoutConstOf(T) = shared(inout const T);
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(SharedInoutConstOf!int == shared inout const int));
-}
-
-/**
- * Returns a template with one argument which applies all qualifiers of
- * $(D_PARAM T) on its argument if instantiated.
- *
- * Params:
- *  T = A type.
- *
- * Returns: $(D_INLINECODE shared(inout const T)).
- */
-template QualifierOf(T)
-{
-    static if (is(T U == const U))
-    {
-        alias QualifierOf = ConstOf;
-    }
-    else static if (is(T U == immutable U))
-    {
-        alias QualifierOf = ImmutableOf;
-    }
-    else static if (is(T U == inout U))
-    {
-        alias QualifierOf = InoutOf;
-    }
-    else static if (is(T U == inout const U))
-    {
-        alias QualifierOf = InoutConstOf;
-    }
-    else static if (is(T U == shared U))
-    {
-        alias QualifierOf = SharedOf;
-    }
-    else static if (is(T U == shared const U))
-    {
-        alias QualifierOf = SharedConstOf;
-    }
-    else static if (is(T U == shared inout U))
-    {
-        alias QualifierOf = SharedInoutOf;
-    }
-    else static if (is(T U == shared inout const U))
-    {
-        alias QualifierOf = SharedInoutConstOf;
-    }
-    else
-    {
-        alias QualifierOf(T) = T;
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    alias MutableOf = QualifierOf!int;
-    static assert(is(MutableOf!uint == uint));
-
-    alias ConstOf = QualifierOf!(const int);
-    static assert(is(ConstOf!uint == const uint));
-
-    alias InoutOf = QualifierOf!(inout int);
-    static assert(is(InoutOf!uint == inout uint));
-
-    alias InoutConstOf = QualifierOf!(inout const int);
-    static assert(is(InoutConstOf!uint == inout const uint));
-
-    alias ImmutableOf = QualifierOf!(immutable int);
-    static assert(is(ImmutableOf!uint == immutable uint));
-
-    alias SharedOf = QualifierOf!(shared int);
-    static assert(is(SharedOf!uint == shared uint));
-
-    alias SharedConstOf = QualifierOf!(shared const int);
-    static assert(is(SharedConstOf!uint == shared const uint));
-
-    alias SharedInoutOf = QualifierOf!(shared inout int);
-    static assert(is(SharedInoutOf!uint == shared inout uint));
-
-    alias SharedInoutConstOf = QualifierOf!(shared inout const int);
-    static assert(is(SharedInoutConstOf!uint == shared inout const uint));
-}
-
-/**
- * Determines the type of $(D_PARAM T). If $(D_PARAM T) is already a type,
- * $(D_PSYMBOL TypeOf) aliases itself to $(D_PARAM T).
- *
- * $(D_PSYMBOL TypeOf) evaluates to $(D_KEYWORD void) for template arguments.
- *
- * The symbols that don't have a type and aren't types cannot be used as
- * arguments to $(D_PSYMBOL TypeOf).
- *
- * Params:
- *  T = Expression, type or template.
- *
- * Returns: The type of $(D_PARAM T).
- */
-alias TypeOf(T) = T;
-
-/// ditto
-template TypeOf(alias T)
-if (isExpressions!T || __traits(isTemplate, T))
-{
-    alias TypeOf = typeof(T);
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    struct S(T)
-    {
-    }
-    static assert(is(TypeOf!S == void));
-    static assert(is(TypeOf!int == int));
-    static assert(is(TypeOf!true == bool));
-    static assert(!is(TypeOf!(tanya.meta)));
-}
-
-// e.g. returns int for int**.
-private template FinalPointerTarget(T)
-{
-    static if (isPointer!T)
-    {
-        alias FinalPointerTarget = FinalPointerTarget!(PointerTarget!T);
-    }
-    else
-    {
-        alias FinalPointerTarget = T;
-    }
-}
-
-// Returns true if T1 is void* and T2 is some pointer.
-private template voidAndPointer(T1, T2)
-{
-    enum bool voidAndPointer = is(Unqual!(PointerTarget!T1) == void)
-                            && isPointer!T2;
-}
-
-// Type returned by the ternary operator.
-private alias TernaryType(T, U) = typeof(true ? T.init : U.init);
-
-/**
- * Determines the type all $(D_PARAM Args) can be implicitly converted to.
- *
- * $(OL
- *  $(LI If one of the arguments is $(D_KEYWORD void), the common type is
- *       $(D_KEYWORD void).)
- *  $(LI The common type of integers with the same sign is the type with a
- *       larger size. Signed and unsigned integers don't have a common type.
- *       Type qualifiers are only preserved if all arguments are the same
- *       type.)
- *  $(LI The common type of floating point numbers is the type with more
- *       precision. Type qualifiers are only preserved if all arguments are
- *       the same type.)
- *  $(LI The common type of polymorphic objects is the next, more generic type
- *       both objects inherit from, e.g. $(D_PSYMBOL Object).)
- *  $(LI `void*` is concerned as a common type of pointers only if one of the
- *       arguments is a void pointer.)
- *  $(LI Other types have a common type only if their pointers have a common
- *       type. It means that for example $(D_KEYWORD bool) and $(D_KEYWORD int)
-         don't have a common type. If the types fullfill this condition, the
-         common type is determined with the ternary operator, i.e.
-         `typeof(true ? T1.init : T2.init)` is evaluated.)
- * )
- *
- * If $(D_PARAM Args) don't have a common type, $(D_PSYMBOL CommonType) is
- * $(D_KEYWORD void).
- *
- * Params:
- *  Args = Type list.
- *
- * Returns: Common type for $(D_PARAM Args) or $(D_KEYWORD void) if
- *          $(D_PARAM Args) don't have a common type.
- */
-template CommonType(Args...)
-if (allSatisfy!(isType, Args))
-{
-    static if (Args.length == 0
-            || is(Unqual!(Args[0]) == void)
-            || is(Unqual!(Args[1]) == void))
-    {
-        alias CommonType = void;
-    }
-    else static if (Args.length == 1)
-    {
-        alias CommonType = Args[0];
-    }
-    else
-    {
-        private alias Pair = Args[0 .. 2];
-        private enum bool sameSigned = allSatisfy!(isIntegral, Pair)
-                                    && isSigned!(Args[0]) == isSigned!(Args[1]);
-
-        static if (is(Args[0] == Args[1]))
-        {
-            alias CommonType = CommonType!(Args[0], Args[2 .. $]);
-        }
-        else static if (sameSigned || allSatisfy!(isFloatingPoint, Pair))
-        {
-            alias CommonType = CommonType!(Unqual!(Largest!Pair),
-                                           Args[2 .. $]);
-        }
-        else static if (voidAndPointer!Pair
-                     || voidAndPointer!(Args[1], Args[0]))
-        {
-            // Workaround for https://issues.dlang.org/show_bug.cgi?id=15557.
-            // Determine the qualifiers returned by the ternary operator as if
-            // both pointers were int*. Then copy the qualifiers to void*.
-            alias P1 = CopyTypeQualifiers!(FinalPointerTarget!(Args[0]), int)*;
-            alias P2 = CopyTypeQualifiers!(FinalPointerTarget!(Args[1]), int)*;
-            static if (is(TernaryType!(P1, P2) U))
-            {
-                alias CommonType = CopyTypeQualifiers!(PointerTarget!U, void)*;
-            }
-            else
-            {
-                alias CommonType = void;
-            }
-        }
-        else static if ((isPointer!(Args[0]) || isPolymorphicType!(Args[0]))
-                     && is(TernaryType!Pair U))
-        {
-            alias CommonType = CommonType!(U, Args[2 .. $]);
-        }
-        else static if (is(TernaryType!(Args[0]*, Args[1]*)))
-        {
-            alias CommonType = CommonType!(TernaryType!Pair, Args[2 .. $]);
-        }
-        else
-        {
-            alias CommonType = void;
-        }
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(CommonType!(int, int, int) == int));
-    static assert(is(CommonType!(ubyte, ushort, uint) == uint));
-    static assert(is(CommonType!(int, uint) == void));
-
-    static assert(is(CommonType!(int, const int) == int));
-    static assert(is(CommonType!(const int, const int) == const int));
-
-    static assert(is(CommonType!(int[], const(int)[]) == const(int)[]));
-    static assert(is(CommonType!(string, char[]) == const(char)[]));
-
-    class A
-    {
-    }
-    static assert(is(CommonType!(const A, Object) == const Object));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(CommonType!(void*, int*) == void*));
-    static assert(is(CommonType!(void*, const(int)*) == const(void)*));
-    static assert(is(CommonType!(void*, const(void)*) == const(void)*));
-    static assert(is(CommonType!(int*, void*) == void*));
-    static assert(is(CommonType!(const(int)*, void*) == const(void)*));
-    static assert(is(CommonType!(const(void)*, void*) == const(void)*));
-
-    static assert(is(CommonType!() == void));
-    static assert(is(CommonType!(int*, const(int)*) == const(int)*));
-    static assert(is(CommonType!(int**, const(int)**) == const(int*)*));
-
-    static assert(is(CommonType!(float, double) == double));
-    static assert(is(CommonType!(float, int) == void));
-
-    static assert(is(CommonType!(bool, const bool) == bool));
-    static assert(is(CommonType!(int, bool) == void));
-    static assert(is(CommonType!(int, void) == void));
-    static assert(is(CommonType!(Object, void*) == void));
-
-    class A
-    {
-    }
-    static assert(is(CommonType!(A, Object) == Object));
-    static assert(is(CommonType!(const(A)*, Object*) == const(Object)*));
-    static assert(is(CommonType!(A, typeof(null)) == A));
-
-    class B : A
-    {
-    }
-    class C : A
-    {
-    }
-    static assert(is(CommonType!(B, C) == A));
-
-    static struct S
-    {
-        int opCast(T : int)()
-        {
-            return 1;
-        }
-    }
-    static assert(is(CommonType!(S, int) == void));
-    static assert(is(CommonType!(const S, S) == const S));
-}
-
-/**
- * Finds the type with the smallest size in the $(D_PARAM Args) list. If
- * several types have the same type, the leftmost is returned.
- *
- * Params:
- *  Args = Type list.
- *
- * Returns: The smallest type.
- *
- * See_Also: $(D_PSYMBOL Largest).
- */
-template Smallest(Args...)
-if (Args.length >= 1)
-{
-    static assert(is(Args[0]), T.stringof ~ " doesn't have .sizeof property");
-
-    static if (Args.length == 1)
-    {
-        alias Smallest = Args[0];
-    }
-    else static if (Smallest!(Args[1 .. $]).sizeof < Args[0].sizeof)
-    {
-        alias Smallest = Smallest!(Args[1 .. $]);
-    }
-    else
-    {
-        alias Smallest = Args[0];
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(Smallest!(int, ushort, uint, short) == ushort));
-    static assert(is(Smallest!(short) == short));
-    static assert(is(Smallest!(ubyte[8], ubyte[5]) == ubyte[5]));
-    static assert(!is(Smallest!(short, 5)));
-}
-
-/**
- * Finds the type with the largest size in the $(D_PARAM Args) list. If several
- * types have the same type, the leftmost is returned.
- *
- * Params:
- *  Args = Type list.
- *
- * Returns: The largest type.
- *
- * See_Also: $(D_PSYMBOL Smallest).
- */
-template Largest(Args...)
-if (Args.length >= 1)
-{
-    static assert(is(Args[0]), T.stringof ~ " doesn't have .sizeof property");
-
-    static if (Args.length == 1)
-    {
-        alias Largest = Args[0];
-    }
-    else static if (Largest!(Args[1 .. $]).sizeof > Args[0].sizeof)
-    {
-        alias Largest = Largest!(Args[1 .. $]);
-    }
-    else
-    {
-        alias Largest = Args[0];
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(Largest!(int, short, uint) == int));
-    static assert(is(Largest!(short) == short));
-    static assert(is(Largest!(ubyte[8], ubyte[5]) == ubyte[8]));
-    static assert(!is(Largest!(short, 5)));
-}
--- a/source/tanya/net/iface.d
+++ b/source/tanya/net/iface.d
@ -5,7 +5,7 @@
 /**
 * Network interfaces.
 *
- * Copyright: Eugene Wissner 2018.
+ * Copyright: Eugene Wissner 2018-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -14,25 +14,30 @@
 */
 module tanya.net.iface;

-import tanya.algorithm.comparison;
 import tanya.algorithm.mutation;
 import tanya.container.string;
 import tanya.meta.trait;
 import tanya.meta.transform;
 import tanya.range;

-version (TanyaNative)
+version (Windows)
 {
-    import mir.linux._asm.unistd;
-    import tanya.sys.linux.syscall;
-    import tanya.sys.posix.ioctl;
-    import tanya.sys.posix.net.if_;
-    import tanya.sys.posix.socket;
-}
-else version (Windows)
-{
-    import tanya.sys.windows.ifdef;
-    import tanya.sys.windows.iphlpapi;
+    private union NET_LUID_LH { ulong Value, Info; }
+    private alias NET_LUID = NET_LUID_LH;
+    private alias NET_IFINDEX = uint;
+    private enum IF_MAX_STRING_SIZE = 256;
+    extern(Windows) @nogc nothrow private @system
+    {
+        uint ConvertInterfaceNameToLuidA(const(char)* InterfaceName,
+            NET_LUID* InterfaceLuid);
+        uint ConvertInterfaceLuidToIndex(const(NET_LUID)* InterfaceLuid,
+            NET_IFINDEX* InterfaceIndex);
+        uint ConvertInterfaceIndexToLuid(NET_IFINDEX InterfaceIndex,
+            NET_LUID* InterfaceLuid);
+        uint ConvertInterfaceLuidToNameA(const(NET_LUID)* InterfaceLuid,
+            char* InterfaceName,
+            size_t Length);
+    }
 }
 else version (Posix)
 {
@ -53,39 +58,7 @@ else version (Posix)
 uint nameToIndex(R)(R name) @trusted
 if (isInputRange!R && is(Unqual!(ElementType!R) == char) && hasLength!R)
 {
-    version (TanyaNative)
-    {
-        if (name.length >= IF_NAMESIZE)
-        {
-            return 0;
-        }
-        ifreq ifreq_ = void;
-
-        copy(name, ifreq_.ifr_name[]);
-        ifreq_.ifr_name[name.length] = '\0';
-
-        auto socket = syscall(AF_INET,
-                              SOCK_DGRAM | SOCK_CLOEXEC,
-                              0,
-                              NR_socket);
-        if (socket <= 0)
-        {
-            return 0;
-        }
-        scope (exit)
-        {
-            syscall(socket, NR_close);
-        }
-        if (syscall(socket,
-                    SIOCGIFINDEX,
-                    cast(ptrdiff_t) &ifreq_,
-                    NR_ioctl) == 0)
-        {
-            return ifreq_.ifr_ifindex;
-        }
-        return 0;
-    }
-    else version (Windows)
+    version (Windows)
    {
        if (name.length > IF_MAX_STRING_SIZE)
        {
@ -156,33 +129,7 @@ String indexToName(uint index) @nogc nothrow @trusted
 {
    import tanya.memory.op : findNullTerminated;

-    version (TanyaNative)
-    {
-        ifreq ifreq_ = void;
-        ifreq_.ifr_ifindex = index;
-
-        auto socket = syscall(AF_INET,
-                              SOCK_DGRAM | SOCK_CLOEXEC,
-                              0,
-                              NR_socket);
-        if (socket <= 0)
-        {
-            return String();
-        }
-        scope (exit)
-        {
-            syscall(socket, NR_close);
-        }
-        if (syscall(socket,
-                    SIOCGIFNAME,
-                    cast(ptrdiff_t) &ifreq_,
-                    NR_ioctl) == 0)
-        {
-            return String(findNullTerminated(ifreq_.ifr_name));
-        }
-        return String();
-    }
-    else version (Windows)
+    version (Windows)
    {
        NET_LUID luid;
        if (ConvertInterfaceIndexToLuid(index, &luid) != 0)
@ -210,19 +157,22 @@ String indexToName(uint index) @nogc nothrow @trusted
    }
 }

-@nogc nothrow @safe unittest
+/**
+ * $(D_PSYMBOL AddressFamily) specifies a communication domain; this selects
+ * the protocol family which will be used for communication.
+ */
+enum AddressFamily : int
 {
-    version (linux)
-    {
-        assert(equal(indexToName(1)[], "lo"));
-    }
-    else version (Windows)
-    {
-        assert(equal(indexToName(1)[], "loopback_0"));
-    }
-    else
-    {
-        assert(equal(indexToName(1)[], "lo0"));
-    }
-    assert(indexToName(uint.max).empty);
+    unspec    = 0,     /// Unspecified.
+    local     = 1,     /// Local to host (pipes and file-domain).
+    unix      = local, /// POSIX name for PF_LOCAL.
+    inet      = 2,     /// IP protocol family.
+    ax25      = 3,     /// Amateur Radio AX.25.
+    ipx       = 4,     /// Novell Internet Protocol.
+    appletalk = 5,     /// Appletalk DDP.
+    netrom    = 6,     /// Amateur radio NetROM.
+    bridge    = 7,     /// Multiprotocol bridge.
+    atmpvc    = 8,     /// ATM PVCs.
+    x25       = 9,     /// Reserved for X.25 project.
+    inet6     = 10,    /// IP version 6.
 }
--- a/source/tanya/net/inet.d
+++ b/source/tanya/net/inet.d
@ -5,7 +5,7 @@
 /**
 * Internet utilities.
 *
- * Copyright: Eugene Wissner 2016-2018.
+ * Copyright: Eugene Wissner 2016-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -189,15 +189,6 @@ if (L > ubyte.sizeof && L <= ulong.sizeof)
    assert(networkOrder.empty);
 }

-// Static tests
-@nogc nothrow pure @safe unittest
-{
-    static assert(isBidirectionalRange!(NetworkOrder!4));
-    static assert(isBidirectionalRange!(NetworkOrder!8));
-    static assert(!is(NetworkOrder!9));
-    static assert(!is(NetworkOrder!1));
-}
-
 /**
 * Converts the $(D_KEYWORD ubyte) input range $(D_PARAM range) to
 * $(D_PARAM T).
--- a/source/tanya/net/ip.d
+++ b/source/tanya/net/ip.d
@ -5,7 +5,7 @@
 /**
 * Internet Protocol implementation.
 *
- * Copyright: Eugene Wissner 2018-2019.
+ * Copyright: Eugene Wissner 2018-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -14,18 +14,21 @@
 */
 module tanya.net.ip;

-import tanya.algorithm.comparison;
+import std.algorithm.comparison;
+import std.ascii;
+import std.sumtype;
+import std.typecons;
+import tanya.algorithm.iteration;
 import tanya.algorithm.mutation;
 import tanya.container.string;
 import tanya.conv;
-import tanya.encoding.ascii;
 import tanya.format;
+import tanya.memory.lifetime;
 import tanya.meta.trait;
 import tanya.meta.transform;
 import tanya.net.iface;
 import tanya.net.inet;
 import tanya.range;
-import tanya.typecons;

 /**
 * IPv4 internet address.
@ -55,10 +58,9 @@ struct Address4
     * Params:
     *  address = The address as an unsigned integer in host byte order.
     */
-    this(uint address) @nogc nothrow pure @safe
+    this(uint address) @nogc nothrow pure @trusted
    {
-        copy(NetworkOrder!4(address),
-             (() @trusted => (cast(ubyte*) &this.address)[0 .. 4])());
+        copy(NetworkOrder!4(address), (cast(ubyte*) &this.address)[0 .. 4]);
    }

    ///
@ -93,8 +95,8 @@ struct Address4
    ///
    @nogc nothrow pure @safe unittest
    {
-        assert(address4("127.0.0.1") > address4("126.0.0.0"));
-        assert(address4("127.0.0.1") < address4("127.0.0.2"));
+        assert(address4("127.0.0.1").get > address4("126.0.0.0").get);
+        assert(address4("127.0.0.1").get < address4("127.0.0.2").get);
        assert(address4("127.0.0.1") == address4("127.0.0.1"));
    }

@ -233,30 +235,49 @@ struct Address4
    }

    /**
-     * Produces a string containing an IPv4 address in dotted-decimal notation.
+     * Writes this IPv4 address in dotted-decimal notation.
     *
-     * Returns: This address in dotted-decimal notation.
+     * Params:
+     *  OR     = Type of the output range.
+     *  output = Output range.
+     *
+     * Returns: $(D_PARAM output).
     */
-    String stringify() const @nogc nothrow pure @safe
+    OR toString(OR)(OR output) const
+    if (isOutputRange!(OR, const(char)[]))
    {
        const octets = (() @trusted => (cast(ubyte*) &this.address)[0 .. 4])();
        enum string fmt = "{}.{}.{}.{}";
        version (LittleEndian)
        {
-            return format!fmt(octets[0], octets[1], octets[2], octets[3]);
+            return sformat!fmt(output,
+                               octets[0],
+                               octets[1],
+                               octets[2],
+                               octets[3]);
        }
        else
        {
-            return format!fmt(octets[3], octets[2], octets[1], octets[0]);
+            return sformat!fmt(output,
+                               octets[3],
+                               octets[2],
+                               octets[1],
+                               octets[0]);
        }
    }

    ///
    @nogc nothrow pure @safe unittest
    {
+        import tanya.container.string : String;
+        import tanya.range : backInserter;
+
        const dottedDecimal = "192.168.0.1";
+        String actual;
        const address = address4(dottedDecimal);
-        assert(address.get.stringify() == dottedDecimal);
+
+        address.get.toString(backInserter(actual));
+        assert(actual == dottedDecimal);
    }

    /**
@ -304,10 +325,10 @@ struct Address4
 *  R     = Input range type.
 *  range = Stringish range containing the address.
 *
- * Returns: $(D_PSYMBOL Option) containing the address if the parsing was
+ * Returns: $(D_PSYMBOL Nullable) containing the address if the parsing was
 *          successful, or nothing otherwise.
 */
-Option!Address4 address4(R)(R range)
+Nullable!Address4 address4(R)(R range)
 if (isForwardRange!R && is(Unqual!(ElementType!R) == char) && hasLength!R)
 {
    Address4 result;
@ -343,17 +364,6 @@ if (isForwardRange!R && is(Unqual!(ElementType!R) == char) && hasLength!R)
    return range.empty ? typeof(return)(result) : typeof(return)();
 }

-// Rejects malformed addresses
-@nogc nothrow pure @safe unittest
-{
-    assert(address4("256.0.0.1").isNothing);
-    assert(address4(".0.0.1").isNothing);
-    assert(address4("0..0.1").isNothing);
-    assert(address4("0.0.0.").isNothing);
-    assert(address4("0.0.").isNothing);
-    assert(address4("").isNothing);
-}
-
 /**
 * Constructs an $(D_PSYMBOL Address4) from raw bytes in network byte order.
 *
@ -361,10 +371,10 @@ if (isForwardRange!R && is(Unqual!(ElementType!R) == char) && hasLength!R)
 *  R     = Input range type.
 *  range = $(D_KEYWORD ubyte) range containing the address.
 *
- * Returns: $(D_PSYMBOL Option) containing the address if the $(D_PARAM range)
+ * Returns: $(D_PSYMBOL Nullable) containing the address if the $(D_PARAM range)
 *          contains exactly 4 bytes, or nothing otherwise.
 */
-Option!Address4 address4(R)(R range)
+Nullable!Address4 address4(R)(R range)
 if (isInputRange!R && is(Unqual!(ElementType!R) == ubyte))
 {
    Address4 result;
@ -398,28 +408,14 @@ if (isInputRange!R && is(Unqual!(ElementType!R) == ubyte))
    }
    {
        ubyte[3] actual = [127, 0, 0];
-        assert(address4(actual[]).isNothing);
+        assert(address4(actual[]).isNull);
    }
    {
        ubyte[5] actual = [127, 0, 0, 0, 1];
-        assert(address4(actual[]).isNothing);
+        assert(address4(actual[]).isNull);
    }
 }

-@nogc nothrow pure @safe unittest
-{
-    assert(address4(cast(ubyte[]) []).isNothing);
-}
-
-// Assignment and comparison works
-@nogc nothrow pure @safe unittest
-{
-    auto address1 = Address4.loopback();
-    auto address2 = Address4.any();
-    address1 = address2;
-    assert(address1 == address2);
-}
-
 /**
 * IPv6 internet address.
 */
@ -470,7 +466,7 @@ struct Address6
     */
    int opCmp(ref const Address6 that) const @nogc nothrow pure @safe
    {
-        const diff = compare(this.address[], that.address[]);
+        const diff = cmp(this.address[], that.address[]);
        if (diff == 0)
        {
            return (that.scopeID < this.scopeID) - (this.scopeID < that.scopeID);
@ -487,11 +483,11 @@ struct Address6
    ///
    @nogc nothrow @safe unittest
    {
-        assert(address6("::14") > address6("::1"));
-        assert(address6("::1") < address6("::14"));
+        assert(address6("::14").get > address6("::1").get);
+        assert(address6("::1").get < address6("::14").get);
        assert(address6("::1") == address6("::1"));
-        assert(address6("fe80::1%1") < address6("fe80::1%2"));
-        assert(address6("fe80::1%2") > address6("fe80::1%1"));
+        assert(address6("fe80::1%1").get < address6("fe80::1%2").get);
+        assert(address6("fe80::1%2").get > address6("fe80::1%1").get);
    }

    /**
@ -636,50 +632,100 @@ struct Address6
    }

    /**
-     * Returns text representation of this address.
+     * Writes text representation of this address to an output range.
     *
-     * Returns: text representation of this address.
+     * Params:
+     *  OR     = Type of the output range.
+     *  output = Output range.
+     *
+     * Returns: $(D_PARAM output).
     */
-    String stringify() const @nogc nothrow pure @safe
+    OR toString(OR)(OR output) const
+    if (isOutputRange!(OR, const(char)[]))
    {
-        String output;
-        foreach (i, b; this.address)
-        {
-            ubyte low = b & 0xf;
-            ubyte high = b >> 4;
+        ptrdiff_t largestGroupIndex = -1;
+        size_t largestGroupSize;
+        size_t zeroesInGroup;
+        size_t groupIndex;

-            if (high < 10)
+        // Look for the longest group of zeroes
+        for (size_t i; i < this.address.length; i += 2)
+        {
+            if (this.address[i] == 0 && this.address[i + 1] == 0)
            {
-                output.insertBack(cast(char) (high + '0'));
+                if (zeroesInGroup++ == 0)
+                {
+                    groupIndex = i;
+                }
            }
            else
            {
-                output.insertBack(cast(char) (high - 10 + 'a'));
+                zeroesInGroup = 0;
            }
-            if (low < 10)
+            if (zeroesInGroup > largestGroupSize && zeroesInGroup > 1)
            {
-                output.insertBack(cast(char) (low + '0'));
+                largestGroupSize = zeroesInGroup;
+                largestGroupIndex = groupIndex;
            }
-            else
+        }
+
+        // Write the address
+        size_t i;
+        if (largestGroupIndex != 0)
+        {
+            writeGroup(output, i);
+        }
+        if (largestGroupIndex != -1)
+        {
+            while (i < largestGroupIndex)
            {
-                output.insertBack(cast(char) (low - 10 + 'a'));
+                put(output, ":");
+                writeGroup(output, i);
            }
-            if (i % 2 != 0 && i != (this.address.length - 1))
+            put(output, "::");
+            i += largestGroupSize + 2;
+            if (i < (this.address.length - 1))
            {
-                output.insertBack(':');
+                writeGroup(output, i);
            }
        }

+        while (i < this.address.length - 1)
+        {
+            put(output, ":");
+            writeGroup(output, i);
+        }
+
        return output;
    }

    ///
    @nogc nothrow @safe unittest
    {
-        import tanya.algorithm.comparison : equal;
+        import tanya.container.string : String;
+        import tanya.range : backInserter;

-        assert(equal(address6("1:2:3:4:5:6:7:8").get.stringify()[],
-               "0001:0002:0003:0004:0005:0006:0007:0008"));
+        String actual;
+
+        address6("1:2:3:4:5:6:7:8").get.toString(backInserter(actual));
+        assert(actual == "1:2:3:4:5:6:7:8");
+    }
+
+    private void writeGroup(OR)(ref OR output, ref size_t i) const
+    {
+        ubyte low = this.address[i] & 0xf;
+        ubyte high = this.address[i] >> 4;
+
+        bool groupStarted = writeHexDigit!OR(output, high);
+        groupStarted = writeHexDigit!OR(output, low, groupStarted);
+
+        ++i;
+        low = this.address[i] & 0xf;
+        high = this.address[i] >> 4;
+
+        writeHexDigit!OR(output, high, groupStarted);
+        put(output, low.toHexDigit.singleton);
+        ++i;
    }

    /**
@ -701,13 +747,40 @@ struct Address6
    }
 }

-private void write2Bytes(R)(ref R range, ubyte[] address)
+private void read2Bytes(R)(ref R range, ubyte[] address)
 {
    ushort group = readIntegral!ushort(range, 16);
    address[0] = cast(ubyte) (group >> 8);
    address[1] = group & 0xff;
 }

+private char toHexDigit(ubyte digit) @nogc nothrow pure @safe
+in
+{
+    assert(digit < 16);
+}
+do
+{
+    return cast(char) (digit >= 10 ? (digit - 10 + 'a') : (digit + '0'));
+}
+
+private bool writeHexDigit(OR)(ref OR output,
+                               ubyte digit,
+                               bool groupStarted = false)
+in
+{
+    assert(digit < 16);
+}
+do
+{
+    if (digit != 0 || groupStarted)
+    {
+        put(output, digit.toHexDigit.singleton);
+        return true;
+    }
+    return groupStarted;
+}
+
 /**
 * Parses a string containing an IPv6 address.
 *
@ -731,10 +804,10 @@ private void write2Bytes(R)(ref R range, ubyte[] address)
 *  R     = Input range type.
 *  range = Stringish range containing the address.
 *
- * Returns: $(D_PSYMBOL Option) containing the address if the parsing was
+ * Returns: $(D_PSYMBOL Nullable) containing the address if the parsing was
 *          successful, or nothing otherwise.
 */
-Option!Address6 address6(R)(R range)
+Nullable!Address6 address6(R)(R range)
 if (isForwardRange!R && is(Unqual!(ElementType!R) == char) && hasLength!R)
 {
    if (range.empty)
@ -767,7 +840,7 @@ if (isForwardRange!R && is(Unqual!(ElementType!R) == char) && hasLength!R)
            {
                auto state = range.save();
            }
-            write2Bytes(range, result.address[i * 2 .. $]);
+            read2Bytes(range, result.address[i * 2 .. $]);
            if (range.empty)
            {
                return typeof(return)();
@ -796,7 +869,7 @@ if (isForwardRange!R && is(Unqual!(ElementType!R) == char) && hasLength!R)
            }
        }
    }
-    write2Bytes(range, result.address[14 .. $]);
+    read2Bytes(range, result.address[14 .. $]);

    if (range.empty)
    {
@ -827,7 +900,7 @@ ParseTail: // after ::
    { // To make "state" definition local
        auto state = range.save();

-        write2Bytes(range, tail[j .. $]);
+        read2Bytes(range, tail[j .. $]);
        if (range.empty)
        {
            goto CopyTail;
@ -856,7 +929,7 @@ ParseTail: // after ::
            return typeof(return)();
        }
        auto state = range.save();
-        write2Bytes(range, tail[j .. $]);
+        read2Bytes(range, tail[j .. $]);

        if (range.empty)
        {
@ -933,75 +1006,6 @@ CopyTail:
    return typeof(return)(result);
 }

-@nogc nothrow @safe unittest
-{
-    ubyte[16] expected = [0, 1, 0, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7, 0, 8];
-    auto actual = address6("1:2:3:4:5:6:7:8");
-    assert(actual.get.address == expected);
-}
-
-@nogc nothrow @safe unittest
-{
-    ubyte[16] expected;
-    auto actual = address6("::");
-    assert(actual.get.address == expected);
-}
-
-@nogc nothrow @safe unittest
-{
-    ubyte[16] expected = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1];
-    auto actual = address6("::1");
-    assert(actual.get.address == expected);
-}
-
-@nogc nothrow @safe unittest
-{
-    ubyte[16] expected = [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-    auto actual = address6("1::");
-    assert(actual.get.address == expected);
-}
-
-// Rejects malformed addresses
-@nogc nothrow @safe unittest
-{
-    assert(address6("").isNothing);
-    assert(address6(":").isNothing);
-    assert(address6(":a").isNothing);
-    assert(address6("a:").isNothing);
-    assert(address6("1:2:3:4::6:").isNothing);
-    assert(address6("fe80:2:3:4::6:7:8%").isNothing);
-}
-
-// Parses embedded IPv4 address
-@nogc nothrow @safe unittest
-{
-    ubyte[16] expected = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4];
-    auto actual = address6("0:0:0:0:0:0:1.2.3.4");
-    assert(actual.get.address == expected);
-}
-
-@nogc nothrow @safe unittest
-{
-    ubyte[16] expected = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4];
-    auto actual = address6("::1.2.3.4");
-    assert(actual.get.address == expected);
-}
-
-@nogc nothrow @safe unittest
-{
-    ubyte[16] expected = [0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 6, 1, 2, 3, 4];
-    auto actual = address6("::5:6:1.2.3.4");
-    assert(actual.get.address == expected);
-}
-
-@nogc nothrow @safe unittest
-{
-    assert(address6("0:0:0:0:0:0:1.2.3.").isNothing);
-    assert(address6("0:0:0:0:0:0:1.2:3.4").isNothing);
-    assert(address6("0:0:0:0:0:0:1.2.3.4.").isNothing);
-    assert(address6("fe80:0:0:0:0:0:1.2.3.4%1").get.scopeID == 1);
-}
-
 /**
 * Constructs an $(D_PSYMBOL Address6) from raw bytes in network byte order and
 * the scope ID.
@ -1011,10 +1015,10 @@ CopyTail:
 *  range   = $(D_KEYWORD ubyte) range containing the address.
 *  scopeID = Scope ID.
 *
- * Returns: $(D_PSYMBOL Option) containing the address if the $(D_PARAM range)
+ * Returns: $(D_PSYMBOL Nullable) containing the address if the $(D_PARAM range)
 *          contains exactly 16 bytes, or nothing otherwise.
 */
-Option!Address6 address6(R)(R range, uint scopeID = 0)
+Nullable!Address6 address6(R)(R range, uint scopeID = 0)
 if (isInputRange!R && is(Unqual!(ElementType!R) == ubyte))
 {
    Address6 result;
@ -1035,20 +1039,20 @@ if (isInputRange!R && is(Unqual!(ElementType!R) == ubyte))
    {
        ubyte[16] actual = [ 1, 2, 3, 4, 5, 6, 7, 8,
                             9, 10, 11, 12, 13, 14, 15, 16 ];
-        assert(!address6(actual[]).isNothing);
+        assert(!address6(actual[]).isNull);
    }
    {
        ubyte[15] actual = [ 1, 2, 3, 4, 5, 6, 7, 8,
                             9, 10, 11, 12, 13, 14, 15 ];
-        assert(address6(actual[]).isNothing);
+        assert(address6(actual[]).isNull);
    }
    {
        ubyte[17] actual = [ 1, 2, 3, 4, 5, 6, 7, 8, 9,
                             10, 11, 12, 13, 14, 15, 16, 17 ];
-        assert(address6(actual[]).isNothing);
+        assert(address6(actual[]).isNull);
    }
    {
-        assert(address6(cast(ubyte[]) []).isNothing);
+        assert(address6(cast(ubyte[]) []).isNull);
    }
 }

@ -1057,7 +1061,7 @@ if (isInputRange!R && is(Unqual!(ElementType!R) == ubyte))
 */
 struct Address
 {
-    private Variant!(Address4, Address6) address;
+    private SumType!(Address4, Address6) address;

    @disable this();

@ -1091,7 +1095,10 @@ struct Address
     */
    bool isV4() const @nogc nothrow pure @safe
    {
-        return this.address.peek!Address4;
+        return this.address.match!(
+            (Address4 address4) => true,
+            (Address6 address6) => false
+        );
    }

    ///
@ -1108,7 +1115,10 @@ struct Address
     */
    bool isV6() const @nogc nothrow pure @safe
    {
-        return this.address.peek!Address6;
+        return this.address.match!(
+            (Address4 address4) => false,
+            (Address6 address6) => true
+        );
    }

    ///
@ -1127,10 +1137,12 @@ struct Address
     *
     * Precondition: This is an IPv4 address.
     */
-    ref inout(Address4) toV4() inout @nogc nothrow pure @safe
-    in (this.address.peek!Address4)
+    Address4 toV4() inout @nogc nothrow pure @safe
    {
-        return this.address.get!Address4;
+        return this.address.match!(
+            (Address4 address4) => address4,
+            _ => assert(false, "Not an IPv4 address")
+        );
    }

    ///
@ -1150,10 +1162,12 @@ struct Address
     *
     * Precondition: This is an IPv6 address.
     */
-    ref inout(Address6) toV6() inout @nogc nothrow pure @safe
-    in (this.address.peek!Address6)
+    Address6 toV6() inout @nogc nothrow pure @safe
    {
-        return this.address.get!Address6;
+        return this.address.match!(
+            (Address6 address6) => address6,
+            _ => assert(false, "Not an IPv6 address")
+        );
    }

    ///
@ -1173,13 +1187,11 @@ struct Address
     *           $(D_PSYMBOL Address6.loopback).
     */
    bool isLoopback() const @nogc nothrow pure @safe
-    in (this.address.hasValue)
    {
-        if (this.address.peek!Address4)
-        {
-            return this.address.get!Address4.isLoopback();
-        }
-        return this.address.get!Address6.isLoopback();
+        return this.address.match!(
+            (Address4 address) => address.isLoopback(),
+            (Address6 address) => address.isLoopback()
+        );
    }

    ///
@ -1199,13 +1211,11 @@ struct Address
     *           $(D_PSYMBOL Address6.isMulticast).
     */
    bool isMulticast() const @nogc nothrow pure @safe
-    in (this.address.hasValue)
    {
-        if (this.address.peek!Address4)
-        {
-            return this.address.get!Address4.isMulticast();
-        }
-        return this.address.get!Address6.isMulticast();
+        return this.address.match!(
+            (Address4 address) => address.isMulticast(),
+            (Address6 address) => address.isMulticast()
+        );
    }

    ///
@ -1224,13 +1234,11 @@ struct Address
     * See_Also: $(D_PSYMBOL Address4.isAny), $(D_PSYMBOL Address6.isAny).
     */
    bool isAny() const @nogc nothrow pure @safe
-    in (this.address.hasValue)
    {
-        if (this.address.peek!Address4)
-        {
-            return this.address.get!Address4.isAny();
-        }
-        return this.address.get!Address6.isAny();
+        return this.address.match!(
+            (Address4 address) => address.isAny(),
+            (Address6 address) => address.isAny()
+        );
    }

    ///
@ -1253,14 +1261,22 @@ struct Address
     *          otherwise.
     */
    bool opEquals(T)(T that) const
-    if (is(Unqual!T == Address4) || is(Unqual!T == Address6))
+    if (is(Unqual!T == Address4))
    {
-        alias AddressType = Unqual!T;
-        if (this.address.peek!AddressType)
-        {
-            return this.address.get!AddressType == that;
-        }
-        return false;
+        return this.address.match!(
+            (Address4 address) => address == that,
+            (Address6 address) => false
+        );
+    }
+
+    ///
+    bool opEquals(T)(T that) const
+    if (is(Unqual!T == Address6))
+    {
+        return this.address.match!(
+            (Address4 address) => false,
+            (Address6 address) => address == that,
+        );
    }

    ///
@ -1301,11 +1317,97 @@ struct Address
    }
 }

-// Can assign another address
-@nogc nothrow pure @safe unittest
+/**
+ * Service endpoint specified by a version independent IP address and port.
+ */
+struct Endpoint
 {
-    Address actual = Address4.loopback;
-    Address expected = Address6.loopback;
-    actual = expected;
-    assert(actual == expected);
+    private AddressFamily family = AddressFamily.unspec;
+    private ubyte[ushort.sizeof] service;
+    private Address4 address4; // Unused sin6_flowinfo if IPv6
+    private Address6 address6; // Unused if IPv4
+
+    static assert(Address4.sizeof == 4);
+
+    /// Allows the system to select a free port.
+    enum ushort anyPort = 0;
+
+    /**
+     * Constructs an endpoint.
+     *
+     * Params:
+     *     T = Address type (IPv4 or IPv6).
+     *     address = IP address that should be associated with the endpoint.
+     *     port = Port number in network byte order.
+     */
+    this(T)(T address, const ushort port = anyPort)
+    if (is(T == Address) || is(T == Address4) || is(T == Address6))
+    {
+        this.address = address;
+        this.port = port;
+    }
+
+    /**
+     * Returns: Port number in network byte order.
+     */
+    @property inout(ushort) port() inout const @nogc nothrow pure @safe
+    {
+        return this.service[].toHostOrder!ushort();
+    }
+
+    /**
+     * Params:
+     *     port = Port number in network byte order.
+     */
+    @property void port(const ushort port) @nogc nothrow pure @safe
+    {
+        NetworkOrder!(ushort.sizeof)(port).copy(this.service[]);
+    }
+
+    /**
+     * Returns: IP address associated with the endpoint.
+     */
+    @property inout(Address) address() inout @nogc nothrow pure @safe
+    {
+        if (this.family == AddressFamily.inet)
+        {
+            return Address(this.address4);
+        }
+        else if (this.family == AddressFamily.inet6)
+        {
+            return Address(this.address6);
+        }
+        return Address.init;
+    }
+
+    /**
+     * Params:
+     *     address = IP address associated with the endpoint.
+     */
+    @property void address(Address address) @nogc nothrow pure @safe
+    {
+        if (address.isV4())
+        {
+            this.address = address.toV4();
+        }
+        else if (address.isV6())
+        {
+            this.address = address.toV6();
+        }
+    }
+
+    /// ditto
+    @property void address(Address4 address) @nogc nothrow pure @safe
+    {
+        this.family = AddressFamily.inet;
+        this.address4 = address;
+    }
+
+    /// ditto
+    @property void address(Address6 address) @nogc nothrow pure @safe
+    {
+        this.family = AddressFamily.inet6;
+        this.address4 = Address4(0);
+        this.address6 = address;
+    }
 }
--- a/source/tanya/net/package.d
+++ b/source/tanya/net/package.d
@ -5,7 +5,7 @@
 /**
 * Network programming.
 *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2022.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -14,5 +14,7 @@
 */
 module tanya.net;

+public import tanya.net.iface;
 public import tanya.net.inet;
+public import tanya.net.ip;
 public import tanya.net.uri;
--- a/source/tanya/net/uri.d
+++ b/source/tanya/net/uri.d
@ -5,7 +5,7 @@
 /**
 * URL parser.
 *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -14,14 +14,9 @@
 */
 module tanya.net.uri;

+import std.ascii;
 import tanya.conv;
-import tanya.encoding.ascii;
-import tanya.memory;
-
-version (unittest)
-{
-    import tanya.test.assertion;
-}
+import tanya.memory.allocator;

 /**
 * Thrown if an invalid URI was specified.
@ -370,90 +365,6 @@ struct URL
    assert(u.fragment == "fragment");
 }

-@nogc pure @system unittest
-{
-    auto u = URL("127.0.0.1");
-    assert(u.path == "127.0.0.1");
-
-    u = URL("http://127.0.0.1");
-    assert(u.scheme == "http");
-    assert(u.host == "127.0.0.1");
-
-    u = URL("http://127.0.0.1:9000");
-    assert(u.scheme == "http");
-    assert(u.host == "127.0.0.1");
-    assert(u.port == 9000);
-
-    u = URL("127.0.0.1:80");
-    assert(u.host == "127.0.0.1");
-    assert(u.port == 80);
-    assert(u.path is null);
-
-    u = URL("//example.net");
-    assert(u.host == "example.net");
-    assert(u.scheme is null);
-
-    u = URL("//example.net?q=before:after");
-    assert(u.host == "example.net");
-    assert(u.query == "q=before:after");
-
-    u = URL("localhost:8080");
-    assert(u.host == "localhost");
-    assert(u.port == 8080);
-    assert(u.path is null);
-
-    u = URL("ftp:");
-    assert(u.scheme == "ftp");
-
-    u = URL("file:///C:\\Users");
-    assert(u.scheme == "file");
-    assert(u.path == "C:\\Users");
-
-    u = URL("localhost:66000");
-    assert(u.scheme == "localhost");
-    assert(u.path == "66000");
-
-    u = URL("file:///home/");
-    assert(u.scheme == "file");
-    assert(u.path == "/home/");
-
-    u = URL("file:///home/?q=asdf");
-    assert(u.scheme == "file");
-    assert(u.path == "/home/");
-    assert(u.query == "q=asdf");
-
-    u = URL("http://secret@example.org");
-    assert(u.scheme == "http");
-    assert(u.host == "example.org");
-    assert(u.user == "secret");
-
-    u = URL("h_tp://:80");
-    assert(u.path == "h_tp://:80");
-    assert(u.port == 0);
-
-    u = URL("zlib:/home/user/file.gz");
-    assert(u.scheme == "zlib");
-    assert(u.path == "/home/user/file.gz");
-
-    u = URL("h_tp:asdf");
-    assert(u.path == "h_tp:asdf");
-}
-
-@nogc pure @system unittest
-{
-    assertThrown!URIException(() => URL("http://:80"));
-    assertThrown!URIException(() => URL(":80"));
-    assertThrown!URIException(() => URL("http://u1:p1@u2:p2@example.org"));
-    assertThrown!URIException(() => URL("http://blah.com:port"));
-    assertThrown!URIException(() => URL("http://blah.com:66000"));
-}
-
-@nogc pure @system unittest
-{
-    auto u = URL("ftp://");
-    assert(u.scheme == "ftp");
-}
-
 /**
 * Attempts to parse an URL from a string and returns the specified component
 * of the URL or $(D_PSYMBOL URL) if no component is specified.
--- a/source/tanya/network/socket.d
+++ b/source/tanya/network/socket.d
--- a/source/tanya/range/adapter.d
+++ b/source/tanya/range/adapter.d
@ -3,9 +3,9 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 /**
- * Range adapters.
+ * Range adapters transform some data structures into ranges.
 *
- * Copyright: Eugene Wissner 2018.
+ * Copyright: Eugene Wissner 2018-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -13,3 +13,196 @@
 *                 tanya/range/adapter.d)
 */
 module tanya.range.adapter;
+
+import tanya.algorithm.mutation;
+import tanya.memory.lifetime;
+import tanya.meta.trait;
+import tanya.range;
+
+private mixin template InserterCtor()
+{
+    private Container* container;
+
+    private this(return scope ref Container container) @trusted
+    {
+        this.container = &container;
+    }
+}
+
+/**
+ * If $(D_PARAM container) is a container with `insertBack`-support,
+ * $(D_PSYMBOL backInserter) returns an output range that puts the elements
+ * into the container with `insertBack`.
+ *
+ * The resulting output range supports all types `insertBack` supports.
+ *
+ * The range keeps a reference to the container passed to it, it doesn't use
+ * any other storage. So there is no method to get the written data out of the
+ * range - the container passed to $(D_PSYMBOL backInserter) contains that data
+ * and can be used directly after all operations on the output range are
+ * completed. It also means that the result range is not allowed to outlive its
+ * container.
+ *
+ * Params:
+ *  Container = Container type.
+ *  container = Container used as an output range.
+ *
+ * Returns: `insertBack`-based output range.
+ */
+auto backInserter(Container)(return scope ref Container container)
+if (hasMember!(Container, "insertBack"))
+{
+    static struct Inserter
+    {
+        void opCall(T)(auto ref T data)
+        {
+            this.container.insertBack(forward!data);
+        }
+
+        mixin InserterCtor;
+    }
+    return Inserter(container);
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static struct Container
+    {
+        int element;
+
+        void insertBack(int element)
+        {
+            this.element = element;
+        }
+    }
+    Container container;
+    backInserter(container)(5);
+
+    assert(container.element == 5);
+}
+
+/**
+ * If $(D_PARAM container) is a container with `insertFront`-support,
+ * $(D_PSYMBOL frontInserter) returns an output range that puts the elements
+ * into the container with `insertFront`.
+ *
+ * The resulting output range supports all types `insertFront` supports.
+ *
+ * The range keeps a reference to the container passed to it, it doesn't use
+ * any other storage. So there is no method to get the written data out of the
+ * range - the container passed to $(D_PSYMBOL frontInserter) contains that data
+ * and can be used directly after all operations on the output range are
+ * completed. It also means that the result range is not allowed to outlive its
+ * container.
+ *
+ * Params:
+ *  Container = Container type.
+ *  container = Container used as an output range.
+ *
+ * Returns: `insertFront`-based output range.
+ */
+auto frontInserter(Container)(return scope ref Container container)
+if (hasMember!(Container, "insertFront"))
+{
+    static struct Inserter
+    {
+        void opCall(T)(auto ref T data)
+        {
+            this.container.insertFront(forward!data);
+        }
+
+        mixin InserterCtor;
+    }
+    return Inserter(container);
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    static struct Container
+    {
+        int element;
+
+        void insertFront(int element)
+        {
+            this.element = element;
+        }
+    }
+    Container container;
+    frontInserter(container)(5);
+
+    assert(container.element == 5);
+}
+
+/**
+ * $(D_PSYMBOL arrayInserter) makes an output range out of an array.
+ *
+ * The returned output range accepts single values as well as input ranges that
+ * can be copied into the target array.
+ *
+ * Params:
+ *  Array = Array type.
+ *  array = Array.
+ *
+ * Returns: An output range writing into $(D_PARAM array).
+ */
+auto arrayInserter(Array)(return scope ref Array array)
+if (isArray!Array)
+{
+    static if (is(Array ArrayT : ArrayT[size], size_t size))
+    {
+        alias E = ArrayT;
+    }
+    else
+    {
+        alias E = ElementType!Array;
+    }
+
+    static struct ArrayInserter
+    {
+        private E[] data;
+
+        private this(return scope ref Array data) @trusted
+        {
+            this.data = data[];
+        }
+
+        void opCall(T)(auto ref T data)
+        if (is(T : E))
+        in
+        {
+            assert(!this.data.empty);
+        }
+        do
+        {
+            put(this.data, data);
+        }
+
+        void opCall(R)(auto ref R data)
+        if (isInputRange!R && isOutputRange!(E[], ElementType!R))
+        {
+            this.data = copy(data, this.data);
+        }
+    }
+    return ArrayInserter(array);
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    int[1] array;
+
+    arrayInserter(array)(5);
+    assert(array[0] == 5);
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    char[1] array;
+    alias Actual = typeof(arrayInserter(array));
+
+    static assert(isOutputRange!(Actual, char));
+    static assert(isOutputRange!(Actual, char[]));
+}
--- a/source/tanya/range/array.d
+++ b/source/tanya/range/array.d
@ -31,7 +31,7 @@
 * (D_INLINECODE dchar[])) are treated as any other normal array, they aren't
 * auto-decoded.
 *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -133,7 +133,7 @@ do
 *
 * Precondition: $(D_INLINECODE array.length > 0).
 */
-void popFront(T)(scope ref inout(T)[] array)
+void popFront(T)(ref inout(T)[] array)
 in
 {
    assert(array.length > 0);
@ -144,7 +144,7 @@ do
 }

 /// ditto
-void popBack(T)(scope ref inout(T)[] array)
+void popBack(T)(ref inout(T)[] array)
 in
 {
    assert(array.length > 0);
--- a/source/tanya/range/package.d
+++ b/source/tanya/range/package.d
@ -6,7 +6,7 @@
 * This package contains generic functions and templates to be used with D
 * ranges.
 *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
--- a/source/tanya/range/primitive.d
+++ b/source/tanya/range/primitive.d
@ -5,7 +5,7 @@
 /**
 * This module defines primitives for working with ranges.
 *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -14,25 +14,12 @@
 */
 module tanya.range.primitive;

-import tanya.algorithm.comparison;
-import tanya.algorithm.mutation;
+import std.algorithm.comparison;
+import tanya.memory.lifetime;
 import tanya.meta.trait;
 import tanya.meta.transform;
 import tanya.range.array;

-version (unittest)
-{
-    import tanya.test.stub;
-
-    private struct AssertPostblit
-    {
-        this(this) @nogc nothrow pure @safe
-        {
-            assert(false);
-        }
-    }
-}
-
 /**
 * Returns the element type of the range $(D_PARAM R).
 *
@ -318,7 +305,7 @@ private template isDynamicArrayRange(R)

 private struct Primitive(Candidate, string primitive)
 {
-    auto ref returnType(Candidate candidate)
+    auto ref returnType(ref Candidate candidate)
    {
        mixin("return candidate." ~ primitive ~ ";");
    }
@ -391,72 +378,6 @@ template isInputRange(R)
    static assert(!isInputRange!(void[]));
 }

-@nogc nothrow pure @safe unittest
-{
-    static struct Range1(T)
-    {
-        mixin InputRangeStub;
-
-        T empty() const
-        {
-            return true;
-        }
-    }
-    static assert(!isInputRange!(Range1!int));
-    static assert(!isInputRange!(Range1!(const bool)));
-
-    static struct Range2
-    {
-        mixin InputRangeStub;
-
-        int popFront() @nogc nothrow pure @safe
-        {
-            return 100;
-        }
-    }
-    static assert(isInputRange!Range2);
-
-    static struct Range3
-    {
-        mixin InputRangeStub;
-
-        void front() @nogc nothrow pure @safe
-        {
-        }
-    }
-    static assert(!isInputRange!Range3);
-
-    static struct Range4
-    {
-        mixin InputRangeStub;
-
-        enum bool empty = false;
-    }
-    static assert(isInputRange!Range4);
-}
-
-// Ranges with non-copyable elements can be input ranges
-@nogc nothrow pure @safe unittest
-{
-    @WithLvalueElements
-    static struct R
-    {
-        mixin InputRangeStub!NonCopyable;
-    }
-    static assert(isInputRange!R);
-}
-
-// Ranges with const non-copyable elements can be input ranges
-@nogc nothrow pure @safe unittest
-{
-    @WithLvalueElements
-    static struct R
-    {
-        mixin InputRangeStub!(const(NonCopyable));
-    }
-    static assert(isInputRange!R);
-}
-
 /**
 * Determines whether $(D_PARAM R) is a forward range.
 *
@ -515,34 +436,6 @@ template isForwardRange(R)
    static assert(!isForwardRange!(void[]));
 }

-@nogc nothrow pure @safe unittest
-{
-    static struct Range1
-    {
-    }
-    static struct Range2
-    {
-        mixin InputRangeStub;
-
-        Range1 save() @nogc nothrow pure @safe
-        {
-            return Range1();
-        }
-    }
-    static assert(!isForwardRange!Range2);
-
-    static struct Range3
-    {
-        mixin InputRangeStub;
-
-        const(typeof(this)) save() const @nogc nothrow pure @safe
-        {
-            return this;
-        }
-    }
-    static assert(!isForwardRange!Range3);
-}
-
 /**
 * Determines whether $(D_PARAM R) is a bidirectional range.
 *
@ -613,37 +506,6 @@ template isBidirectionalRange(R)
    static assert(!isBidirectionalRange!(void[]));
 }

-@nogc nothrow pure @safe unittest
-{
-    static struct Range(T, U)
-    {
-        mixin BidirectionalRangeStub;
-
-        @property T front() @nogc nothrow pure @safe
-        {
-            return T.init;
-        }
-
-        @property U back() @nogc nothrow pure @safe
-        {
-            return U.init;
-        }
-    }
-    static assert(!isBidirectionalRange!(Range!(int, uint)));
-    static assert(!isBidirectionalRange!(Range!(int, const int)));
-}
-
-// Ranges with non-copyable elements can be bidirectional ranges
-@nogc nothrow pure @safe unittest
-{
-    @WithLvalueElements
-    static struct R
-    {
-        mixin BidirectionalRangeStub!NonCopyable;
-    }
-    static assert(isBidirectionalRange!R);
-}
-
 /**
 * Determines whether $(D_PARAM R) is a random-access range.
 *
@ -735,78 +597,16 @@ template isRandomAccessRange(R)
    static assert(isRandomAccessRange!B);
 }

-@nogc nothrow pure @safe unittest
-{
-    static struct Range1
-    {
-        mixin BidirectionalRangeStub;
-        mixin RandomAccessRangeStub;
-    }
-    static assert(!isRandomAccessRange!Range1);
-
-    @Length
-    static struct Range2(Args...)
-    {
-        mixin BidirectionalRangeStub;
-
-        int opIndex(Args) @nogc nothrow pure @safe
-        {
-            return 0;
-        }
-    }
-    static assert(isRandomAccessRange!(Range2!size_t));
-    static assert(!isRandomAccessRange!(Range2!()));
-    static assert(!isRandomAccessRange!(Range2!(size_t, size_t)));
-
-    @Length
-    static struct Range3
-    {
-        mixin BidirectionalRangeStub;
-
-        int opIndex(const size_t pos1, const size_t pos2 = 0)
-        @nogc nothrow pure @safe
-        {
-            return 0;
-        }
-    }
-    static assert(isRandomAccessRange!Range3);
-
-    static struct Range4
-    {
-        mixin BidirectionalRangeStub;
-        mixin RandomAccessRangeStub;
-
-        size_t opDollar() const @nogc nothrow pure @safe
-        {
-            return 0;
-        }
-    }
-    static assert(!isRandomAccessRange!Range4);
-}
-
-// Ranges with non-copyable elements can be random-access ranges
-@nogc nothrow pure @safe unittest
-{
-    @WithLvalueElements @Infinite
-    static struct R
-    {
-        mixin RandomAccessRangeStub!NonCopyable;
-    }
-    static assert(isRandomAccessRange!R);
-}
-
 /**
 * Puts $(D_PARAM e) into the $(D_PARAM range).
 *
- * $(D_PSYMBOL R) should be an output range for $(D_PARAM E). It doesn't mean
- * that everything $(D_PARAM range) is an output range for can be put into it,
- * but only if one of the following conditions is met:
+ * $(D_PSYMBOL R) should be an output range for $(D_PARAM E), i.e. at least one
+ * of the following conditions should met:
 *
 * $(OL
- *  $(LI $(D_PARAM R) defines a `put`-method for $(D_PARAM E))
- *  $(LI $(D_PARAM e) can be assigned to $(D_INLINECODE range.front))
 *  $(LI $(D_PARAM e) can be put into $(D_PARAM range) using
 *       $(D_INLINECODE range(e))
+ *  $(LI $(D_PARAM e) can be assigned to $(D_INLINECODE range.front))
 *  )
 * )
 *
@ -830,10 +630,9 @@ template isRandomAccessRange(R)
 */
 void put(R, E)(ref R range, auto ref E e)
 {
-    static if (__traits(hasMember, R, "put")
-            && is(typeof((R r, E e) => r.put(e))))
+    static if (is(typeof((R r, E e) => r(e))))
    {
-        range.put(e);
+        range(e);
    }
    else static if (isInputRange!R
                 && is(typeof((R r, E e) => r.front = e)))
@ -841,10 +640,6 @@ void put(R, E)(ref R range, auto ref E e)
        range.front = e;
        range.popFront();
    }
-    else static if (is(typeof((R r, E e) => r(e))))
-    {
-        range(e);
-    }
    else
    {
        static assert(false, R.stringof ~ " is not an output range for "
@ -862,23 +657,6 @@ void put(R, E)(ref R range, auto ref E e)
    assert(actual == [2, 0]);
 }

-///
-@nogc nothrow pure @safe unittest
-{
-    static struct Put
-    {
-        int e;
-
-        void put(int e)
-        {
-            this.e = e;
-        }
-    }
-    Put p;
-    put(p, 2);
-    assert(p.e == 2);
-}
-
 ///
@nogc nothrow pure @safe unittest
 {
@ -910,36 +688,28 @@ void put(R, E)(ref R range, auto ref E e)
 *      $(TH Scenario)
 *  )
 *  $(TR
- *      $(TD r.put(e))
- *      $(TD $(D_PARAM R) defines `put` for $(D_PARAM E).)
- *  )
- *  $(TR
- *      $(TD r.front = e)
- *      $(TD $(D_PARAM R) is an input range, whose element type is
- *      $(D_PARAM E) and `front` is an lvalue.)
- *  )
- *  $(TR
 *      $(TD r(e))
 *      $(TD $(D_PARAM R) defines `opCall` for $(D_PARAM E).)
 *  )
 *  $(TR
- *      $(TD for (; !e.empty; e.popFront()) r.put(e.front) $(BR)
- *           for (; !e.empty; e.popFront(), r.popFront())
- *           r.front = e.front $(BR)
- *           for (; !e.empty; e.popFront()) r(e.front)
- *      )
- *      $(TD $(D_PARAM E) is input range, whose elements can be put into
- *           $(D_PARAM R) according to the rules described above in this table.
- *      )
+ *      $(TD r.front = e)
+ *      $(TD $(D_PARAM R) is an input range with assignable elements of type
+ *           $(D_PARAM E).)
 *  )
 * )
 *
+ * Output ranges don't have element type (so $(D_PSYMBOL ElementType) returns
+ * $(D_KEYWORD void) when applied to an output range). It is because an output
+ * range can support puting differently typed elements into it.
+ *
 * Params:
 *  R = The type to be tested.
 *  E = Element type should be tested for.
 *
 * Returns: $(D_KEYWORD true) if $(D_PARAM R) is an output range for the
 *          elements of the type $(D_PARAM E), $(D_KEYWORD false) otherwise.
+ *
+ * See_Also: $(D_PSYMBOL put).
 */
 template isOutputRange(R, E)
 {
@ -949,6 +719,11 @@ template isOutputRange(R, E)
    }
    else static if (isInputRange!E)
    {
+        pragma(msg, "Deprecation. An input range whose element type is "
+                  ~ "supported by the output range isn't considered itself to "
+                  ~ "be a source for such an output range. Don't rely on this "
+                  ~ "behavior and use tanya.algorithm.copy() to write one "
+                  ~ "range into another one.");
        alias ET = ElementType!E;
        enum bool isOutputRange = is(typeof((R r, ET e) => put(r, e)));
    }
@ -963,7 +738,7 @@ template isOutputRange(R, E)
 {
    static struct R1
    {
-        void put(int) @nogc nothrow pure @safe
+        void opCall(int) @nogc nothrow pure @safe
        {
        }
    }
@ -972,13 +747,16 @@ template isOutputRange(R, E)
    static struct R2
    {
        int value;
+
        void popFront() @nogc nothrow pure @safe
        {
        }
+
        ref int front() @nogc nothrow pure @safe
        {
            return value;
        }
+
        bool empty() const @nogc nothrow pure @safe
        {
            return true;
@ -991,28 +769,18 @@ template isOutputRange(R, E)
        void popFront() @nogc nothrow pure @safe
        {
        }
+
        int front() @nogc nothrow pure @safe
        {
            return 0;
        }
+
        bool empty() const @nogc nothrow pure @safe
        {
            return true;
        }
    }
    static assert(!isOutputRange!(R3, int));
-
-    static struct R4
-    {
-        void opCall(int) @nogc nothrow pure @safe
-        {
-        }
-    }
-    static assert(isOutputRange!(R4, int));
-
-    static assert(isOutputRange!(R1, R3));
-    static assert(isOutputRange!(R2, R3));
-    static assert(isOutputRange!(R4, R3));
 }

 /**
@ -1080,27 +848,6 @@ template isInfinite(R)
    static assert(!isInfinite!InputRange);
 }

-@nogc nothrow pure @safe unittest
-{
-    @Infinite
-    static struct StaticConstRange
-    {
-        mixin InputRangeStub;
-
-        static bool empty = false;
-    }
-    static assert(!isInfinite!StaticConstRange);
-
-    @Infinite
-    static struct TrueRange
-    {
-        mixin InputRangeStub;
-
-        static const bool empty = true;
-    }
-    static assert(!isInfinite!TrueRange);
-}
-
 /**
 * Removes exactly $(D_PARAM count) first elements from the input range
 * $(D_PARAM range).
@ -1323,109 +1070,6 @@ if (isBidirectionalRange!R)
    assert(slice.length == 0);
 }

-@nogc nothrow pure @safe unittest
-{
-    @Infinite
-    static struct InfiniteRange
-    {
-        mixin ForwardRangeStub;
-        private int i;
-
-        void popFront() @nogc nothrow pure @safe
-        {
-            ++this.i;
-        }
-
-        void popBack() @nogc nothrow pure @safe
-        {
-            --this.i;
-        }
-
-        @property int front() const @nogc nothrow pure @safe
-        {
-            return this.i;
-        }
-
-        @property int back() const @nogc nothrow pure @safe
-        {
-            return this.i;
-        }
-    }
-    {
-        InfiniteRange range;
-        popFrontExactly(range, 2);
-        assert(range.front == 2);
-        popFrontN(range, 2);
-        assert(range.front == 4);
-    }
-    {
-        InfiniteRange range;
-        popBackExactly(range, 2);
-        assert(range.back == -2);
-        popBackN(range, 2);
-        assert(range.back == -4);
-    }
-}
-
-@nogc nothrow pure @safe unittest
-{
-    static struct Range
-    {
-        private int[5] a = [1, 2, 3, 4, 5];
-        private size_t begin = 0, end = 5;
-
-        Range save() @nogc nothrow pure @safe
-        {
-            return this;
-        }
-
-        void popFront() @nogc nothrow pure @safe
-        {
-            ++this.begin;
-        }
-
-        void popBack() @nogc nothrow pure @safe
-        {
-            --this.end;
-        }
-
-        @property int front() const @nogc nothrow pure @safe
-        {
-            return this.a[this.begin];
-        }
-
-        @property int back() const @nogc nothrow pure @safe
-        {
-            return this.a[this.end - 1];
-        }
-
-        @property bool empty() const @nogc nothrow pure @safe
-        {
-            return this.begin >= this.end;
-        }
-    }
-    {
-        Range range;
-
-        popFrontN(range, 3);
-        assert(range.front == 4);
-        assert(range.back == 5);
-
-        popFrontN(range, 20);
-        assert(range.empty);
-    }
-    {
-        Range range;
-
-        popBackN(range, 3);
-        assert(range.front == 1);
-        assert(range.back == 2);
-
-        popBackN(range, 20);
-        assert(range.empty);
-    }
-}
-
 /**
 * Moves the front element of an input range.
 *
@ -1467,25 +1111,6 @@ if (isInputRange!R)
    assert(moveFront(a[]) == 5);
 }

-@nogc nothrow pure @safe unittest
-{
-    // Returns its elements by reference.
-    @Infinite @WithLvalueElements
-    static struct R1
-    {
-        mixin InputRangeStub!AssertPostblit;
-    }
-    static assert(is(typeof(moveFront(R1()))));
-
-    // Returns elements with a postblit constructor by value. moveFront fails.
-    @Infinite
-    static struct R2
-    {
-        mixin InputRangeStub!AssertPostblit;
-    }
-    static assert(!is(typeof(moveFront(R2()))));
-}
-
 /**
 * Moves the back element of a bidirectional range.
 *
@ -1527,25 +1152,6 @@ if (isBidirectionalRange!R)
    assert(moveBack(a[]) == 5);
 }

-@nogc nothrow pure @safe unittest
-{
-    // Returns its elements by reference.
-    @Infinite @WithLvalueElements
-    static struct R1
-    {
-        mixin BidirectionalRangeStub!AssertPostblit;
-    }
-    static assert(is(typeof(moveBack(R1()))));
-
-    // Returns elements with a postblit constructor by value. moveBack fails.
-    @Infinite
-    static struct R2
-    {
-        mixin BidirectionalRangeStub!AssertPostblit;
-    }
-    static assert(!is(typeof(moveBack(R2()))));
-}
-
 /**
 * Moves the element at the position $(D_PARAM n) out of the range.
 *
@ -1586,25 +1192,6 @@ if (isRandomAccessRange!R)
    assert(moveAt(a[], 1) == 5);
 }

-@nogc nothrow pure @safe unittest
-{
-    // Returns its elements by reference.
-    @Infinite @WithLvalueElements
-    static struct R1
-    {
-        mixin RandomAccessRangeStub!AssertPostblit;
-    }
-    static assert(is(typeof(moveAt(R1(), 0))));
-
-    // Returns elements with a postblit constructor by value. moveAt fails.
-    @Infinite
-    static struct R2
-    {
-        mixin RandomAccessRangeStub!AssertPostblit;
-    }
-    static assert(!is(typeof(moveAt(R2(), 0))));
-}
-
 /**
 * Determines whether $(D_PSYMBOL R) is a range containing mobile elements,
 * i.e. elements that can be moved out of the range.
@ -1759,12 +1346,6 @@ template hasLvalueElements(R)
    static assert(hasLvalueElements!R2);
 }

-// Works with non-copyable elements
-@nogc nothrow pure @safe unittest
-{
-    static assert(hasLvalueElements!(NonCopyable[]));
-}
-
 /**
 * Determines whether the elements of $(D_PARAM R) are assignable.
 *
@ -1958,3 +1539,117 @@ if (isInputRange!Range && hasLvalueElements!Range)

    assert(!sameHead(r1, r2));
 }
+
+/**
+ * Returns the first element and advances the range.
+ *
+ * If $(D_PARAM range) has lvalue elements, then $(D_PSYMBOL getAndPopFront)
+ * returns by reference, otherwise the returned element is copied.
+ *
+ * Params:
+ *  R     = Input range type.
+ *  range = Input range.
+ *
+ * Returns: Front range element.
+ *
+ * See_Also: $(D_PSYMBOL getAndPopBack).
+ */
+ElementType!R getAndPopFront(R)(ref R range)
+if (isInputRange!R)
+in
+{
+    assert(!range.empty);
+}
+do
+{
+    static if (hasLvalueElements!R)
+    {
+        if (false)
+        {
+            // This code is removed by the compiler but ensures that
+            // this function isn't @safe if range.front isn't @safe.
+            auto _ = range.front();
+        }
+        auto el = (() @trusted => &range.front())();
+    }
+    else
+    {
+        auto el = range.front;
+    }
+    range.popFront();
+    static if (hasLvalueElements!R)
+    {
+        return *el;
+    }
+    else
+    {
+        return el;
+    }
+}
+
+///
+@nogc nothrow pure @safe unittest
+{
+    int[3] array = [1, 2, 3];
+    auto slice = array[];
+
+    assert(getAndPopFront(slice) == 1);
+    assert(slice.length == 2);
+}
+
+/**
+ * Returns the last element and removes it from the range.
+ *
+ * If $(D_PARAM range) has lvalue elements, then $(D_PSYMBOL getAndPopBack)
+ * returns by reference, otherwise the returned element is copied.
+ *
+ * Params:
+ *  R     = Bidirectional range type.
+ *  range = Bidirectional range.
+ *
+ * Returns: Last range element.
+ *
+ * See_Also: $(D_PSYMBOL getAndPopFront).
+ */
+auto ref getAndPopBack(R)(ref R range)
+if (isBidirectionalRange!R)
+in
+{
+    assert(!range.empty);
+}
+do
+{
+    static if (hasLvalueElements!R)
+    {
+        if (false)
+        {
+            // This code is removed by the compiler but ensures that
+            // this function isn't @safe if range.back isn't @safe.
+            auto _ = range.back();
+        }
+        auto el = (() @trusted => &range.back())();
+    }
+    else
+    {
+        auto el = range.back;
+    }
+    range.popBack();
+    static if (hasLvalueElements!R)
+    {
+        return *el;
+    }
+    else
+    {
+        return el;
+    }
+}
+
+///
+@nogc nothrow pure @trusted unittest
+{
+    int[3] array = [1, 2, 3];
+    auto slice = array[];
+
+    assert(getAndPopBack(slice) == 3);
+    assert(slice.length == 2);
+}
--- a/source/tanya/sys/linux/syscall.d
+++ b/source/tanya/sys/linux/syscall.d
@ -1,61 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * Copyright: Eugene Wissner 2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/sys/linux/syscall.d,
- *                 tanya/sys/linux/syscall.d)
- */
-module tanya.sys.linux.syscall;
-
-version (TanyaNative):
-
-extern ptrdiff_t syscall(ptrdiff_t, ptrdiff_t)
-@nogc nothrow @system;
-
-extern ptrdiff_t syscall(ptrdiff_t, ptrdiff_t, ptrdiff_t)
-@nogc nothrow @system;
-
-extern ptrdiff_t syscall(ptrdiff_t, ptrdiff_t, ptrdiff_t, ptrdiff_t)
-@nogc nothrow @system;
-
-extern ptrdiff_t syscall(ptrdiff_t,
-                         ptrdiff_t,
-                         ptrdiff_t,
-                         ptrdiff_t,
-                         ptrdiff_t,
-                         ptrdiff_t,
-                         ptrdiff_t) @nogc nothrow @system;
-
-// Same syscalls as above but pure.
-private template getOverloadMangling(size_t n)
-{
-    enum string getOverloadMangling = __traits(getOverloads,
-                                               tanya.sys.linux.syscall,
-                                               "syscall")[n].mangleof;
-}
-
-pragma(mangle, getOverloadMangling!0)
-extern ptrdiff_t syscall_(ptrdiff_t, ptrdiff_t)
-@nogc nothrow pure @system;
-
-pragma(mangle, getOverloadMangling!1)
-extern ptrdiff_t syscall_(ptrdiff_t, ptrdiff_t, ptrdiff_t)
-@nogc nothrow pure @system;
-
-pragma(mangle, getOverloadMangling!2)
-extern ptrdiff_t syscall_(ptrdiff_t, ptrdiff_t, ptrdiff_t, ptrdiff_t)
-@nogc nothrow pure @system;
-
-pragma(mangle, getOverloadMangling!3)
-extern ptrdiff_t syscall_(ptrdiff_t,
-                          ptrdiff_t,
-                          ptrdiff_t,
-                          ptrdiff_t,
-                          ptrdiff_t,
-                          ptrdiff_t,
-                          ptrdiff_t) @nogc nothrow pure @system;
--- a/source/tanya/sys/posix/ioctl.d
+++ b/source/tanya/sys/posix/ioctl.d
@ -1,78 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * Copyright: Eugene Wissner 2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/sys/posix/ioctl.d,
- *                 tanya/sys/posix/ioctl.d)
- */
-module tanya.sys.posix.ioctl;
-
-version (TanyaNative):
-
-enum
-{
-    SIOCADDRT = 0x890B, // Add routing table entry.
-    SIOCDELRT = 0x890C, // Delete routing table entry.
-    SIOCRTMSG = 0x890D, // Call to routing system.
-
-    SIOCGIFNAME = 0x8910, // Get iface name.
-    SIOCSIFLINK = 0x8911, // Set iface channel.
-    SIOCGIFCONF = 0x8912, // Get iface list.
-    SIOCGIFFLAGS = 0x8913, // Get flags.
-    SIOCSIFFLAGS = 0x8914, // Set flags.
-    SIOCGIFADDR = 0x8915, // Get PA address.
-    SIOCSIFADDR = 0x8916, // Set PA address.
-    SIOCGIFDSTADDR = 0x8917, // Get remote PA address.
-    SIOCSIFDSTADDR = 0x8918, // Set remote PA address.
-    SIOCGIFBRDADDR = 0x8919, // Get broadcast PA address.
-    SIOCSIFBRDADDR = 0x891a, // Set broadcast PA address.
-    SIOCGIFNETMASK = 0x891b, // Get network PA mask.
-    SIOCSIFNETMASK = 0x891c, // Set network PA mask.
-    SIOCGIFMETRIC = 0x891d, // Get metric.
-    SIOCSIFMETRIC = 0x891e, // Set metric.
-    SIOCGIFMEM = 0x891f, // Get memory address (BSD).
-    SIOCSIFMEM = 0x8920, // Set memory address (BSD).
-    SIOCGIFMTU = 0x8921, // Get MTU size.
-    SIOCSIFMTU = 0x8922, // Set MTU size.
-    SIOCSIFNAME = 0x8923, // Set interface name.
-    SIOCSIFHWADDR = 0x8924, // Set hardware address.
-    SIOCGIFENCAP = 0x8925, // Get/set encapsulations.
-    SIOCSIFENCAP = 0x8926,
-    SIOCGIFHWADDR = 0x8927, // Get hardware address.
-    SIOCGIFSLAVE = 0x8929, // Driver slaving support.
-    SIOCSIFSLAVE = 0x8930,
-    SIOCADDMULTI = 0x8931, // Multicast address lists.
-    SIOCDELMULTI = 0x8932,
-    SIOCGIFINDEX = 0x8933, // Name -> if_index mapping.
-    SIOGIFINDEX = SIOCGIFINDEX, // Misprint compatibility.
-    SIOCSIFPFLAGS = 0x8934, // Set/get extended flags set.
-    SIOCGIFPFLAGS = 0x8935,
-    SIOCDIFADDR = 0x8936, // Delete PA address.
-    SIOCSIFHWBROADCAST = 0x8937, // Set hardware broadcast address.
-    SIOCGIFCOUNT = 0x8938, // Get number of devices.
-
-    SIOCGIFBR = 0x8940, // Bridging support.
-    SIOCSIFBR = 0x8941, // Set bridging options.
-
-    SIOCGIFTXQLEN = 0x8942, // Get the tx queue length.
-    SIOCSIFTXQLEN = 0x8943, // Set the tx queue length.
-
-    SIOCDARP = 0x8953, // Delete ARP table entry.
-    SIOCGARP = 0x8954, // Get ARP table entry.
-    SIOCSARP = 0x8955, // Set ARP table entry.
-
-    SIOCDRARP = 0x8960, // Delete RARP table entry.
-    SIOCGRARP = 0x8961, // Get RARP table entry.
-    SIOCSRARP = 0x8962, // Set RARP table entry.
-
-    SIOCGIFMAP = 0x8970, // Get device parameters.
-    SIOCSIFMAP = 0x8971, // Set device parameters.
-
-    SIOCADDDLCI = 0x8980, // Create new DLCI device.
-    SIOCDELDLCI = 0x8981, // Delete DLCI device.
-}
--- a/source/tanya/sys/posix/mman.d
+++ b/source/tanya/sys/posix/mman.d
@ -1,31 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * Copyright: Eugene Wissner 2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/sys/posix/mman.d,
- *                 tanya/sys/posix/mman.d)
- */
-module tanya.sys.posix.mman;
-
-version (TanyaNative):
-
-enum
-{
-    PROT_EXEC = 0x4, // Page can be executed.
-    PROT_NONE = 0x0, // Page cannot be accessed.
-    PROT_READ = 0x1, // Page can be read.
-    PROT_WRITE = 0x2, // Page can be written.
-}
-
-enum
-{
-    MAP_FIXED = 0x10, // Interpret addr exactly.
-    MAP_PRIVATE = 0x02, // Changes are private.
-    MAP_SHARED = 0x01, // Share changes.
-    MAP_ANONYMOUS = 0x20, // Don't use a file.
-}
--- a/source/tanya/sys/posix/net/if_.d
+++ b/source/tanya/sys/posix/net/if_.d
@ -1,27 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * Copyright: Eugene Wissner 2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/sys/posix/net/if_.d,
- *                 tanya/sys/posix/net/if_.d)
- */
-module tanya.sys.posix.net.if_;
-
-version (TanyaNative):
-
-enum size_t IF_NAMESIZE = 16;
-
-struct ifreq
-{
-    char[IF_NAMESIZE] ifr_name;
-
-    union
-    {
-        int ifr_ifindex;
-    }
-}
--- a/source/tanya/sys/posix/socket.d
+++ b/source/tanya/sys/posix/socket.d
@ -1,152 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * Copyright: Eugene Wissner 2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/sys/posix/socket.d,
- *                 tanya/sys/posix/socket.d)
- */
-module tanya.sys.posix.socket;
-
-version (TanyaNative):
-
-/*
- * Protocol families.
- */
-enum
-{
-    PF_UNSPEC = 0, // Unspecified.
-    PF_LOCAL = 1, // Local to host (pipes and file-domain).
-    PF_UNIX = PF_LOCAL, // POSIX name for PF_LOCAL.
-    PF_FILE = PF_LOCAL, // Another non-standard name for PF_LOCAL.
-    PF_INET = 2, // IP protocol family.
-    PF_AX25 = 3, // Amateur Radio AX.25.
-    PF_IPX = 4, // Novell Internet Protocol.
-    PF_APPLETALK = 5, // Appletalk DDP.
-    PF_NETROM = 6, // Amateur radio NetROM.
-    PF_BRIDGE = 7, // Multiprotocol bridge.
-    PF_ATMPVC = 8, // ATM PVCs.
-    PF_X25 = 9, // Reserved for X.25 project.
-    PF_INET6 = 10, // IP version 6.
-    PF_ROSE = 11, // Amateur Radio X.25 PLP.
-    PF_DECnet = 12, // Reserved for DECnet project.
-    PF_NETBEUI = 13, // Reserved for 802.2LLC project.
-    PF_SECURITY = 14, // Security callback pseudo AF.
-    PF_KEY = 15, // PF_KEY key management API.
-    PF_NETLINK = 16, // Kernel user interface device.
-    PF_ROUTE = PF_NETLINK, // Alias to emulate 4.4BSD.
-    PF_PACKET = 17, // Packet family.
-    PF_ASH = 18, // Ash.
-    PF_ECONET = 19, // Acorn Econet.
-    PF_ATMSVC = 20, // ATM SVCs.
-    PF_RDS = 21, // RDS sockets.
-    PF_SNA = 22, // Linux SNA Project.
-    PF_IRDA = 23, // IRDA sockets.
-    PF_PPPOX = 24, // PPPoX sockets.
-    PF_WANPIPE = 25, // Wanpipe API sockets.
-    PF_LLC = 26, // Linux LLC.
-    PF_IB = 27, // Native InfiniBand address.
-    PF_MPLS = 28, // MPLS.
-    PF_CAN = 29, // Controller Area Network.
-    PF_TIPC = 30, // TIPC sockets.
-    PF_BLUETOOTH = 31, // Bluetooth sockets.
-    PF_IUCV = 32, // IUCV sockets.
-    PF_RXRPC = 33, // RxRPC sockets.
-    PF_ISDN = 34, // mISDN sockets.
-    PF_PHONET = 35, // Phonet sockets.
-    PF_IEEE802154 = 36, // IEEE 802.15.4 sockets.
-    PF_CAIF = 37, // CAIF sockets.
-    PF_ALG = 38, // Algorithm sockets.
-    PF_NFC = 39, // NFC sockets.
-    PF_VSOCK = 40, // vSockets.
-    PF_MAX = 41, // For now.
-}
-
-/*
- * Address families.
- */
-enum
-{
-    AF_UNSPEC = PF_UNSPEC,
-    AF_LOCAL = PF_LOCAL,
-    AF_UNIX = PF_UNIX,
-    AF_FILE = PF_FILE,
-    AF_INET = PF_INET,
-    AF_AX25 = PF_AX25,
-    AF_IPX = PF_IPX,
-    AF_APPLETALK = PF_APPLETALK,
-    AF_NETROM = PF_NETROM,
-    AF_BRIDGE = PF_BRIDGE,
-    AF_ATMPVC = PF_ATMPVC,
-    AF_X25 = PF_X25,
-    AF_INET6 = PF_INET6,
-    AF_ROSE = PF_ROSE,
-    AF_DECnet = PF_DECnet,
-    AF_NETBEUI = PF_NETBEUI,
-    AF_SECURITY = PF_SECURITY,
-    AF_KEY = PF_KEY,
-    AF_NETLINK = PF_NETLINK,
-    AF_ROUTE = PF_ROUTE,
-    AF_PACKET = PF_PACKET,
-    AF_ASH = PF_ASH,
-    AF_ECONET = PF_ECONET,
-    AF_ATMSVC = PF_ATMSVC,
-    AF_RDS = PF_RDS,
-    AF_SNA = PF_SNA,
-    AF_IRDA = PF_IRDA,
-    AF_PPPOX = PF_PPPOX,
-    AF_WANPIPE = PF_WANPIPE,
-    AF_LLC = PF_LLC,
-    AF_IB = PF_IB,
-    AF_MPLS = PF_MPLS,
-    AF_CAN = PF_CAN,
-    AF_TIPC = PF_TIPC,
-    AF_BLUETOOTH = PF_BLUETOOTH,
-    AF_IUCV = PF_IUCV,
-    AF_RXRPC = PF_RXRPC,
-    AF_ISDN = PF_ISDN,
-    AF_PHONET = PF_PHONET,
-    AF_IEEE802154 = PF_IEEE802154,
-    AF_CAIF = PF_CAIF,
-    AF_ALG = PF_ALG,
-    AF_NFC = PF_NFC,
-    AF_VSOCK = PF_VSOCK,
-    AF_MAX = PF_MAX,
-}
-
-/*
- * Types of sockets.
- */
-enum
-{
-    // Sequenced, reliable, connection-based byte streams.
-    SOCK_STREAM = 1,
-    // Connectionless, unreliable datagrams of fixed maximum length.
-    SOCK_DGRAM = 2,
-    // Raw protocol interface.
-    SOCK_RAW = 3,
-    // Reliably-delivered messages.
-    SOCK_RDM = 4,
-    // Sequenced, reliable, connection-based, datagrams of fixed maximum
-    // length.
-    SOCK_SEQPACKET = 5,
-    // Datagram Congestion Control Protocol.
-    SOCK_DCCP = 6,
-    // Linux specific way of getting packets at the dev level. For writing rarp
-    // and other similar things on the user level.
-    SOCK_PACKET = 10,
-}
-
-/*
- * Flags to be ORed into the type parameter of socket and socketpair and used
- * for the flags parameter of paccept.
- */
-enum
-{
-    SOCK_CLOEXEC = 0x80000, // Atomically set close-on-exec flag for the new descriptor(s).
-    SOCK_NONBLOCK = 0x800, // Atomically mark descriptor(s) as non-blocking.
-}
--- a/source/tanya/sys/windows/def.d
+++ b/source/tanya/sys/windows/def.d
@ -1,66 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Base type definitions and aliases.
- *
- * This module doesn't provide aliases for all types used by Windows, but only
- * for types that can vary on different platforms. For example there is no
- * need to define `INT32` alias for D, since $(D_KEYWORD int) is always a
- * 32-bit signed integer. But `int` and its Windows alias `INT` is not the
- * same on all platforms in C, so its size can be something differen than
- * 32 bit, therefore an $(D_PSYMBOL INT) alias is available in this module.
- * $(D_PARAM TCHAR) can be a $(D_KEYWORD char) if Unicode isn't supported or
- * $(D_KEYWORD wchar) if Unicode is supported, so $(D_PSYMBOL TCHAR) is
- * defined here.
- * Also aliases for specific types like $(D_PSYMBOL SOCKET) are defined here.
- *
- * Copyright: Eugene Wissner 2017-2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/sys/windows/def.d,
- *                 tanya/sys/windows/def.d)
- */
-module tanya.sys.windows.def;
-
-version (Windows):
-
-alias BYTE = ubyte;
-alias TBYTE = wchar; // If Unicode, otherwise char.
-alias CHAR = char; // Signed or unsigned char.
-alias WCHAR = wchar;
-alias TCHAR = wchar; // If Unicode, otherwise char.
-alias SHORT = short;
-alias USHORT = ushort;
-alias WORD = ushort;
-alias INT = int;
-alias UINT = uint;
-alias LONG = int;
-alias ULONG = uint;
-alias DWORD = uint;
-alias LONGLONG = long; // Or double.
-alias ULONGLONG = ulong; // Or double.
-alias DWORDLONG = ulong;
-alias FLOAT = float;
-alias BOOL = int;
-alias BOOLEAN = BYTE;
-
-alias HANDLE = void*;
-enum HANDLE INVALID_HANDLE_VALUE = cast(HANDLE) -1;
-
-enum TRUE = 1;
-enum FALSE = 0;
-
-alias PSTR = CHAR*;
-alias PWSTR = WCHAR*;
-alias PTSTR = TCHAR*;
-
-align(1) struct GUID
-{
-    uint Data1;
-    ushort Data2;
-    ushort Data3;
-    char[8] Data4;
-}
--- a/source/tanya/sys/windows/ifdef.d
+++ b/source/tanya/sys/windows/ifdef.d
@ -1,30 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Copyright: Eugene Wissner 2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/sys/windows/ifdef.d,
- *                 tanya/sys/windows/ifdef.d)
- */
-module tanya.sys.windows.ifdef;
-
-version (Windows):
-
-import tanya.sys.windows.def;
-
-union NET_LUID_LH
-{
-    ulong Value;
-    ulong Info;
-}
-
-alias NET_LUID = NET_LUID_LH;
-alias IF_LUID = NET_LUID_LH;
-
-alias NET_IFINDEX = ULONG;
-
-enum size_t IF_MAX_STRING_SIZE = 256;
--- a/source/tanya/sys/windows/iphlpapi.d
+++ b/source/tanya/sys/windows/iphlpapi.d
@ -1,39 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Copyright: Eugene Wissner 2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/sys/windows/iphlpapi.d,
- *                 tanya/sys/windows/iphlpapi.d)
- */
-module tanya.sys.windows.iphlpapi;
-
-version (Windows):
-
-import tanya.sys.windows.def;
-import tanya.sys.windows.ifdef;
-
-extern(Windows)
-DWORD ConvertInterfaceNameToLuidA(const(CHAR)* InterfaceName,
-                                  NET_LUID* InterfaceLuid)
-@nogc nothrow @system;
-
-extern(Windows)
-DWORD ConvertInterfaceLuidToIndex(const(NET_LUID)* InterfaceLuid,
-                                  NET_IFINDEX* InterfaceIndex)
-@nogc nothrow @system;
-
-extern(Windows)
-DWORD ConvertInterfaceIndexToLuid(NET_IFINDEX InterfaceIndex,
-                                  NET_LUID* InterfaceLuid)
-@nogc nothrow @system;
-
-extern(Windows)
-DWORD ConvertInterfaceLuidToNameA(const(NET_LUID)* InterfaceLuid,
-                                  PSTR InterfaceName,
-                                  size_t Length)
-@nogc nothrow @system;
--- a/source/tanya/sys/windows/package.d
+++ b/source/tanya/sys/windows/package.d
@ -1,21 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Copyright: Eugene Wissner 2017-2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/sys/windows/package.d,
- *                 tanya/sys/windows/package.d)
- */
-module tanya.sys.windows;
-
-version (Windows):
-
-public import tanya.sys.windows.def;
-public import tanya.sys.windows.ifdef;
-public import tanya.sys.windows.iphlpapi;
-public import tanya.sys.windows.winbase;
-public import tanya.sys.windows.winsock2;
--- a/source/tanya/sys/windows/winbase.d
+++ b/source/tanya/sys/windows/winbase.d
@ -1,55 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Definitions from winbase.h.
- *
- * Copyright: Eugene Wissner 2017-2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/sys/windows/winbase.d,
- *                 tanya/sys/windows/winbase.d)
- */
-module tanya.sys.windows.winbase;
-
-version (Windows):
-
-public import tanya.sys.windows.def;
-
-struct OVERLAPPED
-{
-    size_t Internal;
-    size_t InternalHigh;
-    union
-    {
-        struct
-        {
-            DWORD Offset;
-            DWORD OffsetHigh;
-        }
-        void* Pointer;
-    }
-    HANDLE hEvent;
-}
-
-extern(Windows)
-HANDLE CreateIoCompletionPort(HANDLE FileHandle,
-                              HANDLE ExistingCompletionPort,
-                              size_t CompletionKey,
-                              DWORD NumberOfConcurrentThreads)
-nothrow @system @nogc;
-
-extern(Windows)
-BOOL GetQueuedCompletionStatus(HANDLE CompletionPort,
-                               DWORD* lpNumberOfBytes,
-                               size_t* lpCompletionKey,
-                               OVERLAPPED** lpOverlapped,
-                               DWORD dwMilliseconds) nothrow @system @nogc;
-
-extern(Windows)
-BOOL GetOverlappedResult(HANDLE hFile,
-                         OVERLAPPED* lpOverlapped,
-                         DWORD* lpNumberOfBytesTransferred,
-                         BOOL bWait) nothrow @system @nogc;
--- a/source/tanya/sys/windows/winsock2.d
+++ b/source/tanya/sys/windows/winsock2.d
@ -1,219 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Definitions from winsock2.h, ws2def.h and MSWSock.h.
- *
- * Copyright: Eugene Wissner 2017-2018.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/sys/windows/winsock2.d,
- *                 tanya/sys/windows/winsock2.d)
- */
-module tanya.sys.windows.winsock2;
-
-version (Windows):
-
-public import tanya.sys.windows.def;
-public import tanya.sys.windows.winbase;
-
-alias SOCKET = size_t;
-enum SOCKET INVALID_SOCKET = ~0;
-enum SOCKET_ERROR = -1;
-
-enum
-{
-    IOC_UNIX     = 0x00000000,
-    IOC_WS2      = 0x08000000,
-    IOC_PROTOCOL = 0x10000000,
-    IOC_VOID     = 0x20000000,         // No parameters.
-    IOC_OUT      = 0x40000000,         // Copy parameters back.
-    IOC_IN       = 0x80000000,         // Copy parameters into.
-    IOC_VENDOR   = 0x18000000,
-    IOC_WSK      = (IOC_WS2 | 0x07000000), // _WIN32_WINNT >= 0x0600.
-    IOC_INOUT    = (IOC_IN | IOC_OUT), // Copy parameter into and get back.
-}
-
-template _WSAIO(int x, int y)
-{
-    enum _WSAIO = IOC_VOID | x | y;
-}
-template _WSAIOR(int x, int y)
-{
-    enum _WSAIOR = IOC_OUT | x | y;
-}
-template _WSAIOW(int x, int y)
-{
-    enum _WSAIOW = IOC_IN | x | y;
-}
-template _WSAIORW(int x, int y)
-{
-    enum _WSAIORW = IOC_INOUT | x | y;
-}
-
-alias SIO_ASSOCIATE_HANDLE               = _WSAIOW!(IOC_WS2, 1);
-alias SIO_ENABLE_CIRCULAR_QUEUEING       = _WSAIO!(IOC_WS2, 2);
-alias SIO_FIND_ROUTE                     = _WSAIOR!(IOC_WS2, 3);
-alias SIO_FLUSH                          = _WSAIO!(IOC_WS2, 4);
-alias SIO_GET_BROADCAST_ADDRESS          = _WSAIOR!(IOC_WS2, 5);
-alias SIO_GET_EXTENSION_FUNCTION_POINTER = _WSAIORW!(IOC_WS2, 6);
-alias SIO_GET_QOS                        = _WSAIORW!(IOC_WS2, 7);
-alias SIO_GET_GROUP_QOS                  = _WSAIORW!(IOC_WS2, 8);
-alias SIO_MULTIPOINT_LOOPBACK            = _WSAIOW!(IOC_WS2, 9);
-alias SIO_MULTICAST_SCOPE                = _WSAIOW!(IOC_WS2, 10);
-alias SIO_SET_QOS                        = _WSAIOW!(IOC_WS2, 11);
-alias SIO_SET_GROUP_QOS                  = _WSAIOW!(IOC_WS2, 12);
-alias SIO_TRANSLATE_HANDLE               = _WSAIORW!(IOC_WS2, 13);
-alias SIO_ROUTING_INTERFACE_QUERY        = _WSAIORW!(IOC_WS2, 20);
-alias SIO_ROUTING_INTERFACE_CHANGE       = _WSAIOW!(IOC_WS2, 21);
-alias SIO_ADDRESS_LIST_QUERY             = _WSAIOR!(IOC_WS2, 22);
-alias SIO_ADDRESS_LIST_CHANGE            = _WSAIO!(IOC_WS2, 23);
-alias SIO_QUERY_TARGET_PNP_HANDLE        = _WSAIOR!(IOC_WS2, 24);
-alias SIO_NSP_NOTIFY_CHANGE              = _WSAIOW!(IOC_WS2, 25);
-
-alias GROUP = uint;
-
-enum
-{
-    WSA_FLAG_OVERLAPPED = 0x01,
-    WSA_FLAG_MULTIPOINT_C_ROOT = 0x02,
-    WSA_FLAG_MULTIPOINT_C_LEAF = 0x04,
-    WSA_FLAG_MULTIPOINT_D_ROOT = 0x08,
-    WSA_FLAG_MULTIPOINT_D_LEAF = 0x10,
-    WSA_FLAG_ACCESS_SYSTEM_SECURITY = 0x40,
-    WSA_FLAG_NO_HANDLE_INHERIT = 0x80,
-    WSA_FLAG_REGISTERED_IO = 0x100,
-}
-
-enum MAX_PROTOCOL_CHAIN = 7;
-enum BASE_PROTOCOL = 1;
-enum LAYERED_PROTOCOL = 0;
-enum WSAPROTOCOL_LEN = 255;
-
-struct WSAPROTOCOLCHAIN
-{
-    int ChainLen;
-    DWORD[MAX_PROTOCOL_CHAIN] ChainEntries;
-}
-
-struct WSABUF
-{
-    ULONG len;
-    CHAR* buf;
-}
-
-struct WSAPROTOCOL_INFO
-{
-    DWORD                      dwServiceFlags1;
-    DWORD                      dwServiceFlags2;
-    DWORD                      dwServiceFlags3;
-    DWORD                      dwServiceFlags4;
-    DWORD                      dwProviderFlags;
-    GUID                       ProviderId;
-    DWORD                      dwCatalogEntryId;
-    WSAPROTOCOLCHAIN           ProtocolChain;
-    int                        iVersion;
-    int                        iAddressFamily;
-    int                        iMaxSockAddr;
-    int                        iMinSockAddr;
-    int                        iSocketType;
-    int                        iProtocol;
-    int                        iProtocolMaxOffset;
-    int                        iNetworkByteOrder;
-    int                        iSecurityScheme;
-    DWORD                      dwMessageSize;
-    DWORD                      dwProviderReserved;
-    TCHAR[WSAPROTOCOL_LEN + 1] szProtocol;
-}
-
-const GUID WSAID_GETACCEPTEXSOCKADDRS = {
-    0xb5367df2, 0xcbac, 0x11cf,
-    [0x95, 0xca, 0x00, 0x80, 0x5f, 0x48, 0xa1, 0x92],
-};
-
-const GUID WSAID_ACCEPTEX = {
-    0xb5367df1, 0xcbac, 0x11cf,
-    [0x95, 0xca, 0x00, 0x80, 0x5f, 0x48, 0xa1, 0x92],
-};
-
-alias LPWSAOVERLAPPED_COMPLETION_ROUTINE = void function(DWORD dwError,
-                                                         DWORD cbTransferred,
-                                                         OVERLAPPED* lpOverlapped,
-                                                         DWORD dwFlags) nothrow @nogc;
-
-extern(Windows)
-SOCKET WSASocket(int af,
-                 int type,
-                 int protocol,
-                 WSAPROTOCOL_INFO* lpProtocolInfo,
-                 GROUP g,
-                 DWORD dwFlags) nothrow @system @nogc;
-
-extern(Windows)
-int WSARecv(SOCKET s,
-            WSABUF* lpBuffers,
-            DWORD dwBufferCount,
-            DWORD* lpNumberOfBytesRecvd,
-            DWORD* lpFlags,
-            OVERLAPPED* lpOverlapped,
-            LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine)
-nothrow @system @nogc;
-
-extern(Windows)
-int WSASend(SOCKET s,
-            WSABUF* lpBuffers,
-            DWORD dwBufferCount,
-            DWORD* lpNumberOfBytesRecvd,
-            DWORD lpFlags,
-            OVERLAPPED* lpOverlapped,
-            LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine)
-nothrow @system @nogc;
-
-extern(Windows)
-int WSAIoctl(SOCKET s,
-             uint dwIoControlCode,
-             void* lpvInBuffer,
-             uint cbInBuffer,
-             void* lpvOutBuffer,
-             uint cbOutBuffer,
-             uint* lpcbBytesReturned,
-             OVERLAPPED* lpOverlapped,
-             LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine)             
-nothrow @system @nogc;
-
-alias ADDRESS_FAMILY = USHORT;
-
-struct SOCKADDR
-{
-    ADDRESS_FAMILY sa_family;           // Address family.
-    CHAR[14] sa_data;                   // Up to 14 bytes of direct address.
-}
-
-alias LPFN_GETACCEPTEXSOCKADDRS = void function(void*,
-                                                DWORD,
-                                                DWORD,
-                                                DWORD,
-                                                SOCKADDR**,
-                                                INT*,
-                                                SOCKADDR**,
-                                                INT*) nothrow @nogc;
-
-alias LPFN_ACCEPTEX = extern(Windows) BOOL function(SOCKET,
-                                                    SOCKET,
-                                                    void*,
-                                                    DWORD,
-                                                    DWORD,
-                                                    DWORD,
-                                                    DWORD*,
-                                                    OVERLAPPED*) @nogc nothrow;
-
-enum
-{
-    SO_MAXDG = 0x7009,
-    SO_MAXPATHDG = 0x700A,
-    SO_UPDATE_ACCEPT_CONTEXT = 0x700B,
-    SO_CONNECT_TIME = 0x700C,
-    SO_UPDATE_CONNECT_CONTEXT = 0x7010,
-}
--- a/source/tanya/typecons.d
+++ b/source/tanya/typecons.d
@ -1,934 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * Type constructors.
- *
- * This module contains templates that allow to build new types from the
- * available ones.
- *
- * Copyright: Eugene Wissner 2017-2019.
- * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
- *                  Mozilla Public License, v. 2.0).
- * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
- * Source: $(LINK2 https://github.com/caraus-ecms/tanya/blob/master/source/tanya/typecons.d,
- *                 tanya/typecons.d)
- */
-module tanya.typecons;
-
-import tanya.algorithm.mutation;
-import tanya.conv;
-import tanya.format;
-import tanya.functional;
-import tanya.meta.metafunction;
-import tanya.meta.trait;
-version (unittest) import tanya.test.stub;
-
-/**
- * $(D_PSYMBOL Tuple) can store two or more heterogeneous objects.
- *
- * The objects can by accessed by index as `obj[0]` and `obj[1]` or by optional
- * names (e.g. `obj.first`).
- *
- * $(D_PARAM Specs) contains a list of object types and names. First
- * comes the object type, then an optional string containing the name.
- * If you want the object be accessible only by its index (`0` or `1`),
- * just skip the name.
- *
- * Params:
- *  Specs = Field types and names.
- *
- * See_Also: $(D_PSYMBOL tuple).
- */
-template Tuple(Specs...)
-{
-    template parseSpecs(size_t fieldCount, Specs...)
-    {
-        static if (Specs.length == 0)
-        {
-            alias parseSpecs = AliasSeq!();
-        }
-        else static if (is(Specs[0]) && fieldCount < 2)
-        {
-            static if (is(typeof(Specs[1]) == string))
-            {
-                alias parseSpecs
-                    = AliasSeq!(Pack!(Specs[0], Specs[1]),
-                                parseSpecs!(fieldCount + 1, Specs[2 .. $]));
-            }
-            else
-            {
-                alias parseSpecs
-                    = AliasSeq!(Pack!(Specs[0]),
-                                parseSpecs!(fieldCount + 1, Specs[1 .. $]));
-            }
-        }
-        else
-        {
-            static assert(false, "Invalid argument: " ~ Specs[0].stringof);
-        }
-    }
-
-    alias ChooseType(alias T) = T.Seq[0];
-    alias ParsedSpecs = parseSpecs!(0, Specs);
-
-    static assert(ParsedSpecs.length > 1, "Invalid argument count");
-
-    private string formatAliases(size_t n, Specs...)()
-    {
-        static if (Specs.length == 0)
-        {
-            return "";
-        }
-        else
-        {
-            string fieldAlias;
-            static if (Specs[0].length == 2)
-            {
-                char[21] buffer;
-                fieldAlias = "alias " ~ Specs[0][1] ~ " = expand["
-                           ~ integral2String(n, buffer).idup ~ "];";
-            }
-            return fieldAlias ~ formatAliases!(n + 1, Specs[1 .. $])();
-        }
-    }
-
-    struct Tuple
-    {
-        /// Field types.
-        alias Types = Map!(ChooseType, ParsedSpecs);
-
-        // Create field aliases.
-        mixin(formatAliases!(0, ParsedSpecs[0 .. $])());
-
-        /// Represents the values of the $(D_PSYMBOL Tuple) as a list of values.
-        Types expand;
-
-        alias expand this;
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    auto pair = Tuple!(int, "first", string, "second")(1, "second");
-    assert(pair.first == 1);
-    assert(pair[0] == 1);
-    assert(pair.second == "second");
-    assert(pair[1] == "second");
-}
-
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(Tuple!(int, int)));
-    static assert(!is(Tuple!(int, 5)));
-
-    static assert(is(Tuple!(int, "first", int)));
-    static assert(is(Tuple!(int, "first", int, "second")));
-    static assert(is(Tuple!(int, "first", int)));
-
-    static assert(is(Tuple!(int, int, "second")));
-    static assert(!is(Tuple!("first", int, "second", int)));
-    static assert(!is(Tuple!(int, int, int)));
-
-    static assert(!is(Tuple!(int, "first")));
-
-    static assert(!is(Tuple!(int, double, char)));
-    static assert(!is(Tuple!(int, "first", double, "second", char, "third")));
-}
-
-/**
- * Creates a new $(D_PSYMBOL Tuple).
- *
- * Params:
- *  Names = Field names.
- *
- * See_Also: $(D_PSYMBOL Tuple).
- */
-template tuple(Names...)
-{
-    /**
-     * Creates a new $(D_PSYMBOL Tuple).
-     *
-     * Params:
-     *  Args = Field types.
-     *  args = Field values.
-     *
-     * Returns: Newly created $(D_PSYMBOL Tuple).
-     */
-    auto tuple(Args...)(auto ref Args args)
-    if (Args.length >= Names.length && isTypeTuple!Args)
-    {
-        alias Zipped = ZipWith!(AliasSeq, Pack!Args, Pack!Names);
-        alias Nameless = Args[Names.length .. $];
-
-        return Tuple!(Zipped, Nameless)(forward!args);
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    auto t = tuple!("one", "two")(20, 5);
-    assert(t.one == 20);
-    assert(t.two == 5);
-}
-
-/**
- * $(D_PSYMBOL Option) is a type that contains an optional value.
- *
- * Params:
- *  T = Type of the encapsulated value.
- *
- * See_Also: $(D_PSYMBOL option).
- */
-struct Option(T)
-{
-    private bool isNothing_ = true;
-    private T value = void;
-
-    /**
-     * Constructs a new option with $(D_PARAM value).
-     *
-     * Params:
-     *  value = Encapsulated value.
-     */
-    this()(ref T value)
-    {
-        this.value = value;
-        this.isNothing_ = false;
-    }
-
-    /// ditto
-    this()(T value) @trusted
-    {
-        moveEmplace(value, this.value);
-        this.isNothing_ = false;
-    }
-
-    /**
-     * Tells if the option is just a value or nothing.
-     *
-     * Returns: $(D_KEYWORD true) if this $(D_PSYMBOL Option) contains a nothing,
-     *          $(D_KEYWORD false) if it contains a value.
-     */
-    @property bool isNothing() const
-    {
-        return this.isNothing_;
-    }
-
-    /**
-     * Returns the encapsulated value.
-     *
-     * Returns: Value encapsulated in this $(D_PSYMBOL Option).
-     *
-     * See_Also: $(D_PSYMBOL or).
-     *
-     * Precondition: `!isNothing`.
-     */
-    @property ref inout(T) get() inout
-    in (!isNothing, "Option is nothing")
-    {
-        return this.value;
-    }
-
-    /// ditto
-    deprecated("Call Option.get explicitly instead of relying on alias this")
-    @property ref inout(T) get_() inout
-    in (!isNothing, "Option is nothing")
-    {
-        return this.value;
-    }
-
-    /**
-     * Returns the encapsulated value if available or a default value
-     * otherwise.
-     *
-     * Note that the contained value can be returned by reference only if the
-     * default value is passed by reference as well.
-     *
-     * Params:
-     *  U            = Type of the default value.
-     *  defaultValue = Default value.
-     *
-     * Returns: The value of this $(D_PSYMBOL Option) if available,
-     *          $(D_PARAM defaultValue) otherwise.
-     *
-     * See_Also: $(D_PSYMBOL isNothing), $(D_PSYMBOL get).
-     */
-    @property U or(U)(U defaultValue) inout
-    if (is(U == T) && isCopyable!T)
-    {
-        return isNothing ? defaultValue : this.value;
-    }
-
-    /// ditto
-    @property ref inout(T) or(ref inout(T) defaultValue) inout
-    {
-        return isNothing ? defaultValue : this.value;
-    }
-
-    /**
-     * Casts this $(D_PSYMBOL Option) to $(D_KEYWORD bool).
-     *
-     * An $(D_PSYMBOL Option) is $(D_KEYWORD true) if it contains a value,
-     * ($D_KEYWORD false) if it contains nothing.
-     *
-     * Returns: $(D_KEYWORD true) if this $(D_PSYMBOL Option) contains a value,
-     *          ($D_KEYWORD false) if it contains nothing.
-     */
-    bool opCast(U : bool)()
-    {
-        return !isNothing;
-    }
-
-    /**
-     * Compares this $(D_PSYMBOL Option) with $(D_PARAM that).
-     *
-     * If both objects are options of the same type and they don't contain a
-     * value, they are considered equal. If only one of them contains a value,
-     * they aren't equal. Otherwise, the encapsulated values are compared for
-     * equality.
-     *
-     * If $(D_PARAM U) is a type comparable with the type encapsulated by this
-     * $(D_PSYMBOL Option), the value of this $(D_PSYMBOL Option) is compared
-     * with $(D_PARAM that), this $(D_PSYMBOL Option) must have a value then.
-     *
-     * Params:
-     *  U    = Type of the object to compare with.
-     *  that = Object to compare with.
-     *
-     * Returns: $(D_KEYWORD true) if this $(D_PSYMBOL Option) and
-     *          $(D_PARAM that) are equal, $(D_KEYWORD false) if not.
-     *
-     * Precondition: `!isNothing` if $(D_PARAM U) is equality comparable with
-     *               $(D_PARAM T).
-     */
-    bool opEquals(U)(auto ref const U that) const
-    if (is(U == Option))
-    {
-        if (!isNothing && !that.isNothing)
-        {
-            return this.value == that.value;
-        }
-        return isNothing == that.isNothing;
-    }
-
-    /// ditto
-    bool opEquals(U)(auto ref const U that) const
-    if (ifTestable!(U, a => a == T.init) && !is(U == Option))
-    in
-    {
-        assert(!isNothing);
-    }
-    do
-    {
-        return get == that;
-    }
-
-    /**
-     * Resets this $(D_PSYMBOL Option) and destroys the contained value.
-     *
-     * $(D_PSYMBOL reset) can be safely called on an $(D_PSYMBOL Option) that
-     * doesn't contain any value.
-     */
-    void reset()
-    {
-        static if (hasElaborateDestructor!T)
-        {
-            destroy(this.value);
-        }
-        this.isNothing_ = true;
-    }
-
-    /**
-     * Assigns a new value.
-     *
-     * Params:
-     *  U    = Type of the new value.
-     *  that = New value.
-     *
-     * Returns: $(D_KEYWORD this).
-     */
-    ref typeof(this) opAssign(U)(ref U that)
-    if (is(U : T) && !is(U == Option))
-    {
-        this.value = that;
-        this.isNothing_ = false;
-        return this;
-    }
-
-    /// ditto
-    ref typeof(this) opAssign(U)(U that)
-    if (is(U == T))
-    {
-        move(that, this.value);
-        this.isNothing_ = false;
-        return this;
-    }
-
-    /// ditto
-    ref typeof(this) opAssign(U)(ref U that)
-    if (is(U == Option))
-    {
-        if (that.isNothing)
-        {
-            reset();
-        }
-        else
-        {
-            this.value = that.get;
-            this.isNothing_ = false;
-        }
-        return this;
-    }
-
-    /// ditto
-    ref typeof(this) opAssign(U)(U that)
-    if (is(U == Option))
-    {
-        move(that.value, this.value);
-        this.isNothing_ = that.isNothing_;
-        return this;
-    }
-
-    version (D_Ddoc)
-    {
-        /**
-         * If $(D_PARAM T) has a `toHash()` method, $(D_PSYMBOL Option) defines
-         * `toHash()` which returns `T.toHash()` if it is set or 0 otherwise.
-         *
-         * Returns: Hash value.
-         */
-        size_t toHash() const;
-    }
-    else static if (is(typeof(T.init.toHash()) == size_t))
-    {
-        size_t toHash() const
-        {
-            return isNothing ? 0U : this.value.toHash();
-        }
-    }
-
-    alias get_ this;
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    Option!int option;
-    assert(option.isNothing);
-    assert(option.or(8) == 8);
-    
-    option = 5;
-    assert(!option.isNothing);
-    assert(option.get == 5);
-    assert(option.or(8) == 5);
-
-    option.reset();
-    assert(option.isNothing);
-}
-
-// Assigns a new value
-@nogc nothrow pure @safe unittest
-{
-    {
-        Option!int option = 5;
-        option = 8;
-        assert(!option.isNothing);
-        assert(option == 8);
-    }
-    {
-        Option!int option;
-        const int newValue = 8;
-        assert(option.isNothing);
-        option = newValue;
-        assert(!option.isNothing);
-        assert(option == newValue);
-    }
-    {
-        Option!int option1;
-        Option!int option2 = 5;
-        assert(option1.isNothing);
-        option1 = option2;
-        assert(!option1.isNothing);
-        assert(option1.get == 5);
-    }
-}
-
-// Constructs with a value passed by reference
-@nogc nothrow pure @safe unittest
-{
-    int i = 5;
-    assert(Option!int(i).get == 5);
-}
-
-// Moving
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(typeof(Option!NonCopyable(NonCopyable()))));
-    // The value cannot be returned by reference because the default value
-    // isn't passed by reference
-    static assert(!is(typeof(Option!DisabledPostblit().or(NonCopyable()))));
-    {
-        NonCopyable notCopyable;
-        static assert(is(typeof(Option!NonCopyable().or(notCopyable))));
-    }
-    {
-        Option!NonCopyable option;
-        assert(option.isNothing);
-        option = NonCopyable();
-        assert(!option.isNothing);
-    }
-    {
-        Option!NonCopyable option;
-        assert(option.isNothing);
-        option = Option!NonCopyable(NonCopyable());
-        assert(!option.isNothing);
-    }
-}
-
-// Cast to bool is done before touching the encapsulated value
-@nogc nothrow pure @safe unittest
-{
-    assert(Option!bool(false));
-}
-
-// Option can be const
-@nogc nothrow pure @safe unittest
-{
-    assert((const Option!int(5)).get == 5);
-    assert((const Option!int()).or(5) == 5);
-}
-
-// Equality
-@nogc nothrow pure @safe unittest
-{
-    assert(Option!int() == Option!int());
-    assert(Option!int(0) != Option!int());
-    assert(Option!int(5) == Option!int(5));
-    assert(Option!int(5) == 5);
-    assert(Option!int(5) == cast(ubyte) 5);
-}
-
-// Returns default value
-@nogc nothrow pure @safe unittest
-{
-    int i = 5;
-    assert(((ref e) => e)(Option!int().or(i)) == 5);
-}
-
-// Implements toHash() for nothing
-@nogc nothrow pure @safe unittest
-{
-    alias OptionT = Option!Hashable;
-    assert(OptionT().toHash() == 0U);
-    assert(OptionT(Hashable(1U)).toHash() == 1U);
-}
-
-// Can assign Option that is nothing
-@nogc nothrow pure @safe unittest
-{
-    auto option1 = Option!int(5);
-    Option!int option2;
-    option1 = option2;
-    assert(option1.isNothing);
-}
-
-/**
- * Creates a new $(D_PSYMBOL Option).
- *
- * Params:
- *  T     = Option type.
- *  value = Initial value.
- *
- * See_Also: $(D_PSYMBOL Option).
- */
-Option!T option(T)(auto ref T value)
-{
-    return Option!T(forward!value);
-}
-
-/// ditto
-Option!T option(T)()
-{
-    return Option!T();
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    assert(option!int().isNothing);
-    assert(option(5) == 5);
-}
-
-/**
- * Type that can hold one of the types listed as its template parameters.
- *
- * $(D_PSYMBOL Variant) is a type similar to $(D_KEYWORD union), but
- * $(D_PSYMBOL Variant) keeps track of the actually used type and throws an
- * assertion error when trying to access an invalid type at runtime.
- *
- * Params:
- *  Specs = Types this $(D_SPYBMOL Variant) can hold.
- */
-template Variant(Specs...)
-if (isTypeTuple!Specs && NoDuplicates!Specs.length == Specs.length)
-{
-    union AlignedUnion(Args...)
-    {
-        static if (Args.length > 0)
-        {
-            Args[0] value;
-        }
-        static if (Args.length > 1)
-        {
-            AlignedUnion!(Args[1 .. $]) rest;
-        }
-    }
-
-    private struct VariantAccessorInfo
-    {
-        string accessor;
-        ptrdiff_t tag;
-    }
-
-    template accessor(T, Union)
-    {
-        enum VariantAccessorInfo info = accessorImpl!(T, Union, 1);
-        enum accessor = VariantAccessorInfo("this.values" ~ info.accessor, info.tag);
-    }
-
-    template accessorImpl(T, Union, size_t tag)
-    {
-        static if (is(T == typeof(Union.value)))
-        {
-            enum accessorImpl = VariantAccessorInfo(".value", tag);
-        }
-        else
-        {
-            enum VariantAccessorInfo info = accessorImpl!(T, typeof(Union.rest), tag + 1);
-            enum accessorImpl = VariantAccessorInfo(".rest" ~ info.accessor, info.tag);
-        }
-    }
-
-    struct Variant
-    {
-        /// Types can be present in this $(D_PSYMBOL Variant).
-        alias Types = Specs;
-
-        private ptrdiff_t tag = -1;
-        private AlignedUnion!Types values;
-
-        /**
-         * Constructs this $(D_PSYMBOL Variant) with one of the types supported
-         * in it.
-         *
-         * Params:
-         *  T     = Type of the initial value.
-         *  value = Initial value.
-         */
-        this(T)(ref T value)
-        if (canFind!(T, Types))
-        {
-            copyAssign!T(value);
-        }
-
-        /// ditto
-        this(T)(T value)
-        if (canFind!(T, Types))
-        {
-            moveAssign!T(value);
-        }
-
-        ~this()
-        {
-            reset();
-        }
-
-        this(this)
-        {
-            alias pred(U) = hasElaborateCopyConstructor!(U.Seq[1]);
-            static foreach (Type; Filter!(pred, Enumerate!Types))
-            {
-                if (this.tag == Type.Seq[0])
-                {
-                    get!(Type.Seq[1]).__postblit();
-                }
-            }
-        }
-
-        /**
-         * Tells whether this $(D_PSYMBOL Variant) is initialized.
-         *
-         * Returns: $(D_KEYWORD true) if this $(D_PSYMBOL Variant) contains a
-         *          value, $(D_KEYWORD false) otherwise.
-         */
-        bool hasValue() const
-        {
-            return this.tag != -1;
-        }
-
-        /**
-         * Tells whether this $(D_PSYMBOL Variant) holds currently a value of
-         * type $(D_PARAM T).
-         *
-         * Params:
-         *  T = Examined type.
-         *
-         * Returns: $(D_KEYWORD true) if this $(D_PSYMBOL Variant) currently
-         *          contains a value of type $(D_PARAM T), $(D_KEYWORD false)
-         *          otherwise.
-         */
-        bool peek(T)() const
-        if (canFind!(T, Types))
-        {
-            return this.tag == staticIndexOf!(T, Types);
-        }
-
-        /**
-         * Returns the underlying value, assuming it is of the type $(D_PARAM T).
-         *
-         * Params:
-         *  T = Type of the value should be returned.
-         *
-         * Returns: The underyling value.
-         *
-         * Precondition: The $(D_PSYMBOL Variant) has a value.
-         *
-         * See_Also: $(D_PSYMBOL peek), $(D_PSYMBOL hasValue).
-         */
-        ref inout(T) get(T)() inout
-        if (canFind!(T, Types))
-        in (this.tag == staticIndexOf!(T, Types), "Variant isn't initialized")
-        {
-            mixin("return " ~ accessor!(T, AlignedUnion!Types).accessor ~ ";");
-        }
-
-        /**
-         * Reassigns the value.
-         *
-         * Params:
-         *  T    = Type of the new value
-         *  that = New value.
-         *
-         * Returns: $(D_KEYWORD this).
-         */
-        ref typeof(this) opAssign(T)(T that)
-        if (canFind!(T, Types))
-        {
-            reset();
-            return moveAssign!T(that);
-        }
-
-        /// ditto
-        ref typeof(this) opAssign(T)(ref T that)
-        if (canFind!(T, Types))
-        {
-            reset();
-            return copyAssign!T(that);
-        }
-
-        private ref typeof(this) moveAssign(T)(ref T that) @trusted
-        {
-            this.tag = staticIndexOf!(T, Types);
-
-            enum string accessorMixin = accessor!(T, AlignedUnion!Types).accessor;
-            moveEmplace(that, mixin(accessorMixin));
-
-            return this;
-        }
-
-        private ref typeof(this) copyAssign(T)(ref T that)
-        {
-            this.tag = staticIndexOf!(T, Types);
-
-            enum string accessorMixin = accessor!(T, AlignedUnion!Types).accessor;
-            emplace!T((() @trusted => (&mixin(accessorMixin))[0 .. 1])(), that);
-
-            return this;
-        }
-
-        private void reset()
-        {
-            alias pred(U) = hasElaborateDestructor!(U.Seq[1]);
-            static foreach (Type; Filter!(pred, Enumerate!Types))
-            {
-                if (this.tag == Type.Seq[0])
-                {
-                    destroy(get!(Type.Seq[1]));
-                }
-            }
-        }
-
-        /**
-         * Returns $(D_PSYMBOL TypeInfo) corresponding to the current type.
-         *
-         * If this $(D_PSYMBOL Variant) isn't initialized, returns
-         * $(D_KEYWORD null).
-         *
-         * Returns: $(D_PSYMBOL TypeInfo) of the current type.
-         */
-        @property TypeInfo type()
-        {
-            static foreach (i, Type; Types)
-            {
-                if (this.tag == i)
-                {
-                    return typeid(Type);
-                }
-            }
-            return null;
-        }
-
-        /**
-         * Compares this $(D_PSYMBOL Variant) with another one with the same
-         * specification for equality.
-         *
-         * $(UL
-         *  $(LI If both hold values of the same type, these values are
-         *       compared.)
-         *  $(LI If they hold values of different types, then the
-         *       $(D_PSYMBOL Variant)s aren't equal.)
-         *  $(LI If only one of them is initialized but another one not, they
-         *       aren't equal.)
-         *  $(LI If neither of them is initialized, they are equal.)
-         * )
-         *
-         * Params:
-         *  that = The $(D_PSYMBOL Variant) to compare with.
-         *
-         * Returns: $(D_KEYWORD true) if this $(D_PSYMBOL Variant) is equal to
-         *          $(D_PARAM that), $(D_KEYWORD false) otherwise.
-         */
-        bool opEquals()(auto ref inout Variant that) inout
-        {
-            if (this.tag != that.tag)
-            {
-                return false;
-            }
-            static foreach (i, Type; Types)
-            {
-                if (this.tag == i)
-                {
-                    return get!Type == that.get!Type;
-                }
-            }
-            return true;
-        }
-    }
-}
-
-///
-@nogc nothrow pure @safe unittest
-{
-    Variant!(int, double) variant = 5;
-    assert(variant.peek!int);
-    assert(variant.get!int == 5);
-
-    variant = 5.4;
-    assert(!variant.peek!int);
-    assert(variant.get!double == 5.4);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    Variant!(int, double) variant;
-    variant = 5;
-    assert(variant.peek!int);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    Variant!(int, double) variant;
-    variant = 5.0;
-    assert(!variant.peek!int);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    Variant!(int, double) variant = 5;
-    assert(variant.get!int == 5);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    static assert(is(Variant!(int, float)));
-    static assert(is(Variant!int));
-}
-
-@nogc nothrow pure @safe unittest
-{
-    static struct WithDestructorAndCopy
-    {
-        this(this) @nogc nothrow pure @safe
-        {
-        }
-
-        ~this() @nogc nothrow pure @safe
-        {
-        }
-    }
-    static assert(is(Variant!WithDestructorAndCopy));
-}
-
-// Equality compares the underlying objects
-@nogc nothrow pure @safe unittest
-{
-    Variant!(int, double) variant1 = 5;
-    Variant!(int, double) variant2 = 5;
-    assert(variant1 == variant2);
-}
-
-@nogc nothrow pure @safe unittest
-{
-    Variant!(int, double) variant1 = 5;
-    Variant!(int, double) variant2 = 6;
-    assert(variant1 != variant2);
-}
-
-// Differently typed variants aren't equal
-@nogc nothrow pure @safe unittest
-{
-    Variant!(int, double) variant1 = 5;
-    Variant!(int, double) variant2 = 5.0;
-    assert(variant1 != variant2);
-}
-
-// Uninitialized variants are equal
-@nogc nothrow pure @safe unittest
-{
-    Variant!(int, double) variant1, variant2;
-    assert(variant1 == variant2);
-}
-
-// Calls postblit constructor of the active type
-@nogc nothrow pure @safe unittest
-{
-    static struct S
-    {
-        bool called;
-
-        this(this)
-        {
-            this.called = true;
-        }
-    }
-    Variant!(int, S) variant1 = S();
-    auto variant2 = variant1;
-    assert(variant2.get!S.called);
-}
-
-// Variant.type is null if the Variant doesn't have a value
-@nogc nothrow pure @safe unittest
-{
-    Variant!(int, uint) variant;
-    assert(variant.type is null);
-}
-
-// Variant can contain only distinct types
-@nogc nothrow pure @safe unittest
-{
-    static assert(!is(Variant!(int, int)));
-}
--- a/test/dub.json
+++ b/test/dub.json
@ -0,0 +1,17 @@
+{
+	"name": "test",
+	"description": "Test suite for unittest-blocks",
+	"targetType": "library",
+
+	"dependencies": {
+		"tanya:middle": "*"
+	},
+
+	"sourcePaths": [
+		"."
+	],
+	"importPaths": [
+		"."
+	],
+	"dflags-dmd": ["-dip1000"]
+}
--- a/source/tanya/test/assertion.d
+++ b/source/tanya/test/assertion.d
@ -13,7 +13,7 @@
 * The functions can cause segmentation fault if the module is compiled
 * in production mode and the condition fails.
 *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -22,7 +22,7 @@
 */
 module tanya.test.assertion;

-import tanya.memory;
+import tanya.memory.allocator;
 import tanya.meta.trait;

 /**
--- a/source/tanya/test/package.d
+++ b/source/tanya/test/package.d
@ -5,7 +5,7 @@
 /**
 * Test suite for $(D_KEYWORD unittest)-blocks.
 *
- * Copyright: Eugene Wissner 2017-2018.
+ * Copyright: Eugene Wissner 2017-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
--- a/source/tanya/test/stub.d
+++ b/source/tanya/test/stub.d
@ -5,7 +5,7 @@
 /**
 * Range and generic type generators.
 *
- * Copyright: Eugene Wissner 2018.
+ * Copyright: Eugene Wissner 2018-2020.
 * License: $(LINK2 https://www.mozilla.org/en-US/MPL/2.0/,
 *                  Mozilla Public License, v. 2.0).
 * Authors: $(LINK2 mailto:info@caraus.de, Eugene Wissner)
@ -146,7 +146,11 @@ mixin template InputRangeStub(E = int)
    }

    void popFront() @nogc nothrow pure @safe
-    in (!empty)
+    in
+    {
+        assert(!empty);
+    }
+    do
    {
        static if (!infinite)
        {
@ -157,7 +161,11 @@ mixin template InputRangeStub(E = int)
    static if (withLvalueElements)
    {
        ref E front() @nogc nothrow pure @safe
-        in (!empty)
+        in
+        {
+            assert(!empty);
+        }
+        do
        {
            return *this.element;
        }
@ -165,7 +173,11 @@ mixin template InputRangeStub(E = int)
    else
    {
        E front() @nogc nothrow pure @safe
-        in (!empty)
+        in
+        {
+            assert(!empty);
+        }
+        do
        {
            return E.init;
        }
@ -216,7 +228,11 @@ mixin template BidirectionalRangeStub(E = int)
    mixin ForwardRangeStub!E;

    void popBack() @nogc nothrow pure @safe
-    in (!empty)
+    in
+    {
+        assert(!empty);
+    }
+    do
    {
        static if (!infinite)
        {
@ -227,7 +243,11 @@ mixin template BidirectionalRangeStub(E = int)
    static if (withLvalueElements)
    {
        ref E back() @nogc nothrow pure @safe
-        in (!empty)
+        in
+        {
+            assert(!empty);
+        }
+        do
        {
            return *this.element;
        }
@ -235,7 +255,11 @@ mixin template BidirectionalRangeStub(E = int)
    else
    {
        E back() @nogc nothrow pure @safe
-        in (!empty)
+        in
+        {
+            assert(!empty);
+        }
+        do
        {
            return E.init;
        }
--- a/tests/tanya/algorithm/tests/iteration.d
+++ b/tests/tanya/algorithm/tests/iteration.d
@ -0,0 +1,55 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+module tanya.algorithm.tests.iteration;
+
+import tanya.algorithm.iteration;
+import tanya.range;
+import tanya.test.stub;
+
+// Singleton range is bidirectional and random-access
+@nogc nothrow pure @safe unittest
+{
+    static assert(isBidirectionalRange!(typeof(singleton('a'))));
+    static assert(isRandomAccessRange!(typeof(singleton('a'))));
+
+    assert({ char a; return isBidirectionalRange!(typeof(singleton(a))); });
+    assert({ char a; return isRandomAccessRange!(typeof(singleton(a))); });
+}
+
+@nogc nothrow pure @safe unittest
+{
+    char a = 'a';
+    auto single = singleton(a);
+
+    assert(single.front == 'a');
+    assert(single.back == 'a');
+    assert(single[0] == 'a');
+    assert(single.length == 1);
+    assert(!single.empty);
+}
+
+// popFront makes SingletonByRef empty
+@nogc nothrow pure @safe unittest
+{
+    char a = 'a';
+    auto single = singleton(a);
+
+    single.popFront();
+    assert(single.empty);
+    assert(single.length == 0);
+    assert(single.empty);
+}
+
+// popBack makes SingletonByRef empty
+@nogc nothrow pure @safe unittest
+{
+    char a = 'b';
+    auto single = singleton(a);
+
+    single.popBack();
+    assert(single.empty);
+    assert(single.length == 0);
+    assert(single.empty);
+}
--- a/tests/tanya/algorithm/tests/mutation.d
+++ b/tests/tanya/algorithm/tests/mutation.d
@ -0,0 +1,97 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+module tanya.algorithm.tests.mutation;
+
+import tanya.algorithm.mutation;
+import tanya.range;
+import tanya.test.stub;
+
+// Returns advanced target
+@nogc nothrow pure @safe unittest
+{
+    int[5] input = [1, 2, 3, 4, 5];
+    assert(copy(input[3 .. 5], input[]).front == 3);
+}
+
+// Copies overlapping arrays
+@nogc nothrow pure @safe unittest
+{
+    import std.algorithm.comparison : equal;
+
+    int[6] actual = [1, 2, 3, 4, 5, 6];
+    const int[6] expected = [1, 2, 1, 2, 3, 4];
+
+    copy(actual[0 .. 4], actual[2 .. 6]);
+    assert(equal(actual[], expected[]));
+}
+
+@nogc nothrow pure @safe unittest
+{
+    static assert(is(typeof(copy((ubyte[]).init, (ushort[]).init))));
+    static assert(!is(typeof(copy((ushort[]).init, (ubyte[]).init))));
+}
+
+@nogc nothrow pure @safe unittest
+{
+    static struct OutPutRange
+    {
+        int value;
+
+        void opCall(int value) @nogc nothrow pure @safe
+        in
+        {
+            assert(this.value == 0);
+        }
+        do
+        {
+            this.value = value;
+        }
+    }
+    int[1] source = [5];
+    OutPutRange target;
+
+    assert(copy(source[], target).value == 5);
+}
+
+// [] is called where possible
+@nogc nothrow pure @system unittest
+{
+    static struct Slice
+    {
+        bool* slicingCalled;
+
+        int front() @nogc nothrow pure @safe
+        {
+            return 0;
+        }
+
+        void front(int) @nogc nothrow pure @safe
+        {
+        }
+
+        void popFront() @nogc nothrow pure @safe
+        {
+        }
+
+        bool empty() @nogc nothrow pure @safe
+        {
+            return true;
+        }
+
+        void opIndexAssign(int) @nogc nothrow pure @safe
+        {
+            *this.slicingCalled = true;
+        }
+    }
+    bool slicingCalled;
+    auto range = Slice(&slicingCalled);
+    fill(range, 0);
+    assert(slicingCalled);
+}
+
+@nogc nothrow pure @safe unittest
+{
+    NonCopyable[] nonCopyable;
+    initializeAll(nonCopyable);
+}
--- a/tests/tanya/container/tests/array.d
+++ b/tests/tanya/container/tests/array.d
@ -0,0 +1,189 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+module tanya.container.tests.array;
+
+import std.algorithm.comparison;
+import tanya.container.array;
+import tanya.memory.allocator;
+import tanya.test.stub;
+
+// const arrays return usable ranges
+@nogc nothrow pure @safe unittest
+{
+    auto v = const Array!int([1, 2, 4]);
+    auto r1 = v[];
+
+    assert(r1.back == 4);
+    r1.popBack();
+    assert(r1.back == 2);
+    r1.popBack();
+    assert(r1.back == 1);
+    r1.popBack();
+    assert(r1.length == 0);
+
+    static assert(!is(typeof(r1[0] = 5)));
+    static assert(!is(typeof(v[0] = 5)));
+
+    const r2 = r1[];
+    static assert(is(typeof(r2[])));
+}
+
+@nogc nothrow pure @safe unittest
+{
+    Array!int v1;
+    const Array!int v2;
+
+    auto r1 = v1[];
+    auto r2 = v1[];
+
+    assert(r1.length == 0);
+    assert(r2.empty);
+    assert(r1 == r2);
+
+    v1.insertBack([1, 2, 4]);
+    assert(v1[] == v1);
+    assert(v2[] == v2);
+    assert(v2[] != v1);
+    assert(v1[] != v2);
+    assert(v1[].equal(v1[]));
+    assert(v2[].equal(v2[]));
+    assert(!v1[].equal(v2[]));
+}
+
+@nogc nothrow pure @safe unittest
+{
+    struct MutableEqualsStruct
+    {
+        bool opEquals(typeof(this) that) @nogc nothrow pure @safe
+        {
+            return true;
+        }
+    }
+    struct ConstEqualsStruct
+    {
+        bool opEquals(const typeof(this) that) const @nogc nothrow pure @safe
+        {
+            return true;
+        }
+    }
+    auto v1 = Array!ConstEqualsStruct();
+    auto v2 = Array!ConstEqualsStruct();
+    assert(v1 == v2);
+    assert(v1[] == v2);
+    assert(v1 == v2[]);
+    assert(v1[].equal(v2[]));
+
+    auto v3 = const Array!ConstEqualsStruct();
+    auto v4 = const Array!ConstEqualsStruct();
+    assert(v3 == v4);
+    assert(v3[] == v4);
+    assert(v3 == v4[]);
+    assert(v3[].equal(v4[]));
+
+    auto v7 = Array!MutableEqualsStruct(1, MutableEqualsStruct());
+    auto v8 = Array!MutableEqualsStruct(1, MutableEqualsStruct());
+    assert(v7 == v8);
+    assert(v7[] == v8);
+    assert(v7 == v8[]);
+    assert(v7[].equal(v8[]));
+}
+
+// Destructor can destroy empty arrays
+@nogc nothrow pure @safe unittest
+{
+    auto v = Array!WithDtor();
+}
+
+@nogc nothrow pure @safe unittest
+{
+    class A
+    {
+    }
+    A a1, a2;
+    auto v1 = Array!A([a1, a2]);
+
+    static assert(is(Array!(A*)));
+}
+
+@nogc nothrow pure @safe unittest
+{
+    auto v = Array!int([5, 15, 8]);
+    {
+        size_t i;
+
+        foreach (e; v)
+        {
+            assert(i != 0 || e == 5);
+            assert(i != 1 || e == 15);
+            assert(i != 2 || e == 8);
+            ++i;
+        }
+        assert(i == 3);
+    }
+    {
+        size_t i = 3;
+
+        foreach_reverse (e; v)
+        {
+            --i;
+            assert(i != 2 || e == 8);
+            assert(i != 1 || e == 15);
+            assert(i != 0 || e == 5);
+        }
+        assert(i == 0);
+    }
+}
+
+// const constructor tests
+@nogc nothrow pure @system unittest
+{
+    auto v1 = const Array!int([1, 2, 3]);
+    auto v2 = Array!int(v1);
+    assert(v1.get !is v2.get);
+    assert(v1 == v2);
+
+    auto v3 = const Array!int(Array!int([1, 2, 3]));
+    assert(v1 == v3);
+    assert(v3.length == 3);
+    assert(v3.capacity == 3);
+}
+
+@nogc nothrow pure @safe unittest
+{
+    auto v1 = Array!int(defaultAllocator);
+}
+
+@nogc nothrow pure @safe unittest
+{
+    Array!int v;
+    auto r = v[];
+    assert(r.length == 0);
+    assert(r.empty);
+}
+
+@nogc nothrow pure @safe unittest
+{
+    auto v1 = const Array!int([5, 15, 8]);
+    Array!int v2;
+    v2 = v1[0 .. 2];
+    assert(equal(v1[0 .. 2], v2[]));
+}
+
+// Move assignment
+@nogc nothrow pure @safe unittest
+{
+    Array!int v1;
+    v1 = Array!int([5, 15, 8]);
+}
+
+// Postblit is safe
+@nogc nothrow pure @safe unittest
+{
+    auto array = Array!int(3);
+    void func(Array!int arg)
+    {
+        assert(arg.capacity == 3);
+    }
+    func(array);
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Eugen Wissner	4acf163b42	Combine dependencies and dependencies-linux Platform dependencies aren't supported according to the dub documentation, that states: "this setting does not support platform suffixes". dub test with dub 1.34.0 produces a warning: "dependencies-linux: Key is not a valid member of this section. Did you mean: dependencies" Then the build fails because it cannot find modules defined in the dependency.	2023-09-25 18:35:33 +02:00
Eugen Wissner	e1fd528607	Merge remote-tracking branch 'n8sh/DMD_2.105'	2023-09-23 17:22:27 +02:00
Eugen Wissner	1c57368f43	Merge remote-tracking branch 'n8sh/windows-iface-mmappool'	2023-09-23 16:16:33 +02:00
Nathan Sashihara	1c5e18b92e	Add Windows support to tanya.memory.mmappool	2023-09-22 16:08:24 -04:00
Nathan Sashihara	07b388eecb	Update tanya.net.iface to work on Windows Needed because `0fcc83d00e` removed tanya.sys.windows.ifdef and tanya.sys.windows.iphlpapi.	2023-09-22 16:07:59 -04:00
Nathan Sashihara	20ae6465d6	Update to compile with DMD 2.105 https://dlang.org/changelog/2.105.0.html#dmd.enum-function > enum on a function declaration had no effect other than being > equivalent to the auto storage class when no return type was present. > That syntax could be confused with enum manifest constants and is now > an error... Instead, remove enum and use auto where necessary	2023-09-22 15:43:36 -04:00
Eugen Wissner	728eaf88fb	Remove traits depending on deprecated complex test Test.	2023-03-25 15:55:57 +01:00
Eugen Wissner	90797a48be	Replace tuples with custom types	2022-06-07 08:40:18 +02:00
Eugen Wissner	5453c646f6	Replace Variant with SumType	2022-06-06 09:46:45 +02:00
Eugen Wissner	7dd4c44140	Remove math function wrappers	2022-06-01 12:55:03 +02:00
Eugen Wissner	81b4fb88f5	Remove bitmanip available in Phobos	2022-05-31 09:48:37 +02:00
Eugen Wissner	db607f7602	Remove unmaintained and unfinished async code	2022-05-30 05:50:55 +02:00
Eugen Wissner	cfcb1e727a	Fix foldr scope	2022-05-30 05:43:08 +02:00
Eugen Wissner	c7bfbe0657	Update the documentation link	2021-12-27 10:57:05 +01:00
Eugen Wissner	0155039071	Replace rotate with bringToFront	2021-06-04 09:37:50 +02:00
Eugen Wissner	c15a8993ec	Use sockets with new IP Address structs	2021-05-29 09:50:47 +02:00
Eugen Wissner	be8fcb3e1c	Add Endpoint	2021-05-28 09:43:40 +02:00
Eugen Wissner	d9fda61fe1	Pass tests with GDC 10.3	2021-05-27 08:14:12 +02:00
Eugen Wissner	4f48544297	Allow building with GDC 10.3	2021-05-26 10:29:55 +02:00
Eugen Wissner	938a1bb5b4	Replace short preconditions in the main package	2021-05-25 09:03:00 +02:00
Eugen Wissner	b62cbb0647	Use std searching and iteration	2021-05-16 07:52:46 +02:00
Eugen Wissner	2c21dc3429	Replace the ascii module with std.ascii	2021-05-15 13:31:47 +02:00
Eugen Wissner	f0d8c616bb	Replace outdated import in the documentation	2021-04-15 09:38:59 +02:00
Eugen Wissner	60b0562311	Update CI information	2021-03-30 08:33:45 +02:00
Eugen Wissner	92284c8541	Replace Option with Nullable	2021-03-27 10:28:49 +01:00
Eugen Wissner	0fcc83d00e	Remove the sys package	2021-03-12 08:48:35 +01:00
Eugen Wissner	f27f62b80a	Fix InputRanges for non-copyable elements	2021-03-11 10:18:02 +01:00
Eugen Wissner	a227b58407	Remove deprecated functionality	2020-05-06 07:08:14 +02:00
Eugen Wissner	3ce5e8153c	Update copyrights	2020-05-05 07:46:10 +02:00
Eugen Wissner	c68b8d1bdd	Update compiler, remove deprecated modules	2020-05-04 06:03:45 +02:00
Eugen Wissner	048939410c	Deprecate Integer and isPseudoprime()	2019-09-03 09:13:29 +02:00
Eugen Wissner	c69282a8df	Work around 2.086 bugs	2019-08-28 20:50:15 +02:00
Eugen Wissner	0a973b46ba	Add algorithm.iteration.foldr	2019-04-24 06:53:08 +02:00
Eugen Wissner	73535568b7	Merge pull request #87 from n8sh/getAndPopFrontSafety Ensure getAndPopFront/getAndPopBack don't promote `system` to `safe`	2019-04-22 10:50:58 +02:00
Nathan Sashihara	b2a1a849f8	Ensure getAndPopFront/getAndPopBack don't promote `system` to `safe`	2019-04-19 09:34:30 -04:00
Eugen Wissner	76bda0ac8d	Add getAndPopFront()/getAndPopBack()	2019-04-17 06:27:18 +02:00
Eugen Wissner	f214f3baa2	Add algorithm.iteration.foldl	2019-04-16 07:20:52 +02:00
Eugen Wissner	f66935f40d	Build with -dip1000. Fix #85	2019-04-15 07:05:56 +02:00
Eugen Wissner	9814e5ad8e	Pass allocator in all HashTable/Set constructors	2019-04-14 09:07:22 +02:00
Eugen Wissner	e6c6a2d21a	Make Array.get system function .get() returns a memory block that can be changed if the original array is manipulated after getting the slice. So the slice returned by .get() may allow access to invalid memory.	2019-04-05 08:58:22 +02:00
Eugen Wissner	d55eac3bac	Refactor allSatisfy, anySatisfy, staticIndexOf	2019-04-03 18:34:39 +02:00
Eugen Wissner	b55bb767e5	Merge pull request #84 from n8sh/inoutConstIteration In tanya.algorithm.iteration.take & retro preserve const/inout for `empty`/`front`/etc.	2019-03-29 08:36:50 +01:00
Eugen Wissner	2b8471fe34	Add meta.trait.hasFunctionAttributes	2019-03-24 21:59:29 +01:00
Nathan Sashihara	10afe47bae	In tanya.algorithm.iteration.take & retro preserve const/inout for `empty`/`front`/etc.	2019-03-23 23:41:20 -04:00
Eugen Wissner	76f2cd7080	Add DIP25 compatibility. Fix #83	2019-03-23 06:42:50 +01:00
Eugen Wissner	ad46afb10b	Move memory/package.d into memory.allocator	2019-03-22 08:18:01 +01:00
Eugen Wissner	a36b51f0c3	Fix MmapPool private tests; move remaining tests	2019-03-21 14:54:16 +01:00
Eugen Wissner	0fe7308a22	algorithm: import searching publically	2019-03-20 07:30:47 +01:00
Eugen Wissner	20c7e47ff7	net: Add missing public imports, move tests	2019-03-19 08:47:39 +01:00
Eugen Wissner	484cb13317	Separate non-documentation tests from the code	2019-03-19 07:45:52 +01:00
Eugen Wissner	5ab99cf887	Move memory functions into memory.lifecycle - move - moveEmplace - forward - emplace - swap	2019-03-17 10:56:44 +01:00
Eugen Wissner	85d7a2b9ca	Move memory exception into memory.lifecycle	2019-03-16 10:35:28 +01:00
Eugen Wissner	b458c6a380	Make subpackages of os, sys and encoding	2019-03-05 20:47:02 +01:00
Eugen Wissner	5b850d532e	Move meta into a separate subpackage	2019-03-02 08:08:10 +01:00
Eugen Wissner	d7dfa3f6f1	net.ip.Address6.toString() recommended notation Fix #65.	2019-03-01 08:28:36 +01:00
Eugen Wissner	8fd0452cd0	algorithm.iteration: Add singleton() ... iterating over a single value.	2019-02-25 09:27:03 +01:00
Eugen Wissner	df99ea45f2	range.adapter: new arrayInserter	2019-02-24 13:14:30 +01:00
Eugen Wissner	87ba58098e	format.sformat: Support range-based toString()	2019-02-19 06:39:39 +01:00
Eugen Wissner	5a134ce768	net.ip: Implement .toString() with output ranges	2019-02-16 08:37:45 +01:00
Eugen Wissner	0835edce1d	range.adapter: Add container-range adapters. Fix #67	2019-02-16 08:36:50 +01:00
Nathan Sashihara	a786bdbec5	Use word-wise hash instead of FNV-1a for arrays of word-aligned scalars Also special case int-aligned scalars on 64-bit machines. On a 64-bit machine hashing an array of pointers is now ~5.95x faster with LDC2 and ~8.54x faster with DMD, and hashing an array of ints is ~3.34x faster with LDC2 and ~8.12x faster with DMD.	2019-02-12 10:34:18 -05:00
Eugen Wissner	0bef2ef76d	Add sformat() writing to an output range	2019-02-12 07:37:24 +01:00
Eugen Wissner	1d3d750adb	Update dmd to 2.084.1	2019-02-11 22:14:59 +01:00
Eugen Wissner	0c8f1eb4ce	Deprecate InputRange source for OutputRanges An output range for E won't be automatically an output range for [E] anymore. The same, an output range for [E] won't be automatically an output range for E. Automatic E <-> [E] conversion seems to be a nice feature at first glance, but it causes much ambiguity. 1) If I want that my output range accepts only UTF-8 strings but not single characters (because it could be only part of a code point and look like broken UTF-8 without the remaining code units), I can't do it because an OutputRange(R, E) can't distinguish between char and string. 2) Here is an example from 2013: import std.range; import std.stdio; Appender!(const(char)[][]) app; put(app, "aasdf"); put(app, 'b'); writeln(app.data); This outputs: ["aasdf", "\0"]. Whether it is a common case or not, such code just shouldn't compile.	2019-02-06 07:26:28 +01:00
Eugen Wissner	bf197a6554	Deprecate put() as an OutputRange primitive	2019-02-04 10:49:12 +01:00