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

Author: ibuclaw

.dscanner.ini

@@ -255,6 +255,7 @@ has_public_example="-etc.c.curl,\
 -std.internal.math.gammafunction,\
 -std.internal.scopebuffer,\
 -std.internal.test.dummyrange,\
+-std.internal.unicode_tables,\
 -std.int128,\
 -std.json,\
 -std.mathspecial,\

.github/workflows/main.yml

@@ -10,7 +10,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  posix:
+  main:
     strategy:
       fail-fast: false
       matrix:
@@ -26,18 +26,27 @@ jobs:
             os: macos-13
           - job_name: macOS 12 x64
             os: macos-12
+          # Windows
+          - job_name: Windows x64
+            os: windows-2022
+          - job_name: Windows x86
+            os: windows-2022
+            model: 32
     name: ${{ matrix.job_name }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 40
     env:
       # for ci/run.sh:
-      OS_NAME: ${{ startsWith(matrix.os, 'ubuntu') && 'linux' || (startsWith(matrix.os, 'macos') && 'osx' || '') }}
+      OS_NAME: ${{ startsWith(matrix.os, 'ubuntu') && 'linux' || (startsWith(matrix.os, 'macos') && 'osx' || (startsWith(matrix.os, 'windows') && 'windows' || '')) }}
       MODEL: ${{ matrix.model || '64' }}
       HOST_DMD: dmd
-      N: ${{ startsWith(matrix.os, 'macos') && '3' || '2' }}
+      N: ${{ startsWith(matrix.os, 'macos') && '3' || '4' }}
       FULL_BUILD: false
       # work around https://issues.dlang.org/show_bug.cgi?id=23517
       MACOSX_DEPLOYMENT_TARGET: '11'
+    defaults:
+      run:
+        shell: bash
     steps:
       - uses: actions/checkout@v4
         with:
@@ -61,16 +70,40 @@ jobs:
           fi
 
           git clone --branch "$REPO_BRANCH" --depth 1 https://github.com/dlang/dmd.git ../dmd
-      - name: Install prerequisites
+
+      - name: 'Posix: Install prerequisites'
+        if: runner.os != 'Windows'
         run: cd ../dmd && ${{ runner.os == 'macOS' && 'ci/cirrusci.sh' || 'sudo -E ci/cirrusci.sh' }}
-      - name: Install host compiler
+      - name: 'Windows: Set up MSVC environment'
+        if: runner.os == 'Windows'
+        uses: seanmiddleditch/gha-setup-vsdevenv@v4
+        with:
+          arch: ${{ env.MODEL == '64' && 'x64' || 'x86' }}
+
+      - name: 'Posix: Install host compiler'
+        if: runner.os != 'Windows'
         run: cd ../dmd && ci/run.sh install_host_compiler
+      - name: 'Windows: Install host compiler'
+        if: runner.os == 'Windows'
+        uses: dlang-community/setup-dlang@v1.3.0
+        with:
+          compiler: ldc-latest
+
       - name: Build
         run: cd ../dmd && ci/run.sh build
+        env:
+          # on Windows, `ci/run.sh build` expects the DMD env var to be set to the DMD-CLI-compatible host compiler
+          DMD: ${{ runner.os == 'Windows' && 'ldmd2' || '' }}
+          # work around the LDC host compiler on Windows assuming the first link.exe in PATH is the MSVC one
+          # (VSINSTALLDIR is set, but GHA uses Git's bin\bash.exe for `shell: bash`, which prepends Git's usr\bin to PATH, with GNU link.exe)
+          LDC_VSDIR_FORCE: ${{ runner.os == 'Windows' && '1' || '' }}
       - name: Test dmd
         run: cd ../dmd && ci/run.sh test_dmd
       - name: Test druntime
         run: cd ../dmd && ci/run.sh test_druntime
+      - name: 'Windows x86: Add 32-bit libcurl.dll to PATH (required for Phobos unittests)'
+        if: runner.os == 'Windows' && env.MODEL == '32'
+        run: echo "$(dirname "$(which $DC)")/../lib32" >> $GITHUB_PATH
       - name: Test phobos
         run: cd ../dmd && ci/run.sh test_phobos
 

.gitignore

@@ -3,6 +3,7 @@
 /phobos.json
 
 generated
+generated-lib
 GNUmakefile
 .DS_Store
 .*.sw*
@@ -18,9 +19,11 @@ obj/
 
 # Rule for VS Code config folder
 .vscode
-
+dub.selections.json
 *.html
 
 .dub/
 libphobos_*
 source/
+
+tools/ucd*

CONTRIBUTING.md

@@ -12,5 +12,5 @@ More Links
 * Use our [Bugzilla bug tracker](https://issues.dlang.org)
 * Follow the [D style](http://dlang.org/dstyle.html)
 * Participate in [our forum](http://forum.dlang.org/)
-* Ask questions on our `#d` IRC channel on freenode.org ([web interface](https://kiwiirc.com/client/irc.freenode.net/d))
+* Ask questions on our `#d` IRC channel on libera.chat ([web interface](https://kiwiirc.com/client/irc.libera.chat/d))
 * Review Phobos additions in the [Review Queue](http://wiki.dlang.org/Review_Queue).

Makefile

@@ -78,6 +78,15 @@ else
     override PIC:=
 endif
 
+# default to compiling the C parts (zlib) with DMD via importC; override with USE_IMPORTC=1/0
+USE_IMPORTC:=1
+
+# FreeBSD 14 can't use importC for zlib thanks to asm in stdlib.h, which dmd can't handle.
+# https://issues.dlang.org/show_bug.cgi?id=24389
+ifeq (freebsd,$(OS))
+	USE_IMPORTC=0
+endif
+
 # Configurable stuff that's rarely edited
 INSTALL_DIR = ../install
 DRUNTIME_PATH = $(DMD_DIR)/druntime
@@ -101,58 +110,50 @@ else
 	DRUNTIME = $(DRUNTIME_PATH)/../generated/$(OS)/$(BUILD)/$(MODEL)/druntime.lib
 endif
 
-# Set CC and DMD
+# Set DMD
 ifeq ($(OS),win32wine)
-	CC = wine dmc.exe
 	DMD = wine dmd.exe
 	RUN = wine
 else
 	DMD = $(DMD_DIR)/generated/$(OS)/$(BUILD)/$(MODEL)/dmd$(DOTEXE)
-	ifeq ($(MODEL),32omf)
-		CC = dmc
-	else ifeq ($(OS),windows)
-		CC = cl.exe
-	else
-		CC = cc
-	endif
 	RUN =
 endif
 
-# Set CFLAGS
-OUTFILEFLAG = -o
-NODEFAULTLIB=-defaultlib= -debuglib=
+# Set NODEFAULTLIB and CPPFLAGS (for the C preprocessor)
+NODEFAULTLIB:=-defaultlib= -debuglib=
+CPPFLAGS:=
 ifeq (,$(findstring win,$(OS)))
-	CFLAGS=$(MODEL_FLAG) -fPIC -std=c11 -DHAVE_UNISTD_H
+	CPPFLAGS := -DHAVE_UNISTD_H
 # Bundled with the system library on OSX, and doesn't work with >= MacOS 11
 	ifneq (osx,$(OS))
 		NODEFAULTLIB += -L-lpthread -L-lm
 	endif
-	ifeq ($(BUILD),debug)
-		CFLAGS += -g
-	else
-		CFLAGS += -O3
-	endif
 else
 	ifeq ($(MODEL),32omf)
-		CFLAGS=-DNO_snprintf
-		ifeq ($(BUILD),debug)
-			CFLAGS += -g
-		else
-			CFLAGS += -O
-		endif
-	else # win64/win32coff
-		OUTFILEFLAG = /Fo
-		CFLAGS += /nologo /Zl /GS-
-		ifeq ($(BUILD),debug)
-			CFLAGS += /Z7
-		else
-			CFLAGS += /O2
-		endif
+		CPPFLAGS := -DNO_snprintf
 	endif
 endif
-ifeq (osx,$(OS))
-	ifeq (64,$(MODEL))
-		CFLAGS+=--target=x86_64-darwin-apple  # ARM cpu is not supported by dmd
+
+# Set CC, CC_OUTFILEFLAG and CFLAGS unless using importC
+ifneq ($(USE_IMPORTC),1)
+	CC := cc
+	CC_OUTFILEFLAG := -o
+
+	ifeq ($(OS),win32wine)
+		CC := wine dmc.exe
+		CFLAGS := $(if $(findstring $(BUILD),debug),-g,-O)
+	else ifeq ($(MODEL),32omf)
+		CC := dmc
+		CFLAGS := $(if $(findstring $(BUILD),debug),-g,-O)
+	else ifeq ($(OS),windows)
+		CC := cl
+		CC_OUTFILEFLAG := /Fo
+		CFLAGS := /nologo /Zl /GS- $(if $(findstring $(BUILD),debug),/Z7,/O2)
+	else # Posix
+		CFLAGS := $(MODEL_FLAG) -fPIC -std=c11 $(if $(findstring $(BUILD),debug),-g,-O3)
+		ifeq (osx64,$(OS)$(MODEL))
+			CFLAGS += --target=x86_64-darwin-apple  # ARM cpu is not supported by dmd
+		endif
 	endif
 endif
 
@@ -299,10 +300,15 @@ ALL_D_FILES = $(addsuffix .d, $(STD_MODULES) $(EXTRA_MODULES_COMMON) \
   $(EXTRA_MODULES_WIN32) $(EXTRA_MODULES_INTERNAL))
 
 # C files to be part of the build
-C_MODULES = $(addprefix etc/c/zlib/, adler32 compress crc32 deflate	\
+C_MODULES := $(addprefix etc/c/zlib/, adler32 compress crc32 deflate	\
 	gzclose gzlib gzread gzwrite infback inffast inflate inftrees trees uncompr zutil)
+C_FILES := $(addsuffix .c, $(C_MODULES))
 
-OBJS = $(addsuffix $(DOTOBJ),$(addprefix $(ROOT)/,$(C_MODULES)))
+ifeq ($(USE_IMPORTC),1)
+    C_OBJS := $(ROOT)/zlib$(DOTOBJ)
+else
+    C_OBJS := $(addprefix $(ROOT)/, $(addsuffix $(DOTOBJ), $(C_MODULES)))
+endif
 
 # build with shared library support (defaults to true on supported platforms)
 SHARED=$(if $(findstring $(OS),linux freebsd),1,)
@@ -348,12 +354,18 @@ endif
 lib: $(LIB)
 dll: $(ROOT)/libphobos2.so
 
+ifeq ($(USE_IMPORTC),1)
+# the druntime dependency makes sure DMD has been built
+$(ROOT)/zlib$(DOTOBJ): $(C_FILES) $(DRUNTIME)
+	$(DMD) -c $(DFLAGS) $(addprefix -P=,$(CPPFLAGS) -Ietc/c/zlib) -of$@ $(C_FILES)
+else
 $(ROOT)/%$(DOTOBJ): %.c
 	@[ -d $(dir $@) ] || mkdir -p $(dir $@) || [ -d $(dir $@) ]
-	$(CC) -c $(CFLAGS) $< $(OUTFILEFLAG)$@
+	$(CC) -c $(CFLAGS) $(CPPFLAGS) $< $(CC_OUTFILEFLAG)$@
+endif
 
-$(LIB): $(OBJS) $(ALL_D_FILES) $(DRUNTIME)
-	$(DMD) $(DFLAGS) -lib -of$@ $(DRUNTIME) $(D_FILES) $(OBJS)
+$(LIB): $(C_OBJS) $(ALL_D_FILES) $(DRUNTIME)
+	$(DMD) $(DFLAGS) -lib -of$@ $(DRUNTIME) $(D_FILES) $(C_OBJS)
 
 $(ROOT)/libphobos2.so: $(ROOT)/$(SONAME)
 	ln -sf $(notdir $(LIBSO)) $@
@@ -362,8 +374,8 @@ $(ROOT)/$(SONAME): $(LIBSO)
 	ln -sf $(notdir $(LIBSO)) $@
 
 $(LIBSO): override PIC:=-fPIC
-$(LIBSO): $(OBJS) $(ALL_D_FILES) $(DRUNTIMESO)
-	$(DMD) $(DFLAGS) -shared $(NODEFAULTLIB) -of$@ -L-soname=$(SONAME) $(DRUNTIMESO) $(LINKDL) $(D_FILES) $(OBJS)
+$(LIBSO): $(C_OBJS) $(ALL_D_FILES) $(DRUNTIMESO)
+	$(DMD) $(DFLAGS) -shared $(NODEFAULTLIB) -of$@ -L-soname=$(SONAME) $(DRUNTIMESO) $(LINKDL) $(D_FILES) $(C_OBJS)
 
 ifeq (osx,$(OS))
 # Build fat library that combines the 32 bit and the 64 bit libraries
@@ -404,8 +416,8 @@ ifneq (1,$(SHARED))
 
 $(UT_D_OBJS): $(DRUNTIME)
 
-$(ROOT)/unittest/test_runner$(DOTEXE): $(DRUNTIME_PATH)/src/test_runner.d $(UT_D_OBJS) $(OBJS) $(DRUNTIME)
-	$(DMD) $(DFLAGS) $(UDFLAGS) -of$@ $(DRUNTIME_PATH)/src/test_runner.d $(UT_D_OBJS) $(OBJS) $(DRUNTIME) $(LINKDL) $(NODEFAULTLIB)
+$(ROOT)/unittest/test_runner$(DOTEXE): $(DRUNTIME_PATH)/src/test_runner.d $(UT_D_OBJS) $(C_OBJS) $(DRUNTIME)
+	$(DMD) $(DFLAGS) $(UDFLAGS) -of$@ $(DRUNTIME_PATH)/src/test_runner.d $(UT_D_OBJS) $(C_OBJS) $(DRUNTIME) $(LINKDL) $(NODEFAULTLIB)
 
 else
 
@@ -414,8 +426,8 @@ UT_LIBSO:=$(ROOT)/unittest/libphobos2-ut.so
 $(UT_D_OBJS): $(DRUNTIMESO)
 
 $(UT_LIBSO): override PIC:=-fPIC
-$(UT_LIBSO): $(UT_D_OBJS) $(OBJS) $(DRUNTIMESO)
-	$(DMD) $(DFLAGS) -shared $(UDFLAGS) -of$@ $(UT_D_OBJS) $(OBJS) $(DRUNTIMESO) $(LINKDL) $(NODEFAULTLIB)
+$(UT_LIBSO): $(UT_D_OBJS) $(C_OBJS) $(DRUNTIMESO)
+	$(DMD) $(DFLAGS) -shared $(UDFLAGS) -of$@ $(UT_D_OBJS) $(C_OBJS) $(DRUNTIMESO) $(LINKDL) $(NODEFAULTLIB)
 
 $(ROOT)/unittest/test_runner$(DOTEXE): $(DRUNTIME_PATH)/src/test_runner.d $(UT_LIBSO)
 	$(DMD) $(DFLAGS) -of$@ $< -L$(UT_LIBSO) $(NODEFAULTLIB)

azure-pipelines.yml

@@ -0,0 +1,24 @@
+`isForwardRange`, `isBidirectionalRange`, and `isRandomAccessRange` now take an optional element type
+
+In Phobos 2.106, an optional second template parameter was added to
+`isInputRange` to enable conveniently checking a range's element type. Now, the
+same parameter has been added to `isForwardRange`, `isBidirectionalRange`, and
+`isRandomAccessRange`.
+
+As before, if a second type argument is passed to one of these templates, the
+range's element type is checked to see if it is
+$(DDSUBLINK spec/const3, implicit_qualifier_conversions, qualifier-convertible)
+to the given type, and this additional check must pass in order for the
+template to evaluate to `true`.
+
+Examples:
+---
+// exact match
+static assert( isForwardRange!(int[], int));
+
+// match with qualifier conversion
+static assert( isBidirectionalRange!(int[], const(int));
+
+// not a match
+static assert(!isRandomAccessRange!(int[], string));
+---