Merge remote-tracking branch 'upstream/master' into stable

Author: MartinNowak

.htaccess

@@ -224,11 +224,12 @@ Redirect 301 /dips/1031 https://github.com/dlang/DIPs/tree/master/DIPs/other/DIP
 Redirect 301 /dips/1032 https://github.com/dlang/DIPs/tree/master/DIPs/other/DIP1032.md
 Redirect 301 /dips/1033 https://github.com/dlang/DIPs/tree/master/DIPs/other/DIP1033.md
 Redirect 301 /dips/1034 https://github.com/dlang/DIPs/tree/master/DIPs/accepted/DIP1034.md
-Redirect 301 /dips/1035 https://github.com/dlang/DIPs/blob/master/DIPs/DIP1035.md
+Redirect 301 /dips/1035 https://github.com/dlang/DIPs/blob/master/DIPs/accepted/DIP1035.md
 Redirect 301 /dips/1036 https://github.com/dlang/DIPs/blob/master/DIPs/other/DIP1036.md
-Redirect 301 /dips/1037 https://github.com/dlang/DIPs/blob/master/DIPs/DIP1037.md
+Redirect 301 /dips/1037 https://github.com/dlang/DIPs/blob/master/DIPs/other/DIP1037.md
 Redirect 301 /dips/1038 https://github.com/dlang/DIPs/blob/master/DIPs/accepted/DIP1038.md
 Redirect 301 /dips/1039 https://github.com/dlang/DIPs/blob/master/DIPs/other/DIP1039.md
 Redirect 301 /dips/1040 https://github.com/dlang/DIPs/blob/master/DIPs/DIP1040.md
 Redirect 301 /dips/1041 https://github.com/dlang/DIPs/blob/master/DIPs/other/DIP1041.md
 Redirect 301 /dips/1042 https://github.com/dlang/DIPs/blob/master/DIPs/DIP1042.md
+Redirect 301 /dips/1043 https://github.com/dlang/DIPs/blob/master/DIPs/DIP1043.md

articles/cppcontracts.dd

@@ -21,7 +21,8 @@ $(HEADERNAV_TOC)
 $(H2 $(LNAME2 contract-programming-d, Contract Programming in D))
 
         This is more fully documented in the D
-        <a href="contracts.html">Contract Programming</a> document.
+        $(DDLINK spec/contracts, Contract Programming, Contract Programming)
+        document.
         To sum up, Contract Programming in D has the following characteristics:
 
         $(OL

articles/ctarguments.dd

@@ -146,7 +146,7 @@ string
 void()
 )
 
-        $(P $(B Note:) $(DDSUBLINK version, staticforeach, Static foreach)
+        $(P $(B Note:) $(DDSUBLINK spec/version, staticforeach, Static foreach)
         should be preferred in new code.)
 
 $(H2 $(LNAME2 auto-expansion, Auto-expansion))

book/build.d

@@ -6,7 +6,8 @@ import std.file;
 import std.stdio;
 import std.exception;
 import std.path;
-void compileToPath(string compileThis, string outputPath, bool loud = false)
+
+void compileToPath(string compileThis, string outputPath, string extraFiles, bool loud = false)
 {
     import std.compiler;
     import core.stdc.stdlib;
@@ -27,7 +28,8 @@ void compileToPath(string compileThis, string outputPath, bool loud = false)
         macroOut.writefln!"%s = %s"(key, value);
     }
     macroOut.flush();
-    const compileString = format!"dmd -D  contextMacros.ddoc macros.ddoc html.ddoc dlang.org.ddoc doc.ddoc aliBook.ddoc %s -Df%s "(compileThis, outputPath);
+
+    const compileString = format!"dmd -D contextMacros.ddoc macros.ddoc html.ddoc dlang.org.ddoc doc.ddoc aliBook.ddoc %s  %s -Df%s "(extraFiles, compileThis, outputPath);
     if(loud)
         writefln!"%s:%s |> %s"(compileThis, outputPath, compileString);
     const res = executeShell(compileString);
@@ -52,11 +54,15 @@ int main(string[] args)
     if(outDir.exists) {
         executeShell("rm -rf " ~ outDir);
     }
+
+    const diffable = environment.get("DIFFABLE", "0") == "1";
+    const noTimestamp = diffable ? "../nodatetime.ddoc" : "";
+
     dirEntries("d.en", "*.d", SpanMode.shallow)
         .map!(dFile => tuple(dFile.name, buildPath(outDir, baseName(dFile).setExtension("html"))))
         //.parallel(jobs)
-        .each!(elem => compileToPath(elem.tupleof));
+        .each!(elem => compileToPath(elem.tupleof, noTimestamp));
     dirEntries("d.en", "*.png", SpanMode.shallow)
         .each!(p => copy(p, buildPath(outDir, baseName(p).setExtension("png"))));
     return 0;
-}
+}

changelog/2.098.0.dd

@@ -37,7 +37,7 @@ $(LI $(RELATIVE_LINK2 improve_posix_imports,Improve POSIX imports))
 
 $(BUGSTITLE_TEXT_HEADER Library changes,
 
-$(LI $(RELATIVE_LINK2 add_isValidCharacter,New function `isValidCharacter` in `std.utf`))
+$(LI $(RELATIVE_LINK2 add_isValidCharacter,New function `isValidCodepoint` in `std.utf`))
 
 )
 
@@ -1067,19 +1067,19 @@ The `O_CLOEXEC` symbol was added to `core/sys/posix/fcntl.d`.
 
 $(BUGSTITLE_TEXT_BODY Library changes,
 
-$(LI $(LNAME2 add_isValidCharacter,New function `isValidCharacter` in `std.utf`)
+$(LI $(LNAME2 add_isValidCharacter,New function `isValidCodepoint` in `std.utf`)
 $(CHANGELOG_SOURCE_FILE phobos, changelog/add_isValidCharacter.dd)
 $(P
-A new function `isValidCharacter` has been added to `std.utf`. It can
+A new function `isValidCodepoint` has been added to `std.utf`. It can
 be used to check if a single character forms a valid code point. For
 example the `char` `0x80` is not a valid code point, because it can
 only be used in trailing characters of UTF8 sequences, whereas the
 wchar `ä` is a valid character:
 )
 
 ```
-assert(!isValidCharacter(cast(char) 0x80));
-assert(isValidCharacter('ä'));
+assert(!isValidCodepoint(cast(char) 0x80));
+assert(isValidCodepoint('ä'));
 ```
 )
 

css/style.css

@@ -894,6 +894,11 @@ h4
 {
     font-size: 1.15em;
 }
+
+h5
+{
+    font-size: 1em;
+}
 /*This is to support the "Programming in D" book*/
 h6 {
     font-size: 1em;

d-keyring.gpg

@@ -1,6 +1,6 @@
 #!/usr/bin/env dub
 /++ dub.sdl:
-dependency "libdparse" version="0.15.1"
+dependency "libdparse" version="0.19.0"
 name "assert_writeln_magic"
 +/
 /*
@@ -178,7 +178,7 @@ private:
     Out fl;
 }
 
-void parseString(Visitor)(ubyte[] sourceCode, Visitor visitor)
+void parseString(Visitor)(const string filepath, ubyte[] sourceCode, Visitor visitor)
 {
     import dparse.lexer;
     import dparse.parser : parseModule, ParserConfig;
@@ -189,28 +189,28 @@ void parseString(Visitor)(ubyte[] sourceCode, Visitor visitor)
     const(Token)[] tokens = getTokensForParser(sourceCode, config, &cache).array;
 
     RollbackAllocator rba;
-    auto m = parseModule(ParserConfig(tokens, "magic.d", &rba));
+    auto m = parseModule(ParserConfig(tokens, filepath, &rba));
     visitor.visit(m);
 }
 
-private auto assertWritelnModuleImpl(string fileText)
+private auto assertWritelnModuleImpl(const string filepath, string fileText)
 {
     import std.string : representation;
     auto fl = FileLines(fileText);
     scope visitor = new TestVisitor!(typeof(fl))(fl);
     // libdparse doesn't allow to work on immutable source code
-    parseString(cast(ubyte[]) fileText.representation, visitor);
+    parseString(filepath, cast(ubyte[]) fileText.representation, visitor);
     return fl;
 }
 
-auto assertWritelnModule(string fileText)
+auto assertWritelnModule(const string filepath, string fileText)
 {
-    return assertWritelnModuleImpl(fileText).buildLines;
+    return assertWritelnModuleImpl(filepath, fileText).buildLines;
 }
-auto assertWritelnBlock(string fileText)
+auto assertWritelnBlock(const string filepath, string fileText)
 {
     auto source = "unittest{\n" ~ fileText ~ "}\n";
-    auto fl = assertWritelnModuleImpl(source);
+    auto fl = assertWritelnModuleImpl(filepath, source);
     auto app = appender!string;
     foreach (line; fl.lines[1 .. $ - 2])
     {
@@ -275,7 +275,7 @@ version(unittest)
         import std.string : representation;
         auto mock = FileLinesMock(sourceCode.split("\n"));
         scope visitor = new TestVisitor!(typeof(mock))(mock);
-        parseString(sourceCode.representation.dup, visitor);
+        parseString("unittest.d", sourceCode.representation.dup, visitor);
         return mock;
     }
 }

d-keyring.gpg.sig

@@ -66,7 +66,7 @@ All unknown options are passed to the compiler.
 
     // Phobos index.d should have been named index.dd
     if (inputFile.endsWith(".d") && !inputFile.endsWith("index.d"))
-        text = assertWritelnModule(text);
+        text = assertWritelnModule(inputFile, text);
 
     string[string] macros;
     macros["SRC_FILENAME"] = "%s\n".format(inputFile.buildNormalizedPath);
@@ -114,10 +114,13 @@ auto compile(R)(R buffer, string[] arguments, string inputFile, string[string] m
     auto ret = execute(args);
     if (ret.status != 0)
     {
-        stderr.writeln("File content:");
-        stderr.writeln(buffer);
-        stderr.writeln("----------------------------------------");
-        stderr.writeln(ret.output);
+        stderr.writeln(
+            "\n------------- File content -------------\n",
+            buffer,
+            "\n------------ Compiler output -----------\n",
+            ret.output,
+            "\n----------------------------------------\n",
+        );
     }
     return ret.status;
 }