From 3f17bd7fbc36e5f517ca9f4ddb5d912ae626c5b0 Mon Sep 17 00:00:00 2001 From: Steven Schveighoffer Date: Sun, 25 Aug 2024 12:56:48 -0400 Subject: [PATCH 1/3] Try dip1000 --- dub.sdl | 1 + 1 file changed, 1 insertion(+) diff --git a/dub.sdl b/dub.sdl index b691ab16..447c3d70 100644 --- a/dub.sdl +++ b/dub.sdl @@ -13,6 +13,7 @@ subPackage "./integration-tests" subPackage "./integration-tests-vibe" subPackage "./integration-tests-phobos" subPackage "./testconn" +dflags "-preview=dip1000" configuration "library" { } From 1adca6758e6f9218e998b0ab34d079b147672230 Mon Sep 17 00:00:00 2001 From: Steven Schveighoffer Date: Tue, 27 Aug 2024 22:43:21 -0400 Subject: [PATCH 2/3] Apply diff from forums --- source/mysql/protocol/comms.d | 2 +- source/mysql/protocol/sockets.d | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/mysql/protocol/comms.d b/source/mysql/protocol/comms.d index ec2a3ea2..02389261 100644 --- a/source/mysql/protocol/comms.d +++ b/source/mysql/protocol/comms.d @@ -689,7 +689,7 @@ package(mysql) ubyte[] getPacket(Connection conn) return packet; } -package(mysql) void send(MySQLSocket _socket, const(ubyte)[] packet) +package(mysql) void send(MySQLSocket _socket, scope const(ubyte)[] packet) in { assert(packet.length > 4); // at least 1 byte more than header diff --git a/source/mysql/protocol/sockets.d b/source/mysql/protocol/sockets.d index a582fc93..cbe2a78c 100644 --- a/source/mysql/protocol/sockets.d +++ b/source/mysql/protocol/sockets.d @@ -39,7 +39,7 @@ interface MySQLSocket @safe: void close(); @property bool connected() const; - void read(ubyte[] dst); + void read(scope ubyte[] dst); void write(const scope ubyte[] bytes); void acquire(); @@ -78,7 +78,7 @@ class MySQLSocketPhobos : MySQLSocket return socket.isAlive; } - void read(ubyte[] dst) + void read(scope ubyte[] dst) { // Note: I'm a little uncomfortable with this line as it doesn't // (and can't) update Connection._open. Not sure what can be done, @@ -138,7 +138,7 @@ version(Have_vibe_core) { return socket.connected; } - void read(ubyte[] dst) + void read(scope ubyte[] dst) { socket.read(dst); } From 179ecf11e6afb0a02f1a604a7a3ce4674c0712d1 Mon Sep 17 00:00:00 2001 From: Steven Schveighoffer Date: Tue, 27 Aug 2024 23:03:37 -0400 Subject: [PATCH 3/3] Remove dub upgrade while it is broken. --- .github/workflows/dub.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dub.yml b/.github/workflows/dub.yml index c089132c..467b2218 100644 --- a/.github/workflows/dub.yml +++ b/.github/workflows/dub.yml @@ -38,8 +38,9 @@ jobs: with: compiler: ${{ matrix.compiler }} - - name: Upgrade dub dependencies - uses: WebFreak001/dub-upgrade@v0.1.1 + # Broken, try without it for now. + # - name: Upgrade dub dependencies + # uses: WebFreak001/dub-upgrade@v0.1.1 - name: Build Library run: dub build --build=release --config=library