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

ibuclaw · Dec 2, 2023 · 4c07d45 · 4c07d45
2 parents 8c39523 + 1c52bd6
commit 4c07d45
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 23 deletions.
diff --git a/changelog/PR8804.dd b/changelog/PR8804.dd
diff --git a/changelog/is_input_range_element.dd b/changelog/is_input_range_element.dd
diff --git a/changelog/unshared.dd b/changelog/unshared.dd
diff --git a/std/uni/package.d b/std/uni/package.d
@@ -7706,6 +7706,12 @@ public:
         return this.tupleof == other.tupleof;
     }
 
+    // Define a default toHash to allow AA usage
+    size_t toHash() const @trusted
+    {
+        return hashOf(slen_, hashOf(small_));
+    }
+
     /++
         True if this object contains valid extended grapheme cluster.
         Decoding primitives of this module always return a valid `Grapheme`.
@@ -7907,6 +7913,12 @@ static assert(Grapheme.sizeof == size_t.sizeof*4);
     assert(equal(h[], iota(cast(int)'A', cast(int)'Z'+1)));
 }
 
+// ensure Grapheme can be used as an AA key.
+@safe unittest
+{
+    int[Grapheme] aa;
+}
+
 /++
     $(P Does basic case-insensitive comparison of `r1` and `r2`.
     This function uses simpler comparison rule thus achieving better performance