From 4a6890fc408b6f083fff398f6e2b05fc6b8fa267 Mon Sep 17 00:00:00 2001
From: "H. S. Teoh" <hsteoh@quickfur.ath.cx>
Date: Sun, 28 Sep 2014 07:59:40 -0700
Subject: [PATCH] Preemptive fix of other places where .sort is used

---
 std/random.d | 12 ++++++++----
 unittest.d   |  7 ++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/std/random.d b/std/random.d
index ac4f4cd9d..a442f1e92 100644
--- 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
index 4e2e8abfa..826b58589 100644
--- 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);