Move dmd.utf to the root library

dub.sdl

@@ -28,7 +28,6 @@ subPackage {
     "src/dmd/identifier.d" \
     "src/dmd/lexer.d" \
     "src/dmd/tokens.d" \
-    "src/dmd/utf.d" \
     "src/dmd/utils.d"
 
   versions \

src/build.d

@@ -1406,10 +1406,10 @@ auto sourceFiles()
             statement.h staticassert.h target.h template.h tokens.h version.h visitor.h
         "),
         lexer: fileArray(env["D"], "
-            console.d entity.d errors.d file_manager.d globals.d id.d identifier.d lexer.d tokens.d utf.d
+            console.d entity.d errors.d file_manager.d globals.d id.d identifier.d lexer.d tokens.d
         ") ~ fileArray(env["ROOT"], "
             array.d bitarray.d ctfloat.d file.d filename.d hash.d port.d region.d rmem.d
-            rootobject.d stringtable.d
+            rootobject.d stringtable.d utf.d
         "),
         common: fileArray(env["COMMON"], "
             file.d outbuffer.d string.d

src/dmd/README.md

@@ -248,7 +248,6 @@ Note: many other utilities are in [dmd/root](https://github.com/dlang/dmd/tree/m
 | File                                                                              | Purpose                                           |
 |-----------------------------------------------------------------------------------|---------------------------------------------------|
 | [console.d](https://github.com/dlang/dmd/blob/master/src/dmd/console.d)           | Print error messages in color                     |
-| [utf.d](https://github.com/dlang/dmd/blob/master/src/dmd/utf.d)                   | Encoding/decoding Unicode text                    |
 | [file_manager.d](https://github.com/dlang/dmd/blob/master/src/dmd/file_manager.d) | Keep file contents in memory                      |
 | [utils.d](https://github.com/dlang/dmd/blob/master/src/dmd/utils.d)               | Utility functions related to files and file paths |
 

src/dmd/constfold.d

@@ -30,10 +30,10 @@ import dmd.root.complex;
 import dmd.root.ctfloat;
 import dmd.root.port;
 import dmd.root.rmem;
+import dmd.root.utf;
 import dmd.sideeffect;
 import dmd.target;
 import dmd.tokens;
-import dmd.utf;
 
 private enum LOG = false;
 

src/dmd/dcast.d

@@ -40,9 +40,9 @@ import dmd.opover;
 import dmd.root.ctfloat;
 import dmd.common.outbuffer;
 import dmd.root.rmem;
+import dmd.root.utf;
 import dmd.tokens;
 import dmd.typesem;
-import dmd.utf;
 import dmd.visitor;
 
 enum LOG = false;

src/dmd/dinterpret.d

@@ -46,9 +46,9 @@ import dmd.root.array;
 import dmd.root.ctfloat;
 import dmd.root.region;
 import dmd.root.rootobject;
+import dmd.root.utf;
 import dmd.statement;
 import dmd.tokens;
-import dmd.utf;
 import dmd.visitor;
 
 /*************************************

src/dmd/dmangle.d

@@ -143,9 +143,9 @@ import dmd.common.outbuffer;
 import dmd.root.aav;
 import dmd.root.string;
 import dmd.root.stringtable;
+import dmd.root.utf;
 import dmd.target;
 import dmd.tokens;
-import dmd.utf;
 import dmd.visitor;
 
 private immutable char[TMAX] mangleChar =

src/dmd/doc.d

@@ -49,8 +49,8 @@ import dmd.common.outbuffer;
 import dmd.root.port;
 import dmd.root.rmem;
 import dmd.root.string;
+import dmd.root.utf;
 import dmd.tokens;
-import dmd.utf;
 import dmd.utils;
 import dmd.visitor;
 

src/dmd/dsymbolsem.d

@@ -60,13 +60,13 @@ import dmd.root.filename;
 import dmd.common.outbuffer;
 import dmd.root.rmem;
 import dmd.root.rootobject;
+import dmd.root.utf;
 import dmd.semantic2;
 import dmd.semantic3;
 import dmd.sideeffect;
 import dmd.statementsem;
 import dmd.staticassert;
 import dmd.tokens;
-import dmd.utf;
 import dmd.utils;
 import dmd.statement;
 import dmd.target;

src/dmd/errors.d

@@ -405,7 +405,7 @@ private void verrorPrint(const ref Loc loc, Color headerColor, const(char)* head
                     size_t c = 0;
                     while (c < loc.charnum - 1)
                     {
-                        import dmd.utf : utf_decodeChar;
+                        import dmd.root.utf : utf_decodeChar;
                         dchar u;
                         const msg = utf_decodeChar(line, c, u);
                         assert(msg is null, msg);

src/dmd/expression.d

@@ -64,12 +64,12 @@ import dmd.root.optional;
 import dmd.root.rmem;
 import dmd.root.rootobject;
 import dmd.root.string;
+import dmd.root.utf;
 import dmd.safe;
 import dmd.sideeffect;
 import dmd.target;
 import dmd.tokens;
 import dmd.typesem;
-import dmd.utf;
 import dmd.visitor;
 
 enum LOGSEMANTIC = false;

src/dmd/expressionsem.d

@@ -67,6 +67,7 @@ import dmd.root.filename;
 import dmd.common.outbuffer;
 import dmd.root.rootobject;
 import dmd.root.string;
+import dmd.root.utf;
 import dmd.semantic2;
 import dmd.semantic3;
 import dmd.sideeffect;
@@ -76,7 +77,6 @@ import dmd.tokens;
 import dmd.traits;
 import dmd.typesem;
 import dmd.typinf;
-import dmd.utf;
 import dmd.utils;
 import dmd.visitor;
 

src/dmd/identifier.d

@@ -20,8 +20,8 @@ import dmd.common.outbuffer;
 import dmd.root.rootobject;
 import dmd.root.string;
 import dmd.root.stringtable;
+import dmd.root.utf;
 import dmd.tokens;
-import dmd.utf;
 
 
 /***********************************************************

src/dmd/lexer.d

@@ -32,8 +32,8 @@ import dmd.common.outbuffer;
 import dmd.root.port;
 import dmd.root.rmem;
 import dmd.root.string;
+import dmd.root.utf;
 import dmd.tokens;
-import dmd.utf;
 import dmd.utils;
 
 nothrow:

src/dmd/root/README.md

@@ -22,3 +22,4 @@
 | [string.d](https://github.com/dlang/dmd/blob/master/src/dmd/root/string.d)           | Various string related functions                                                           |
 | [stringtable.d](https://github.com/dlang/dmd/blob/master/src/dmd/root/stringtable.d) | Specialized associative array with string keys stored in a variable length structure       |
 | [strtold.d](https://github.com/dlang/dmd/blob/master/src/dmd/root/strtold.d)         | D implementation of the standard C function `strtold` (String to long double)              |
+| [utf.d](https://github.com/dlang/dmd/blob/master/src/dmd/root/utf.d)                 | Encoding/decoding Unicode text                                                             |

src/dmd/root/utf.d

@@ -4,12 +4,12 @@
  * Copyright:   Copyright (C) 1999-2021 by The D Language Foundation, All Rights Reserved
  * Authors:     $(LINK2 https://www.digitalmars.com, Walter Bright)
  * License:     $(LINK2 https://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
- * Source:      $(LINK2 https://github.com/dlang/dmd/blob/master/src/dmd/utf.d, _utf.d)
- * Documentation:  https://dlang.org/phobos/dmd_utf.html
- * Coverage:    https://codecov.io/gh/dlang/dmd/src/master/src/dmd/utf.d
+ * Source:      $(LINK2 https://github.com/dlang/dmd/blob/master/src/dmd/root/utf.d, _utf.d)
+ * Documentation:  https://dlang.org/phobos/dmd_root_utf.html
+ * Coverage:    https://codecov.io/gh/dlang/dmd/src/master/src/dmd/root/utf.d
  */
 
-module dmd.utf;
+module dmd.root.utf;
 
 nothrow pure @nogc:
 

src/dmd/semantic2.d

@@ -56,11 +56,11 @@ import dmd.root.filename;
 import dmd.common.outbuffer;
 import dmd.root.rmem;
 import dmd.root.rootobject;
+import dmd.root.utf;
 import dmd.sideeffect;
 import dmd.statementsem;
 import dmd.staticassert;
 import dmd.tokens;
-import dmd.utf;
 import dmd.statement;
 import dmd.target;
 import dmd.templateparamsem;

src/dmd/semantic3.d

@@ -58,11 +58,11 @@ import dmd.root.filename;
 import dmd.common.outbuffer;
 import dmd.root.rmem;
 import dmd.root.rootobject;
+import dmd.root.utf;
 import dmd.sideeffect;
 import dmd.statementsem;
 import dmd.staticassert;
 import dmd.tokens;
-import dmd.utf;
 import dmd.semantic2;
 import dmd.statement;
 import dmd.target;

src/dmd/tokens.d

@@ -21,7 +21,7 @@ import dmd.identifier;
 import dmd.root.ctfloat;
 import dmd.common.outbuffer;
 import dmd.root.rmem;
-import dmd.utf;
+import dmd.root.utf;
 
 enum TOK : ubyte
 {