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

* Fix failing rdmd_test introduced by a51571a

* GHA: Test MacOS 13 only

.github/workflows/main.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ macos-latest, ubuntu-latest, windows-latest ]
+        os: [ macos-13, ubuntu-latest, windows-latest ]
         dc: [ dmd-latest, ldc-latest ]
     name: ${{ matrix.os }}, ${{ matrix.dc }}
     runs-on: ${{ matrix.os }}

rdmd_test.d

@@ -140,12 +140,12 @@ void runCompilerAgnosticTests(string rdmdApp, string defaultCompiler, string mod
     /* Test help string output when no arguments passed. */
     auto res = execute([rdmdApp]);
     enforce(res.status == 1, res.output);
-    enforce(res.output.canFind("Usage: rdmd [RDMD AND DMD OPTIONS]... program [PROGRAM OPTIONS]..."));
+    enforce(res.output.canFind("Usage: rdmd [RDMD AND DMD OPTIONS...] program [PROGRAM OPTIONS...]"));
 
     /* Test --help. */
     res = execute([rdmdApp, "--help"]);
     enforce(res.status == 0, res.output);
-    enforce(res.output.canFind("Usage: rdmd [RDMD AND DMD OPTIONS]... program [PROGRAM OPTIONS]..."));
+    enforce(res.output.canFind("Usage: rdmd [RDMD AND DMD OPTIONS...] program [PROGRAM OPTIONS...]"));
 
     string helpText = res.output;