Backport unicode-org#4615 (C++ header ambiguity fix) to 1.4 (unicode-org#4616)

Author: Manishearth

.github/workflows/build-test.yml

@@ -12,7 +12,7 @@ on:
   push:
     branches: [ main ]
   pull_request:
-    branches: '*'
+    branches: '**'
   workflow_dispatch:
     inputs:
       nightly:
@@ -426,6 +426,10 @@ jobs:
       run: cargo make ci-job-test-c
       env:
         CXX: "g++-11"
+    - name: Test C++ with clang
+      run: cargo make test-cpp
+      env:
+        CXX: "clang++"
 
   # ci-job-test-js
   test-js:

CHANGELOG.md

@@ -8,6 +8,9 @@
    with a lower Canonical Combining Class than the last character of the decomposition. (https://github.com/unicode-org/icu4x/pull/4530)
    - `[email protected]`
 
+ - Fix issue in C++ bindings where `diplomat::result::Ok` and `Err` have ambiguous template deduction errors in their constructors, on Clang. (https://github.com/unicode-org/icu4x/pull/4615)
+   - `[email protected]`
+
 ## icu4x 1.4 (Nov 16, 2023)
 
 - General

Cargo.lock

@@ -233,7 +233,7 @@ icu_benchmark_macros = { path = "tools/benchmark/macros" }
 diplomat = "0.7"
 diplomat-runtime = "0.7"
 diplomat_core = "0.7"
-diplomat-tool = "0.7"
+diplomat-tool = "0.7.1"
 
 # Size optimized builds
 [profile.release-opt-size]

Cargo.toml

@@ -23,7 +23,7 @@ edition.workspace = true
 homepage.workspace = true
 repository.workspace = true
 rust-version.workspace = true
-version.workspace = true
+version = "1.4.1"
 
 [package.metadata.docs.rs]
 all-features = true