minimise std.traits usage

dlang-community · Oct 24, 2018 · 1ee1ca2 · 1ee1ca2
1 parent 1977c09
commit 1ee1ca2
Show file tree

Hide file tree

Showing 18 changed files with 167 additions and 183 deletions.
diff --git a/dub.selections.json b/dub.selections.json
@@ -0,0 +1,6 @@
+{
+	"fileVersion": 1,
+	"versions": {
+		"mir-core": "0.0.0"
+	}
+}
diff --git a/source/stdx/allocator/building_blocks/affix_allocator.d b/source/stdx/allocator/building_blocks/affix_allocator.d
@@ -26,7 +26,6 @@ struct AffixAllocator(Allocator, Prefix, Suffix = void)
         roundUpToMultipleOf, alignedAt, alignDownTo, roundUpToMultipleOf,
         hasStaticallyKnownAlignment;
     import stdx.allocator.internal : isPowerOf2;
-    import std.traits : hasMember;
     import stdx.allocator.internal : Ternary;
 
     static if (hasStaticallyKnownAlignment!Allocator)
@@ -162,7 +161,7 @@ struct AffixAllocator(Allocator, Prefix, Suffix = void)
             return result[stateSize!Prefix .. stateSize!Prefix + bytes];
         }
 
-        static if (hasMember!(Allocator, "allocateAll"))
+        static if (__traits(hasMember, Allocator, "allocateAll"))
         void[] allocateAll()
         {
             auto result = parent.allocateAll();
@@ -191,14 +190,14 @@ struct AffixAllocator(Allocator, Prefix, Suffix = void)
             return result;
         }
 
-        static if (hasMember!(Allocator, "owns"))
+        static if (__traits(hasMember, Allocator, "owns"))
         Ternary owns(void[] b)
         {
             if (b is null) return Ternary.no;
             return parent.owns(actualAllocation(b));
         }
 
-        static if (hasMember!(Allocator, "resolveInternalPointer"))
+        static if (__traits(hasMember, Allocator, "resolveInternalPointer"))
         Ternary resolveInternalPointer(const void* p, ref void[] result)
         {
             void[] p1;
@@ -212,7 +211,7 @@ struct AffixAllocator(Allocator, Prefix, Suffix = void)
             return Ternary.yes;
         }
 
-        static if (!stateSize!Suffix && hasMember!(Allocator, "expand"))
+        static if (!stateSize!Suffix && __traits(hasMember, Allocator, "expand"))
         bool expand(ref void[] b, size_t delta)
         {
             if (!b.ptr) return delta == 0;
@@ -223,7 +222,7 @@ struct AffixAllocator(Allocator, Prefix, Suffix = void)
             return true;
         }
 
-        static if (hasMember!(Allocator, "reallocate"))
+        static if (__traits(hasMember, Allocator, "reallocate"))
         bool reallocate(ref void[] b, size_t s)
         {
             if (b is null)
@@ -238,7 +237,7 @@ struct AffixAllocator(Allocator, Prefix, Suffix = void)
             return true;
         }
 
-        static if (hasMember!(Allocator, "deallocate"))
+        static if (__traits(hasMember, Allocator, "deallocate"))
         bool deallocate(void[] b)
         {
             if (!b.ptr) return true;

diff --git a/source/stdx/allocator/building_blocks/allocator_list.d b/source/stdx/allocator/building_blocks/allocator_list.d
@@ -67,7 +67,6 @@ struct AllocatorList(Factory, BookkeepingAllocator = GCAllocator)
     import stdx.allocator.internal : emplace;
     import stdx.allocator.building_blocks.stats_collector
         : StatsCollector, Options;
-    import std.traits : hasMember;
     import stdx.allocator.internal : Ternary;
 
     private enum ouroboros = is(BookkeepingAllocator == NullAllocator);
@@ -142,8 +141,8 @@ struct AllocatorList(Factory, BookkeepingAllocator = GCAllocator)
         factory = plant;
     }
 
-    static if (hasMember!(Allocator, "deallocateAll")
-        && hasMember!(Allocator, "owns"))
+    static if (__traits(hasMember, Allocator, "deallocateAll")
+        && __traits(hasMember, Allocator, "owns"))
     ~this()
     {
         deallocateAll;
@@ -236,8 +235,8 @@ struct AllocatorList(Factory, BookkeepingAllocator = GCAllocator)
         // Free the olden buffer
         static if (ouroboros)
         {
-            static if (hasMember!(Allocator, "deallocate")
-                    && hasMember!(Allocator, "owns"))
+            static if (__traits(hasMember, Allocator, "deallocate")
+                    && __traits(hasMember, Allocator, "owns"))
                 deallocate(toFree);
         }
         else
@@ -250,8 +249,8 @@ struct AllocatorList(Factory, BookkeepingAllocator = GCAllocator)
     private Node* addAllocator(size_t atLeastBytes)
     {
         void[] t = allocators;
-        static if (hasMember!(Allocator, "expand")
-            && hasMember!(Allocator, "owns"))
+        static if (__traits(hasMember, Allocator, "expand")
+            && __traits(hasMember, Allocator, "owns"))
         {
             immutable bool expanded = t && this.expand(t, Node.sizeof);
         }
@@ -303,7 +302,7 @@ struct AllocatorList(Factory, BookkeepingAllocator = GCAllocator)
     private Node* addAllocator(size_t atLeastBytes)
     {
         void[] t = allocators;
-        static if (hasMember!(BookkeepingAllocator, "expand"))
+        static if (__traits(hasMember, BookkeepingAllocator, "expand"))
             immutable bool expanded = bkalloc.expand(t, Node.sizeof);
         else
             immutable bool expanded = false;
@@ -348,7 +347,7 @@ struct AllocatorList(Factory, BookkeepingAllocator = GCAllocator)
     `Ternary.unknown` if no allocator returned `Ternary.yes` and at least one
     returned  `Ternary.unknown`.
     */
-    static if (hasMember!(Allocator, "owns"))
+    static if (__traits(hasMember, Allocator, "owns"))
     Ternary owns(void[] b)
     {
         auto result = Ternary.no;
@@ -377,8 +376,8 @@ struct AllocatorList(Factory, BookkeepingAllocator = GCAllocator)
     and calls $(D expand) for it. The owner is not brought to the head of the
     list.
     */
-    static if (hasMember!(Allocator, "expand")
-        && hasMember!(Allocator, "owns"))
+    static if (__traits(hasMember, Allocator, "expand")
+        && __traits(hasMember, Allocator, "owns"))
     bool expand(ref void[] b, size_t delta)
     {
         if (!b.ptr) return delta == 0;
@@ -394,7 +393,7 @@ struct AllocatorList(Factory, BookkeepingAllocator = GCAllocator)
     $(D b) and calls $(D reallocate) for it. If that fails, calls the global
     $(D reallocate), which allocates a new block and moves memory.
     */
-    static if (hasMember!(Allocator, "reallocate"))
+    static if (__traits(hasMember, Allocator, "reallocate"))
     bool reallocate(ref void[] b, size_t s)
     {
         // First attempt to reallocate within the existing node
@@ -414,8 +413,8 @@ struct AllocatorList(Factory, BookkeepingAllocator = GCAllocator)
     /**
      Defined if $(D Allocator.deallocate) and $(D Allocator.owns) are defined.
     */
-    static if (hasMember!(Allocator, "deallocate")
-        && hasMember!(Allocator, "owns"))
+    static if (__traits(hasMember, Allocator, "deallocate")
+        && __traits(hasMember, Allocator, "owns"))
     bool deallocate(void[] b)
     {
         if (!b.ptr) return true;
@@ -457,8 +456,8 @@ struct AllocatorList(Factory, BookkeepingAllocator = GCAllocator)
     Defined only if $(D Allocator.owns) and $(D Allocator.deallocateAll) are
     defined.
     */
-    static if (ouroboros && hasMember!(Allocator, "deallocateAll")
-        && hasMember!(Allocator, "owns"))
+    static if (ouroboros && __traits(hasMember, Allocator, "deallocateAll")
+        && __traits(hasMember, Allocator, "owns"))
     bool deallocateAll()
     {
         Node* special;
@@ -483,8 +482,8 @@ struct AllocatorList(Factory, BookkeepingAllocator = GCAllocator)
         return true;
     }
 
-    static if (!ouroboros && hasMember!(Allocator, "deallocateAll")
-        && hasMember!(Allocator, "owns"))
+    static if (!ouroboros && __traits(hasMember, Allocator, "deallocateAll")
+        && __traits(hasMember, Allocator, "owns"))
     bool deallocateAll()
     {
         foreach (ref n; allocators)

diff --git a/source/stdx/allocator/building_blocks/bitmapped_block.d b/source/stdx/allocator/building_blocks/bitmapped_block.d
@@ -45,7 +45,6 @@ block size to the constructor.
 struct BitmappedBlock(size_t theBlockSize, uint theAlignment = platformAlignment,
     ParentAllocator = NullAllocator)
 {
-    import std.traits : hasMember;
     import stdx.allocator.internal : Ternary;
     import std.typecons : tuple, Tuple;
 
@@ -197,7 +196,7 @@ struct BitmappedBlock(size_t theBlockSize, uint theAlignment = platformAlignment
     deallocate), the destructor is defined to deallocate the block held.
     */
     static if (!is(ParentAllocator == NullAllocator)
-        && hasMember!(ParentAllocator, "deallocate"))
+        && __traits(hasMember, ParentAllocator, "deallocate"))
     ~this()
     {
         auto start = _control.rep.ptr, end = cast(ulong*)(_payload.ptr + _payload.length);
@@ -691,10 +690,9 @@ struct BitmappedBlock(size_t theBlockSize, uint theAlignment = platformAlignment
 {
     // Create a block allocator on top of a 10KB stack region.
     import stdx.allocator.building_blocks.region : InSituRegion;
-    import std.traits : hasMember;
     InSituRegion!(10_240, 64) r;
     auto a = BitmappedBlock!(64, 64)(cast(ubyte[])(r.allocateAll()));
-    static assert(hasMember!(InSituRegion!(10_240, 64), "allocateAll"));
+    static assert(__traits(hasMember, InSituRegion!(10_240, 64), "allocateAll"));
     const b = a.allocate(100);
     assert(b.length == 100);
 }

diff --git a/source/stdx/allocator/building_blocks/bucketizer.d b/source/stdx/allocator/building_blocks/bucketizer.d
@@ -18,7 +18,6 @@ for $(D Bucketizer). To handle them separately, $(D Segregator) may be of use.
 struct Bucketizer(Allocator, size_t min, size_t max, size_t step)
 {
     import common = stdx.allocator.common : roundUpToMultipleOf;
-    import std.traits : hasMember;
     import stdx.allocator.internal : Ternary;
 
     static assert((max - (min - 1)) % step == 0,
@@ -72,7 +71,7 @@ struct Bucketizer(Allocator, size_t min, size_t max, size_t step)
     Directs the call to either one of the $(D buckets) allocators. Defined only
     if `Allocator` defines `alignedAllocate`.
     */
-    static if (hasMember!(Allocator, "alignedAllocate"))
+    static if (__traits(hasMember, Allocator, "alignedAllocate"))
     void[] alignedAllocate(size_t bytes, uint a)
     {
         if (!bytes) return null;
@@ -133,7 +132,7 @@ struct Bucketizer(Allocator, size_t min, size_t max, size_t step)
     Similar to `reallocate`, with alignment. Defined only if `Allocator`
     defines `alignedReallocate`.
     */
-    static if (hasMember!(Allocator, "alignedReallocate"))
+    static if (__traits(hasMember, Allocator, "alignedReallocate"))
     bool alignedReallocate(ref void[] b, size_t size, uint a)
     {
         if (size == 0)
@@ -159,7 +158,7 @@ struct Bucketizer(Allocator, size_t min, size_t max, size_t step)
     /**
     Defined only if `Allocator` defines `owns`. Finds the owner of `b` and forwards the call to it.
     */
-    static if (hasMember!(Allocator, "owns"))
+    static if (__traits(hasMember, Allocator, "owns"))
     Ternary owns(void[] b)
     {
         if (!b.ptr) return Ternary.no;
@@ -174,7 +173,7 @@ struct Bucketizer(Allocator, size_t min, size_t max, size_t step)
     /**
     This method is only defined if $(D Allocator) defines $(D deallocate).
     */
-    static if (hasMember!(Allocator, "deallocate"))
+    static if (__traits(hasMember, Allocator, "deallocate"))
     bool deallocate(void[] b)
     {
         if (!b.ptr) return true;
@@ -190,7 +189,7 @@ struct Bucketizer(Allocator, size_t min, size_t max, size_t step)
     deallocateAll), and calls it for each bucket in turn. Returns `true` if all
     allocators could deallocate all.
     */
-    static if (hasMember!(Allocator, "deallocateAll"))
+    static if (__traits(hasMember, Allocator, "deallocateAll"))
     bool deallocateAll()
     {
         bool result = true;
@@ -205,7 +204,7 @@ struct Bucketizer(Allocator, size_t min, size_t max, size_t step)
     This method is only defined if all allocators involved define $(D
     resolveInternalPointer), and tries it for each bucket in turn.
     */
-    static if (hasMember!(Allocator, "resolveInternalPointer"))
+    static if (__traits(hasMember, Allocator, "resolveInternalPointer"))
     Ternary resolveInternalPointer(const void* p, ref void[] result)
     {
         foreach (ref a; buckets)