Merge pull request #2565 from quickfur/std_base64_sort

Don't use built-in .sort in std.base64 and other places
dlang · Sep 28, 2014 · 7ddbd9c · 7ddbd9c
2 parents 4c0e38c + 4a6890f
commit 7ddbd9c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/std/base64.d b/std/base64.d
@@ -1602,7 +1602,7 @@ unittest
             string decode_file = std.file.deleteme ~ "-testingDecoder";
             std.file.write(decode_file, "\nZg==\nZm8=\nZm9v\nZm9vYg==\nZm9vYmE=\nZm9vYmFy");
 
-            auto witness = tv.keys.sort;
+            auto witness = sort(tv.keys);
             auto f = File(decode_file);
             scope(exit)
             {
@@ -1620,7 +1620,7 @@ unittest
 
         { // ForwardRange
             {
-                auto encoder = Base64.encoder(tv.values.sort);
+                auto encoder = Base64.encoder(sort(tv.values));
                 auto witness = ["", "Zg==", "Zm8=", "Zm9v", "Zm9vYg==", "Zm9vYmE=", "Zm9vYmFy"];
                 size_t i;
 
@@ -1634,7 +1634,7 @@ unittest
 
             {
                 auto decoder = Base64.decoder(["", "Zg==", "Zm8=", "Zm9v", "Zm9vYg==", "Zm9vYmE=", "Zm9vYmFy"]);
-                auto witness = tv.values.sort;
+                auto witness = sort(tv.values);
                 size_t i;
 
                 assert(decoder.front == witness[i++]); decoder.popFront();

diff --git a/std/random.d b/std/random.d
@@ -1775,9 +1775,11 @@ unittest
         auto b = a.dup;
         auto gen = RandomGen(unpredictableSeed);
         randomShuffle(a, gen);
-        assert(a.sort == b);
+        sort(a);
+        assert(a == b);
         randomShuffle(a);
-        assert(a.sort == b);
+        sort(a);
+        assert(a == b);
     }
 }
 
@@ -1818,10 +1820,12 @@ unittest
         auto gen = RandomGen(unpredictableSeed);
         partialShuffle(a, 5, gen);
         assert(a[5 .. $] == b[5 .. $]);
-        assert(a[0 .. 5].sort == b[0 .. 5]);
+        sort(a[0 .. 5]);
+        assert(a[0 .. 5] == b[0 .. 5]);
         partialShuffle(a, 6);
         assert(a[6 .. $] == b[6 .. $]);
-        assert(a[0 .. 6].sort == b[0 .. 6]);
+        sort(a[0 .. 6]);
+        assert(a[0 .. 6] == b[0 .. 6]);
     }
 }
 

diff --git a/unittest.d b/unittest.d
@@ -73,8 +73,9 @@ int main(char[][] args)
     uint ranseed = std.random.unpredictableSeed;
     thisTid;
     int[] a;
-    a.reverse;                          // adi
-    a.sort;                             // qsort
+    import std.algorithm : sort, reverse;
+    reverse(a);                         // adi
+    sort(a);                            // qsort
     Clock.currTime();                   // datetime
     Exception e = new ReadException(""); // stream
     din.eof();                           // cstream
@@ -96,7 +97,7 @@ int main(char[][] args)
     x[0] = 3;
     x[1] = 45;
     x[2] = -1;
-    x.sort;
+    sort(x[]);
     assert(x[0] == -1);
     assert(x[1] == 3);
     assert(x[2] == 45);