Auto-convert to D2

sociomantic-tsunami · Dec 24, 2018 · d0d970d · d0d970d
1 parent 010bd27
commit d0d970d
Show file tree

Hide file tree

Showing 343 changed files with 2,686 additions and 2,686 deletions.
diff --git a/integrationtest/flexiblefilequeue/main.d b/integrationtest/flexiblefilequeue/main.d
@@ -25,7 +25,7 @@ public void main ()
     auto test_dir = DirectorySandbox.create(["flexiblefilequeue"]);
     scope (exit) test_dir.remove();
 
-    const istring test_file = "testfile";
+    static immutable istring test_file = "testfile";
 
 
     static void pushItems (FlexibleFileQueue queue, size_t size)

diff --git a/integrationtest/httpserver/main.d b/integrationtest/httpserver/main.d
@@ -35,7 +35,7 @@ import core.stdc.errno;
 import core.stdc.stdlib;
 
 /// The payload of the HTTP response.
-const response_payload = "Hello World!";
+static immutable response_payload = "Hello World!";
 
 /// The server address, initialised in `main` and used by both the server and
 /// the client.
@@ -47,7 +47,7 @@ class TestHttpHandler: TaskHttpConnectionHandler
 {
     import ocean.io.Stdout;
 
-    public this ( FinalizeDg finalizer )
+    public this ( scope FinalizeDg finalizer )
     {
         super(finalizer, HttpMethod.Get);
     }
@@ -171,7 +171,7 @@ static class ResponseParser
     char[] response;
     /// The token that denotes the end of the HTTP header and the beginning of
     /// the payload.
-    const end_of_header_token = "\r\n\r\n";
+    static immutable end_of_header_token = "\r\n\r\n";
     /// true if `end_of_header_token` has been fond in `response`.
     bool have_payload;
     /// The index in `response` after `end_of_header_token`.

diff --git a/integrationtest/selectlistener/UnixServer.d b/integrationtest/selectlistener/UnixServer.d
@@ -99,7 +99,7 @@ private class UnixConnectionHandler: IFiberConnectionHandler
 
     ***************************************************************************/
 
-    public this ( FinalizeDg finalize_dg, EpollSelectDispatcher epoll )
+    public this ( scope FinalizeDg finalize_dg, EpollSelectDispatcher epoll )
     {
         super(epoll, new UnixSocket, finalize_dg);
 

diff --git a/integrationtest/signalfd/main.d b/integrationtest/signalfd/main.d
@@ -67,7 +67,7 @@ private class SignalFDTest
 
     ***************************************************************************/
 
-    private const max_signal = 32;
+    private static immutable max_signal = 32;
 
 
     /***************************************************************************
@@ -431,7 +431,7 @@ private class SignalFDTest
         while (ret == -1 && errno == EINTR);
         enforce (ret == 0);
 
-        const int timeout_ms = 100; // just in case
+        static immutable int timeout_ms = 100; // just in case
         epoll_event_t[1] fired_events;
         auto epoll_res = epoll.wait(fired_events, timeout_ms);
 

diff --git a/integrationtest/unixsocket/main.d b/integrationtest/unixsocket/main.d
@@ -41,9 +41,9 @@ import core.thread;
 
 import ocean.text.util.StringC;
 
-const istring CLIENT_STRING = "Hello from the client";
+static immutable istring CLIENT_STRING = "Hello from the client";
 
-const istring SERVER_STRING = "Hello from the server";
+static immutable istring SERVER_STRING = "Hello from the server";
 
 int runClient ( sockaddr_un* socket_address )
 {

diff --git a/src/ocean/LibFeatures.d b/src/ocean/LibFeatures.d
@@ -17,26 +17,26 @@
 
 module ocean.LibFeatures;
 
-const has_features_4_2  = true;
-const has_features_4_1  = true;
-const has_features_4_0  = true;
-const has_features_3_9  = true;
-const has_features_3_8  = true;
-const has_features_3_7  = true;
-const has_features_3_6  = true;
-const has_features_3_5  = true;
-const has_features_3_4  = true;
-const has_features_3_3  = true;
-const has_features_3_2  = true;
-const has_features_3_1  = true;
-const has_features_3_0  = true;
-const has_features_2_10 = true;
-const has_features_2_9  = true;
-const has_features_2_8  = true;
-const has_features_2_7  = true;
-const has_features_2_6  = true;
-const has_features_2_5  = true;
-const has_features_2_4  = true;
-const has_features_2_3  = true;
-const has_features_2_1  = true;
-const has_features_2_0  = true;
+static immutable has_features_4_2  = true;
+static immutable has_features_4_1  = true;
+static immutable has_features_4_0  = true;
+static immutable has_features_3_9  = true;
+static immutable has_features_3_8  = true;
+static immutable has_features_3_7  = true;
+static immutable has_features_3_6  = true;
+static immutable has_features_3_5  = true;
+static immutable has_features_3_4  = true;
+static immutable has_features_3_3  = true;
+static immutable has_features_3_2  = true;
+static immutable has_features_3_1  = true;
+static immutable has_features_3_0  = true;
+static immutable has_features_2_10 = true;
+static immutable has_features_2_9  = true;
+static immutable has_features_2_8  = true;
+static immutable has_features_2_7  = true;
+static immutable has_features_2_6  = true;
+static immutable has_features_2_5  = true;
+static immutable has_features_2_4  = true;
+static immutable has_features_2_3  = true;
+static immutable has_features_2_1  = true;
+static immutable has_features_2_0  = true;
diff --git a/src/ocean/core/Array.d b/src/ocean/core/Array.d
@@ -128,8 +128,8 @@ unittest
     test(concat_test(dest, staticstr1, staticstr2), "Static array concatenation test failed");
 
     // Check manifest constant array concatenation
-    const conststr1 = "hi ";
-    const conststr2 = "there";
+    static immutable conststr1 = "hi ";
+    static immutable conststr2 = "there";
     test(concat_test(dest, conststr1, conststr2), "Const array concatenation test failed");
 }