Sort imports

source/tanya/meta/metafunction.d

@@ -19,6 +19,7 @@
 module tanya.meta.metafunction;
 
 import tanya.meta.trait;
+import tanya.meta.transform;
 
 /**
  * Finds the minimum value in $(D_PARAM Args) according to $(D_PARAM pred).
@@ -707,38 +708,6 @@ pure nothrow @safe @nogc unittest
     static assert(is(Instance2 == float));
 }
 
-version (TanyaPhobos)
-{
-    public import std.meta : Alias,
-                             AliasSeq,
-                             aliasSeqOf,
-                             Erase,
-                             EraseAll,
-                             Filter,
-                             NoDuplicates,
-                             DerivedToFront,
-                             MostDerived,
-                             Repeat,
-                             Replace,
-                             ReplaceAll,
-                             Reverse,
-                             Map = staticMap,
-                             Sort = staticSort,
-                             allSatisfy,
-                             anySatisfy,
-                             staticIndexOf,
-                             templateAnd,
-                             templateNot,
-                             templateOr,
-                             isSorted = staticIsSorted,
-                             ApplyLeft,
-                             ApplyRight;
-}
-else:
-
-import tanya.meta.trait;
-import tanya.meta.transform;
-
 /**
  * Creates an alias for $(D_PARAM T).
  *

source/tanya/meta/trait.d

@@ -360,70 +360,6 @@ pure nothrow @safe @nogc unittest
     static assert(hasStaticMember!(S, "member5"));
 }
 
-version (TanyaPhobos)
-{
-    public import std.traits : isFloatingPoint,
-                               isSigned,
-                               isUnsigned,
-                               isIntegral,
-                               isNumeric,
-                               isBoolean,
-                               isSomeChar,
-                               isScalarType,
-                               isBasicType,
-                               isPointer,
-                               isArray,
-                               isStaticArray,
-                               isDynamicArray,
-                               isAssociativeArray,
-                               isBuiltinType,
-                               isAggregateType,
-                               getUDAs,
-                               isNarrowString,
-                               isSomeString,
-                               mostNegative,
-                               Largest,
-                               isCopyable,
-                               isAbstractClass,
-                               isFinalClass,
-                               isAbstractFunction,
-                               isFinalFunction,
-                               isFunctionPointer,
-                               isDelegate,
-                               isFunction,
-                               isSomeFunction,
-                               isCallable,
-                               hasMember,
-                               isMutable,
-                               isNested,
-                               isNestedFunction,
-                               mangledName,
-                               isInstanceOf,
-                               isImplicitlyConvertible,
-                               BaseTypeTuple,
-                               TransitiveBaseTypeTuple,
-                               BaseClassesTuple,
-                               InterfacesTuple,
-                               isAssignable,
-                               TemplateArgsOf,
-                               Parameters,
-                               ParameterIdentifierTuple,
-                               functionAttributes,
-                               ParameterDefaults,
-                               hasElaborateDestructor,
-                               hasElaborateCopyConstructor,
-                               hasElaborateAssign,
-                               EnumMembers,
-                               classInstanceAlignment,
-                               ifTestable,
-                               FunctionTypeOf,
-                               ReturnType,
-                               TemplateOf,
-                               isTypeTuple,
-                               isExpressions;
-}
-else:
-
 /**
  * Determines whether $(D_PARAM T) is a floating point type.
  *
@@ -1269,10 +1205,20 @@ pure nothrow @safe @nogc unittest
     static assert(!isTypeTuple!(int, 8, Object));
     static assert(!isTypeTuple!(5, 8, 2));
 
-    class C;
-    enum E : bool;
-    union U;
-    struct T();
+    class C
+    {
+    }
+    enum E : bool
+    {
+        t,
+        f,
+    }
+    union U
+    {
+    }
+    struct T()
+    {
+    }
 
     static assert(isTypeTuple!C);
     static assert(isTypeTuple!E);
@@ -2392,7 +2338,7 @@ if (isCallable!F)
 {
     static if (is(FunctionTypeOf!F Params == __parameters))
     {
-        enum string[] Impl()
+        string[] Impl()
         {
             string[] tuple;
 
@@ -2463,7 +2409,7 @@ enum FunctionAttribute : uint
 template functionAttributes(F...)
 if (isCallable!F)
 {
-    enum uint Impl()
+    uint Impl()
     {
         uint attrs = FunctionAttribute.none;
         foreach (a; __traits(getFunctionAttributes, F[0]))

source/tanya/meta/transform.d

@@ -18,28 +18,6 @@
  */
 module tanya.meta.transform;
 
-version (TanyaPhobos)
-{
-    public import std.traits : Unqual,
-                               OriginalType,
-                               CopyConstness,
-                               CopyTypeQualifiers,
-                               Unsigned,
-                               Signed,
-                               PointerTarget,
-                               KeyType,
-                               ValueType,
-                               Promoted,
-                               InoutOf,
-                               ConstOf,
-                               SharedOf,
-                               SharedInoutOf,
-                               SharedConstOf,
-                               ImmutableOf,
-                               QualifierOf;
-}
-else:
-
 import tanya.meta.trait;
 
 /**