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

.mailmap

@@ -0,0 +1,6 @@
+Daniel Murphy <yebblies@gmail.com> yebblies <yebblies@gmail.com>
+Hara Kenji <k.hara.pg+dev@gmail.com> k-hara <k.hara.pg@gmail.com>
+Iain Buclaw <ibuclaw@gdcproject.org> ibuclaw <ibuclaw@ubuntu.com>
+Kai Nacke <kai@redstar.de> kai <kai@redstar.de>
+Martin Nowak <code@dawg.eu> dawg <dawg@dawgfoto.de>
+Mathias Lang <mathias.lang@sociomantic.com> Geod24 <pro.mathias.lang@gmail.com>

VERSION

@@ -1 +1 @@
-2.072.2
+2.073.0

changelog/README.md

@@ -0,0 +1,42 @@
+This directory will get copied to dlang.org and cleared when master gets
+merged into stable prior to a new release.
+
+How to add a new changelog entry to the pending changelog?
+==========================================================
+
+Create a new file in the `changelog` folder. It should end with `.dd` and look
+similar to a git commit message. The first line represents the title of the change.
+After an empty line follows the long description:
+
+```
+My fancy title of the new feature
+
+A long description of the new feature in `std.range`.
+It can be followed by an example:
+-------
+import std.range : padLeft, padRight;
+import std.algorithm.comparison : equal;
+
+assert([1, 2, 3, 4, 5].padLeft(0, 7).equal([0, 0, 1, 2, 3, 4, 5]));
+
+assert("Hello World!".padRight('!', 15).equal("Hello World!!!!"));
+-------
+and links to the documentation, e.g. $(REF drop, std, range) or
+$(REF_ALTTEXT a custom name for the function, drop, std, range).
+
+Links to the spec can look like this $(LINK2 $(ROOT_DIR)spec/module.html, this)
+and of course you can link to other $(LINK2 https://forum.dlang.org/, external resources).
+```
+
+The title can't contain links (it's already one).
+For more infos, see the [Ddoc spec](https://dlang.org/spec/ddoc.html).
+
+Preview changes
+---------------
+
+If you have cloned the [tools](https://github.com/dlang/tools) and [dlang.org](https://github.com/dlang/dlang.org) repo),
+you can preview the changelog with:
+
+```
+make -C ../dlang.org -f posix.mak pending_changelog
+```

circle.yml

@@ -13,3 +13,8 @@ test:
     # CodeCov gets confused by lst files which it can't matched
     - rm -rf test/runnable/extra-files
     - bash <(curl -s https://codecov.io/bash)
+
+general:
+  branches:
+    ignore:
+      - dmd-1.x

circleci.sh

@@ -5,6 +5,7 @@ set -uexo pipefail
 HOST_DMD_VER=2.068.2 # same as in dmd/src/posix.mak
 CURL_USER_AGENT="CirleCI $(curl --version | head -n 1)"
 N=2
+CIRCLE_NODE_INDEX=${CIRCLE_NODE_INDEX:-0}
 
 case $CIRCLE_NODE_INDEX in
     0) MODEL=64 ;;
@@ -17,7 +18,7 @@ clone() {
     local path="$2"
     local branch="$3"
     for i in {0..4}; do
-        if git clone --depth=1 --branch "$branch" "$url" "$path"; then
+        if git clone --branch "$branch" "$url" "$path" "${@:4}"; then
             break
         elif [ $i -lt 4 ]; then
             sleep $((1 << $i))
@@ -56,13 +57,24 @@ coverage() {
         local base_branch=$CIRCLE_BRANCH
     fi
 
+    # merge testee PR with base branch (master) before testing
+    if [ -n "${CIRCLE_PR_NUMBER:-}" ]; then
+        local head=$(git rev-parse HEAD)
+        git fetch https://github.com/dlang/dmd.git $base_branch
+        git checkout -f FETCH_HEAD
+        local base=$(git rev-parse HEAD)
+        git config user.name 'CI'
+        git config user.email '<>'
+        git merge -m "Merge $head into $base" $head
+    fi
+
     for proj in druntime phobos; do
         if [ $base_branch != master ] && [ $base_branch != stable ] &&
-               ! curl -fsSLI https://api.github.com/repos/dlang/$proj/branches/$base_branch; then
+            ! git ls-remote --exit-code --heads https://github.com/dlang/$proj.git $base_branch > /dev/null; then
             # use master as fallback for other repos to test feature branches
-            clone https://github.com/dlang/$proj.git ../$proj master
+            clone https://github.com/dlang/$proj.git ../$proj master --depth 1
         else
-            clone https://github.com/dlang/$proj.git ../$proj $base_branch
+            clone https://github.com/dlang/$proj.git ../$proj $base_branch --depth 1
         fi
     done
 

ddmd

@@ -0,0 +1 @@
+src