From c43b5909031c7aa32ac65df3e392a12d32c45194 Mon Sep 17 00:00:00 2001 From: Iain Buclaw Date: Sun, 2 Jan 2022 13:36:51 +0100 Subject: d: Merge upstream dmd 001bfd97b, druntime 759e6023, phobos 468788323. D front-end changes: - Import latest changes to mainline. - Fix bad format specifiers in front-end errors (PR103840). - Refactoring of some leaf modules to the dmd/root package. - Updating copyright notice dates and urls. Phobos changes: - Import latest changes to mainline. gcc/d/ChangeLog: PR d/103840 * dmd/MERGE: Merge upstream dmd 001bfd97b. * Make-lang.in (D_FRONTEND_OBJS): Rename d/complex.o to d/root-complex.o, and d/utf.o to d/root/utf.o. libphobos/ChangeLog: * libdruntime/MERGE: Merge upstream druntime 759e6023. * src/MERGE: Merge upstream phobos 468788323. --- libphobos/src/std/uni/package.d | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libphobos/src/std/uni') diff --git a/libphobos/src/std/uni/package.d b/libphobos/src/std/uni/package.d index a27cbea..192b6fd 100644 --- a/libphobos/src/std/uni/package.d +++ b/libphobos/src/std/uni/package.d @@ -5798,7 +5798,7 @@ if (is(Char1 : dchar) && is(Char2 : dchar)) // Utilities for compression of Unicode code point sets //============================================================================ -@safe void compressTo(uint val, ref ubyte[] arr) pure nothrow +@safe void compressTo(uint val, ref scope ubyte[] arr) pure nothrow { // not optimized as usually done 1 time (and not public interface) if (val < 128) @@ -5817,7 +5817,7 @@ if (is(Char1 : dchar) && is(Char2 : dchar)) } } -@safe uint decompressFrom(const(ubyte)[] arr, ref size_t idx) pure +@safe uint decompressFrom(scope const(ubyte)[] arr, ref size_t idx) pure { import std.exception : enforce; immutable first = arr[idx++]; @@ -8412,7 +8412,7 @@ int hangulSyllableIndex(dchar ch) pure nothrow @nogc @safe } // internal helper: compose hangul syllables leaving dchar.init in holes -void hangulRecompose(dchar[] seq) pure nothrow @nogc @safe +void hangulRecompose(scope dchar[] seq) pure nothrow @nogc @safe { for (size_t idx = 0; idx + 1 < seq.length; ) { @@ -8695,7 +8695,7 @@ inout(C)[] normalize(NormalizationForm norm=NFC, C)(return scope inout(C)[] inpu } // canonically recompose given slice of code points, works in-place and mutates data -private size_t recompose(size_t start, dchar[] input, ubyte[] ccc) pure nothrow @safe +private size_t recompose(size_t start, scope dchar[] input, scope ubyte[] ccc) pure nothrow @safe { assert(input.length == ccc.length); int accumCC = -1;// so that it's out of 0 .. 255 range -- cgit v1.1