Add more local imports

dlang · Mar 13, 2014 · 6f80f6a · 6f80f6a
1 parent 293abdd
commit 6f80f6a
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 3 deletions.
diff --git a/std/algorithm.d b/std/algorithm.d
@@ -3145,6 +3145,8 @@ if (isSomeChar!C)
 
         void getFirst() pure @safe
         {
+            import std.uni : isWhite;
+
             auto r = find!(std.uni.isWhite)(_s);
             _frontLength = _s.length - r.length;
         }

diff --git a/std/bitmanip.d b/std/bitmanip.d
@@ -1579,6 +1579,8 @@ struct BitArray
      */
     @property auto bitsSet()
     {
+        import std.algorithm : filter, map, joiner;
+
         return iota(dim).
                filter!(i => ptr[i]).
                map!(i => BitsSet!size_t(ptr[i], i * bitsPerSizeT)).
@@ -1588,6 +1590,8 @@ struct BitArray
     ///
     unittest
     {
+        import std.algorithm : equal;
+
         BitArray b1;
         b1.init([0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1]);
         assert(b1.bitsSet.equal([4, 5, 6, 7, 12, 13, 14, 15]));
@@ -1602,6 +1606,8 @@ struct BitArray
 
     unittest
     {
+        import std.algorithm : equal;
+
         debug(bitarray) printf("BitArray.bitsSet unittest\n");
         BitArray b;
         enum wordBits = size_t.sizeof * 8;
@@ -3635,6 +3641,8 @@ auto bitsSet(T)(T value)
 ///
 unittest
 {
+    import std.algorithm : equal;
+
     assert(bitsSet(1).equal([0]));
     assert(bitsSet(5).equal([0, 2]));
     assert(bitsSet(-1).equal(iota(32)));
@@ -3643,6 +3651,8 @@ unittest
 
 unittest
 {
+    import std.algorithm : equal;
+
     foreach (T; TypeTuple!(byte, ubyte, short, ushort, int, uint, long, ulong))
     {
         assert(bitsSet(cast(T)0).empty);

diff --git a/std/container.d b/std/container.d
@@ -2939,7 +2939,9 @@ Complexity: $(BIGOH slice.length)
     /// ditto
     void opSliceAssign(T value, size_t i, size_t j)
     {
-        auto slice = _data.refCountedStore.isInitialized ? _data._payload : T[].init;
+        auto slice = _data.refCountedStore.isInitialized ?
+            _data._payload :
+            T[].init;
         slice[i .. j] = value;
     }
 

diff --git a/std/stdio.d b/std/stdio.d
@@ -1716,7 +1716,7 @@ the contents may well have changed).
     unittest
     {
         static import std.file;
-        import std.algorithm : take, equal;
+        import std.algorithm : equal;
 
         //printf("Entering test at line %d\n", __LINE__);
         scope(failure) printf("Failed test at line %d\n", __LINE__);
@@ -1796,6 +1796,8 @@ the contents may well have changed).
 
     unittest
     {
+        import std.algorithm : equal;
+
         version(Win64)
         {
             /* the C function tmpfile doesn't seem to work, even when called from C */ 
@@ -2117,6 +2119,8 @@ $(D Range) that locks the file and allows fast writing to it.
             }
             else static if (c.sizeof == 2)
             {
+                import std.utf : toUTF8;
+
                 if (orientation <= 0)
                 {
                     if (c <= 0x7F)
@@ -2138,6 +2142,8 @@ $(D Range) that locks the file and allows fast writing to it.
             }
             else // 32-bit characters
             {
+                import std.utf : toUTF8;
+
                 if (orientation <= 0)
                 {
                     if (c <= 0x7F)
@@ -2223,6 +2229,8 @@ unittest
 
 unittest
 {
+    static import std.file;
+
     auto deleteme = testFilename();
     scope(exit) std.file.remove(deleteme);
 

diff --git a/std/uni.d b/std/uni.d
@@ -5582,7 +5582,7 @@ Range byCodePoint(Range)(Range range)
 ///
 unittest
 {
-    import std.string : text;
+    import std.conv : text;
 
     string s = "noe\u0308l"; // noël