diff --git a/compatibility-suite/Cargo.toml b/compatibility-suite/Cargo.toml
index d9efbefe..0728b186 100644
--- a/compatibility-suite/Cargo.toml
+++ b/compatibility-suite/Cargo.toml
@@ -13,7 +13,7 @@ futures = "0.3.29"
 itertools = "0.12.1"
 lazy_static = "1.4.0"
 maplit = "1.0.2"
-pact_models = { version = "~1.2.4" }
+pact_models = { version = "~1.2.5" }
 pact_matching = { version = "1.2.6", path = "../rust/pact_matching" }
 pact_mock_server = { version = "1.2.9" }
 pact_verifier = { version = "1.2.4", path = "../rust/pact_verifier" }
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index 2268f1b0..36fb57db 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -63,9 +63,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.17"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -78,9 +78,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
@@ -112,27 +112,27 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.91"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8"
+checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
 
 [[package]]
 name = "arbitrary"
-version = "1.3.2"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
+checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
 dependencies = [
  "derive_arbitrary",
 ]
 
 [[package]]
 name = "ariadne"
-version = "0.3.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72fe02fc62033df9ba41cba57ee19acf5e742511a140c7dbc3a873e19a19a1bd"
+checksum = "31beedec3ce83ae6da3a79592b3d8d7afd146a5b15bb9bb940279aced60faa89"
 dependencies = [
- "unicode-width",
- "yansi 0.5.1",
+ "unicode-width 0.1.14",
+ "yansi",
 ]
 
 [[package]]
@@ -167,7 +167,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2 1.0.89",
  "quote 1.0.37",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -178,7 +178,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2 1.0.89",
  "quote 1.0.37",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -212,7 +212,7 @@ checksum = "edf3ee19dbc0a46d740f6f0926bde8c50f02bdbc7b536842da28f6ac56513a8b"
 dependencies = [
  "proc-macro2 1.0.89",
  "quote 1.0.37",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -360,9 +360,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.31"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
+checksum = "1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8"
 dependencies = [
  "jobserver",
  "libc",
@@ -386,6 +386,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "chrono"
 version = "0.4.38"
@@ -403,31 +409,31 @@ dependencies = [
 
 [[package]]
 name = "chrono-tz"
-version = "0.8.6"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e"
+checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb"
 dependencies = [
  "chrono",
- "chrono-tz-build 0.2.1",
+ "chrono-tz-build 0.3.0",
  "phf",
 ]
 
 [[package]]
 name = "chrono-tz"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb"
+checksum = "cd6dd8046d00723a59a2f8c5f295c515b9bb9a331ee4f8f3d4dd49e428acd3b6"
 dependencies = [
  "chrono",
- "chrono-tz-build 0.3.0",
+ "chrono-tz-build 0.4.0",
  "phf",
 ]
 
 [[package]]
 name = "chrono-tz-build"
-version = "0.2.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f"
+checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1"
 dependencies = [
  "parse-zoneinfo",
  "phf",
@@ -436,12 +442,11 @@ dependencies = [
 
 [[package]]
 name = "chrono-tz-build"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1"
+checksum = "e94fea34d77a245229e7746bd2beb786cd2a896f306ff491fb8cecb3074b10a7"
 dependencies = [
  "parse-zoneinfo",
- "phf",
  "phf_codegen",
 ]
 
@@ -466,7 +471,7 @@ dependencies = [
  "bitflags 1.3.2",
  "strsim 0.8.0",
  "textwrap",
- "unicode-width",
+ "unicode-width 0.1.14",
  "vec_map",
 ]
 
@@ -512,7 +517,7 @@ dependencies = [
  "encode_unicode",
  "lazy_static",
  "libc",
- "unicode-width",
+ "unicode-width 0.1.14",
  "windows-sys 0.52.0",
 ]
 
@@ -549,9 +554,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
+checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6"
 dependencies = [
  "libc",
 ]
@@ -636,7 +641,7 @@ dependencies = [
  "proc-macro2 1.0.89",
  "quote 1.0.37",
  "strsim 0.11.1",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -647,7 +652,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote 1.0.37",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -679,13 +684,13 @@ dependencies = [
 
 [[package]]
 name = "derive_arbitrary"
-version = "1.3.2"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
+checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
 dependencies = [
  "proc-macro2 1.0.89",
  "quote 1.0.37",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -719,7 +724,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2 1.0.89",
  "quote 1.0.37",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -809,9 +814,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"
 
 [[package]]
 name = "filetime"
@@ -922,7 +927,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2 1.0.89",
  "quote 1.0.37",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1022,7 +1027,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "171deab504ad43a9ea80324a3686a0cbe9436220d9d0b48ae4d7f7bd303b48a9"
 dependencies = [
  "quote 1.0.37",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -1090,9 +1095,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.15.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
 
 [[package]]
 name = "hashers"
@@ -1304,7 +1309,7 @@ dependencies = [
  "hyper 1.5.0",
  "hyper-util",
  "log",
- "rustls 0.23.15",
+ "rustls 0.23.16",
  "rustls-native-certs 0.8.0",
  "rustls-pki-types",
  "tokio",
@@ -1315,9 +1320,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-timeout"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793"
+checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0"
 dependencies = [
  "hyper 1.5.0",
  "hyper-util",
@@ -1328,9 +1333,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1368,6 +1373,124 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2 1.0.89",
+ "quote 1.0.37",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -1376,12 +1499,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -1402,7 +1536,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.0",
+ "hashbrown 0.15.1",
  "serde",
 ]
 
@@ -1422,25 +1556,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "477e2e7ec7379407656293ff74902caea786a1dda427ca1f84b923c4fdeb7659"
 dependencies = [
  "either",
- "itertools 0.13.0",
+ "itertools",
  "proc-macro2 1.0.89",
  "quote 1.0.37",
  "strum",
- "syn 2.0.85",
+ "syn 2.0.87",
  "thiserror",
 ]
 
 [[package]]
 name = "indicatif"
-version = "0.17.8"
+version = "0.17.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
+checksum = "cbf675b85ed934d3c67b5c5469701eec7db22689d0a2139d856e0925fa28b281"
 dependencies = [
  "console",
- "instant",
  "number_prefix",
  "portable-atomic",
- "unicode-width",
+ "unicode-width 0.2.0",
+ "web-time",
 ]
 
 [[package]]
@@ -1461,15 +1595,6 @@ dependencies = [
  "generic-array",
 ]
 
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "ipnet"
 version = "2.10.1"
@@ -1482,15 +1607,6 @@ version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.13.0"
@@ -1573,9 +1689,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.161"
+version = "0.2.162"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
+checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
 
 [[package]]
 name = "libredox"
@@ -1594,6 +1710,12 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
+[[package]]
+name = "litemap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -1618,32 +1740,33 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "logos"
-version = "0.13.0"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c000ca4d908ff18ac99b93a062cb8958d331c3220719c52e77cb19cc6ac5d2c1"
+checksum = "1c6b6e02facda28ca5fb8dbe4b152496ba3b1bd5a4b40bb2b1b2d8ad74e0f39b"
 dependencies = [
  "logos-derive",
 ]
 
 [[package]]
 name = "logos-codegen"
-version = "0.13.0"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc487311295e0002e452025d6b580b77bb17286de87b57138f3b5db711cded68"
+checksum = "b32eb6b5f26efacd015b000bfc562186472cd9b34bdba3f6b264e2a052676d10"
 dependencies = [
  "beef",
  "fnv",
+ "lazy_static",
  "proc-macro2 1.0.89",
  "quote 1.0.37",
- "regex-syntax 0.6.29",
- "syn 2.0.85",
+ "regex-syntax 0.8.5",
+ "syn 2.0.87",
 ]
 
 [[package]]
 name = "logos-derive"
-version = "0.13.0"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbfc0d229f1f42d790440136d941afd806bc9e949e2bcb8faa813b0f00d1267e"
+checksum = "3e5d0c5463c911ef55624739fc353238b4e310f0144be1f875dc42fec6bfd5ec"
 dependencies = [
  "logos-codegen",
 ]
@@ -2011,7 +2134,7 @@ dependencies = [
  "futures-util",
  "home",
  "indicatif",
- "itertools 0.13.0",
+ "itertools",
  "lazy_static",
  "log",
  "maplit",
@@ -2048,7 +2171,7 @@ dependencies = [
  "env_logger 0.11.5",
  "expectest",
  "futures",
- "itertools 0.13.0",
+ "itertools",
  "lazy_static",
  "maplit",
  "pact-plugin-driver",
@@ -2071,7 +2194,7 @@ dependencies = [
  "tracing-subscriber",
  "url",
  "uuid",
- "yansi 1.0.1",
+ "yansi",
 ]
 
 [[package]]
@@ -2089,7 +2212,7 @@ dependencies = [
  "expectest",
  "futures",
  "home",
- "itertools 0.13.0",
+ "itertools",
  "lazy_static",
  "libc",
  "log",
@@ -2106,7 +2229,7 @@ dependencies = [
  "pretty_assertions",
  "quickcheck",
  "rand",
- "rand_regex",
+ "rand_regex 0.15.1",
  "regex",
  "regex-syntax 0.6.29",
  "reqwest",
@@ -2143,7 +2266,7 @@ dependencies = [
  "hex",
  "http 1.1.0",
  "infer",
- "itertools 0.13.0",
+ "itertools",
  "lazy_static",
  "lenient_semver",
  "maplit",
@@ -2186,7 +2309,7 @@ dependencies = [
  "hex",
  "http 1.1.0",
  "infer",
- "itertools 0.13.0",
+ "itertools",
  "lazy_static",
  "lenient_semver",
  "maplit",
@@ -2229,7 +2352,7 @@ dependencies = [
  "futures",
  "hyper 0.14.31",
  "hyper-rustls 0.24.2",
- "itertools 0.13.0",
+ "itertools",
  "lazy_static",
  "maplit",
  "pact-plugin-driver",
@@ -2261,14 +2384,14 @@ dependencies = [
  "hyper 1.5.0",
  "hyper-rustls 0.27.3",
  "hyper-util",
- "itertools 0.13.0",
+ "itertools",
  "lazy_static",
  "maplit",
  "pact-plugin-driver",
  "pact_matching 1.2.7",
  "pact_models",
  "rcgen",
- "rustls 0.23.15",
+ "rustls 0.23.16",
  "rustls-pemfile 2.2.0",
  "rustls-webpki 0.102.8",
  "serde",
@@ -2284,14 +2407,14 @@ dependencies = [
 
 [[package]]
 name = "pact_models"
-version = "1.2.5"
+version = "1.2.6"
 dependencies = [
  "anyhow",
  "ariadne",
- "base64 0.21.7",
+ "base64 0.22.1",
  "bytes",
  "chrono",
- "chrono-tz 0.8.6",
+ "chrono-tz 0.10.0",
  "env_logger 0.11.5",
  "expectest",
  "fs2",
@@ -2300,7 +2423,7 @@ dependencies = [
  "hashers",
  "hex",
  "indextree",
- "itertools 0.10.5",
+ "itertools",
  "lazy_static",
  "lenient_semver",
  "logos",
@@ -2311,11 +2434,11 @@ dependencies = [
  "parse-zoneinfo",
  "pretty_assertions",
  "rand",
- "rand_regex",
+ "rand_regex 0.17.0",
  "regex",
- "regex-syntax 0.6.29",
+ "regex-syntax 0.8.5",
  "reqwest",
- "rstest 0.19.0",
+ "rstest 0.23.0",
  "semver",
  "serde",
  "serde_json",
@@ -2345,7 +2468,7 @@ dependencies = [
  "futures",
  "http 1.1.0",
  "humantime",
- "itertools 0.13.0",
+ "itertools",
  "lazy_static",
  "maplit",
  "mime",
@@ -2534,7 +2657,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
  "proc-macro2 1.0.89",
  "quote 1.0.37",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2583,7 +2706,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
 dependencies = [
  "diff",
- "yansi 1.0.1",
+ "yansi",
 ]
 
 [[package]]
@@ -2593,7 +2716,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
 dependencies = [
  "proc-macro2 1.0.89",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2641,7 +2764,7 @@ checksum = "0c1318b19085f08681016926435853bbf7858f9c082d0999b80550ff5d9abe15"
 dependencies = [
  "bytes",
  "heck",
- "itertools 0.13.0",
+ "itertools",
  "log",
  "multimap",
  "once_cell",
@@ -2650,7 +2773,7 @@ dependencies = [
  "prost",
  "prost-types",
  "regex",
- "syn 2.0.85",
+ "syn 2.0.87",
  "tempfile",
 ]
 
@@ -2661,10 +2784,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5"
 dependencies = [
  "anyhow",
- "itertools 0.13.0",
+ "itertools",
  "proc-macro2 1.0.89",
  "quote 1.0.37",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -2707,7 +2830,7 @@ dependencies = [
  "quinn-proto",
  "quinn-udp",
  "rustc-hash",
- "rustls 0.23.15",
+ "rustls 0.23.16",
  "socket2",
  "thiserror",
  "tokio",
@@ -2724,7 +2847,7 @@ dependencies = [
  "rand",
  "ring",
  "rustc-hash",
- "rustls 0.23.15",
+ "rustls 0.23.16",
  "slab",
  "thiserror",
  "tinyvec",
@@ -2733,10 +2856,11 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.5"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b"
+checksum = "7d5a626c6807713b15cac82a6acaccd6043c9a5408c24baae07611fec3f243da"
 dependencies = [
+ "cfg_aliases",
  "libc",
  "once_cell",
  "socket2",
@@ -2802,6 +2926,16 @@ dependencies = [
  "regex-syntax 0.6.29",
 ]
 
+[[package]]
+name = "rand_regex"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bfbd599a8c757f89100e3ae559fb1ef9efa1cfd9276136862e3089dec627b31"
+dependencies = [
+ "rand",
+ "regex-syntax 0.8.5",
+]
+
 [[package]]
 name = "rayon"
 version = "1.10.0"
@@ -2852,7 +2986,7 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.8",
+ "regex-automata 0.4.9",
  "regex-syntax 0.8.5",
 ]
 
@@ -2867,9 +3001,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2896,9 +3030,9 @@ checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
 
 [[package]]
 name = "reqwest"
-version = "0.12.8"
+version = "0.12.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b"
+checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
 dependencies = [
  "async-compression",
  "base64 0.22.1",
@@ -2920,7 +3054,7 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "quinn",
- "rustls 0.23.15",
+ "rustls 0.23.16",
  "rustls-native-certs 0.8.0",
  "rustls-pemfile 2.2.0",
  "rustls-pki-types",
@@ -2955,18 +3089,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "rstest"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5316d2a1479eeef1ea21e7f9ddc67c191d497abc8fc3ba2467857abbb68330"
-dependencies = [
- "futures",
- "futures-timer",
- "rstest_macros 0.19.0",
- "rustc_version",
-]
-
 [[package]]
 name = "rstest"
 version = "0.22.0"
@@ -2991,23 +3113,6 @@ dependencies = [
  "rustc_version",
 ]
 
-[[package]]
-name = "rstest_macros"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04a9df72cc1f67020b0d63ad9bfe4a323e459ea7eb68e03bd9824db49f9a4c25"
-dependencies = [
- "cfg-if",
- "glob",
- "proc-macro2 1.0.89",
- "quote 1.0.37",
- "regex",
- "relative-path",
- "rustc_version",
- "syn 2.0.85",
- "unicode-ident",
-]
-
 [[package]]
 name = "rstest_macros"
 version = "0.22.0"
@@ -3022,7 +3127,7 @@ dependencies = [
  "regex",
  "relative-path",
  "rustc_version",
- "syn 2.0.85",
+ "syn 2.0.87",
  "unicode-ident",
 ]
 
@@ -3040,7 +3145,7 @@ dependencies = [
  "regex",
  "relative-path",
  "rustc_version",
- "syn 2.0.85",
+ "syn 2.0.87",
  "unicode-ident",
 ]
 
@@ -3067,9 +3172,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.37"
+version = "0.38.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+checksum = "99e4ea3e1cdc4b559b8e5650f9c8e5998e3e5c1343b4eaf034565f32318d63c0"
 dependencies = [
  "bitflags 2.6.0",
  "errno",
@@ -3092,9 +3197,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.15"
+version = "0.23.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993"
+checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e"
 dependencies = [
  "log",
  "once_cell",
@@ -3236,9 +3341,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.12.0"
+version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
+checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -3252,22 +3357,22 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.213"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1"
+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.213"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5"
+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
 dependencies = [
  "proc-macro2 1.0.89",
  "quote 1.0.37",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3330,7 +3435,7 @@ dependencies = [
  "darling",
  "proc-macro2 1.0.89",
  "quote 1.0.37",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3424,9 +3529,9 @@ dependencies = [
 
 [[package]]
 name = "snapbox"
-version = "0.6.18"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ba434818a8a9b1b106404288d6bd75a94348aae8fc9a518b211b609a36a54bc"
+checksum = "1373ce406dfad473059bbc31d807715642182bbc952a811952b58d1c9e41dcfa"
 dependencies = [
  "anstream",
  "anstyle",
@@ -3481,6 +3586,12 @@ version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "strip-ansi-escapes"
 version = "0.2.0"
@@ -3521,7 +3632,7 @@ dependencies = [
  "proc-macro2 1.0.89",
  "quote 1.0.37",
  "rustversion",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3564,9 +3675,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.85"
+version = "2.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
 dependencies = [
  "proc-macro2 1.0.89",
  "quote 1.0.37",
@@ -3588,6 +3699,17 @@ dependencies = [
  "futures-core",
 ]
 
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2 1.0.89",
+ "quote 1.0.37",
+ "syn 2.0.87",
+]
+
 [[package]]
 name = "sysinfo"
 version = "0.30.13"
@@ -3605,9 +3727,9 @@ dependencies = [
 
 [[package]]
 name = "tar"
-version = "0.4.42"
+version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020"
+checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6"
 dependencies = [
  "filetime",
  "libc",
@@ -3616,9 +3738,9 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.13.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
+checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
 dependencies = [
  "cfg-if",
  "fastrand",
@@ -3656,7 +3778,7 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5"
 dependencies = [
  "proc-macro2 1.0.89",
  "quote 1.0.37",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3665,27 +3787,27 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
 dependencies = [
- "unicode-width",
+ "unicode-width 0.1.14",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.65"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.65"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2 1.0.89",
  "quote 1.0.37",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3729,6 +3851,16 @@ dependencies = [
  "time-core",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinyvec"
 version = "1.8.0"
@@ -3746,9 +3878,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.41.0"
+version = "1.41.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb"
+checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33"
 dependencies = [
  "backtrace",
  "bytes",
@@ -3770,7 +3902,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2 1.0.89",
  "quote 1.0.37",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3789,7 +3921,7 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
- "rustls 0.23.15",
+ "rustls 0.23.16",
  "rustls-pki-types",
  "tokio",
 ]
@@ -3906,7 +4038,7 @@ dependencies = [
  "prost-build",
  "prost-types",
  "quote 1.0.37",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3975,7 +4107,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2 1.0.89",
  "quote 1.0.37",
- "syn 2.0.85",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -4044,9 +4176,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "trycmd"
-version = "0.15.7"
+version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "288c25d9be00f5ac52a3b3ff7720248c223096534ec34e870188f1bc93f2465c"
+checksum = "656073a28690a4b8dfd578d1df087826cf8fa53c8161dbd90130d092570a21e1"
 dependencies = [
  "anstream",
  "automod",
@@ -4078,12 +4210,6 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"
 
-[[package]]
-name = "unicode-bidi"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.13"
@@ -4091,19 +4217,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
-name = "unicode-normalization"
-version = "0.1.24"
+name = "unicode-width"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
-dependencies = [
- "tinyvec",
-]
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.14"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
 
 [[package]]
 name = "unicode-xid"
@@ -4125,9 +4248,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -4140,6 +4263,18 @@ version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -4249,7 +4384,7 @@ dependencies = [
  "once_cell",
  "proc-macro2 1.0.89",
  "quote 1.0.37",
- "syn 2.0.85",
+ "syn 2.0.87",
  "wasm-bindgen-shared",
 ]
 
@@ -4283,7 +4418,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
  "proc-macro2 1.0.89",
  "quote 1.0.37",
- "syn 2.0.85",
+ "syn 2.0.87",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -4296,9 +4431,9 @@ checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
 
 [[package]]
 name = "wasm-streams"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -4317,6 +4452,16 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "webpki-roots"
 version = "0.26.6"
@@ -4497,6 +4642,18 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "xattr"
 version = "1.3.1"
@@ -4508,12 +4665,6 @@ dependencies = [
  "rustix",
 ]
 
-[[package]]
-name = "yansi"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
-
 [[package]]
 name = "yansi"
 version = "1.0.1"
@@ -4529,6 +4680,30 @@ dependencies = [
  "time",
 ]
 
+[[package]]
+name = "yoke"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
+dependencies = [
+ "proc-macro2 1.0.89",
+ "quote 1.0.37",
+ "syn 2.0.87",
+ "synstructure",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -4547,7 +4722,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2 1.0.89",
  "quote 1.0.37",
- "syn 2.0.85",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
+dependencies = [
+ "proc-macro2 1.0.89",
+ "quote 1.0.37",
+ "syn 2.0.87",
+ "synstructure",
 ]
 
 [[package]]
@@ -4567,7 +4763,29 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2 1.0.89",
  "quote 1.0.37",
- "syn 2.0.85",
+ "syn 2.0.87",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2 1.0.89",
+ "quote 1.0.37",
+ "syn 2.0.87",
 ]
 
 [[package]]
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index e8843e54..73c812fa 100644
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -15,7 +15,7 @@ onig = { git = "https://github.com/rust-onig/rust-onig", default-features = fals
 # version across all crates (i.e. mock server crate).
 pact_matching = { version = "~2.0.0-beta", path = "./pact_matching" }
 # Issue 389 - Pull change into other crates
-pact_models = { version = "~1.2.4", path = "./pact_models" }
+pact_models = { version = "~1.2.5", path = "./pact_models" }
 
 [profile.release]
 strip = true
diff --git a/rust/pact_consumer/Cargo.toml b/rust/pact_consumer/Cargo.toml
index 55b1ca81..cab90aaf 100644
--- a/rust/pact_consumer/Cargo.toml
+++ b/rust/pact_consumer/Cargo.toml
@@ -32,7 +32,7 @@ lazy_static = "1.5.0"
 maplit = "1.0.2"
 pact_matching = { version = "~2.0.0-beta", path = "../pact_matching", default-features = false }
 pact_mock_server = { version = "~2.0.2", default-features = false }
-pact_models = { version = "~1.2.4", default-features = false }
+pact_models = { version = "~1.2.5", default-features = false }
 pact-plugin-driver = { version = "~0.7.1", optional = true, default-features = false }
 regex = "1.10.6"
 serde_json = "1.0.127"
diff --git a/rust/pact_ffi/Cargo.toml b/rust/pact_ffi/Cargo.toml
index 894da29d..9530d03c 100644
--- a/rust/pact_ffi/Cargo.toml
+++ b/rust/pact_ffi/Cargo.toml
@@ -32,7 +32,7 @@ multipart = { version = "0.18.0", default-features = false, features = ["client"
 onig = { version = "6.4.0", default-features = false }
 pact_matching = { version = "~2.0.0-beta", path = "../pact_matching" }
 pact_mock_server = { version = "~1.2.10" }
-pact_models = { version = "~1.2.4" }
+pact_models = { version = "~1.2.5" }
 pact-plugin-driver = { version = "~0.7.1" }
 pact_verifier = { version = "~1.2.4", path = "../pact_verifier" }
 panic-message = "0.3.0"
diff --git a/rust/pact_ffi/src/log/ffi.rs b/rust/pact_ffi/src/log/ffi.rs
index 5f1bb40a..a56e92e4 100644
--- a/rust/pact_ffi/src/log/ffi.rs
+++ b/rust/pact_ffi/src/log/ffi.rs
@@ -215,7 +215,7 @@ pub extern "C" fn pactffi_logger_init() {
 /// - `-1`: Can't set logger (applying the logger failed, perhaps because one is applied already).
 /// - `-2`: No logger has been initialized (call `pactffi_logger_init` before any other log function).
 /// - `-3`: The sink specifier was not UTF-8 encoded.
-/// - `-4`: The sink type specified is not a known type (known types: "stdout", "stderr", or "file /some/path").
+/// - `-4`: The sink type specified is not a known type (known types: "stdout", "stderr", "buffer", or "file /some/path").
 /// - `-5`: No file path was specified in a file-type sink specification.
 /// - `-6`: Opening a sink to the specified file path failed (check permissions).
 ///
@@ -262,6 +262,12 @@ pub unsafe extern "C" fn pactffi_logger_attach_sink(
 ///
 /// This function will install a global tracing subscriber. Any attempts to modify the logger
 /// after the call to `logger_apply` will fail.
+///
+/// # Error Handling
+///
+/// The return error codes are as follows:
+///
+/// - `-1`: Can't set logger (applying the logger failed, perhaps because one is applied already).
 #[no_mangle]
 pub extern "C" fn pactffi_logger_apply() -> c_int {
     let status = match apply_logger() {
diff --git a/rust/pact_ffi/src/mock_server/handles.rs b/rust/pact_ffi/src/mock_server/handles.rs
index 3453b59c..a252ff02 100644
--- a/rust/pact_ffi/src/mock_server/handles.rs
+++ b/rust/pact_ffi/src/mock_server/handles.rs
@@ -2795,11 +2795,14 @@ pub extern fn pactffi_message_given(message: MessageHandle, description: *const
   }
 }
 
-/// Adds a provider state to the Message with a parameter key and value.
+/// Adds a parameter key and value to a provider state to the Message. If the provider state
+/// does not exist, a new one will be created, otherwise the parameter will be merged into the
+/// existing one. The parameter value will be parsed as JSON.
 ///
+/// # Parameters
 /// * `description` - The provider state description. It needs to be unique.
 /// * `name` - Parameter name.
-/// * `value` - Parameter value.
+/// * `value` - Parameter value as JSON.
 #[no_mangle]
 pub extern fn pactffi_message_given_with_param(message: MessageHandle, description: *const c_char,
                                                name: *const c_char, value: *const c_char) {
diff --git a/rust/pact_matching/Cargo.toml b/rust/pact_matching/Cargo.toml
index 2d92336a..182bbc11 100644
--- a/rust/pact_matching/Cargo.toml
+++ b/rust/pact_matching/Cargo.toml
@@ -41,7 +41,7 @@ mime = "0.3.17"
 multer = { version = "3.0.0", features = ["all"], optional = true }
 nom = "7.1.3"
 onig = { version = "6.4.0", default-features = false }
-pact_models = { version = "~1.2.4", default-features = false }
+pact_models = { version = "~1.2.5", default-features = false }
 pact-plugin-driver = { version = "~0.7.1", optional = true, default-features = false }
 rand = "0.8.5"
 reqwest = { version = "0.12.3", default-features = false, features = ["rustls-tls-native-roots", "json"] }
diff --git a/rust/pact_models/CHANGELOG.md b/rust/pact_models/CHANGELOG.md
index dc6dc531..dff5adb9 100644
--- a/rust/pact_models/CHANGELOG.md
+++ b/rust/pact_models/CHANGELOG.md
@@ -1,5 +1,15 @@
 To generate the log, run `git log --pretty='* %h - %s (%an, %ad)' TAGNAME..HEAD .` replacing TAGNAME and HEAD as appropriate.
 
+# 1.2.5 - Maintenance Release
+
+* e485190f - chore(pact-models): Updated dependencies (Ronald Holshausen, Wed Nov 13 10:29:10 2024 +1100)
+* 234cbaf0 - chore(pact-models): Upgraded rand_regex to 0.17.0 (Ronald Holshausen, Wed Nov 13 10:25:55 2024 +1100)
+* 04f5d1ac - chore(pact-models): Updated dependencies (Ronald Holshausen, Wed Nov 13 09:58:06 2024 +1100)
+* 0aaa3fb5 - chore(pact-models): Upgrade ariadne to 0.5.0 (Ronald Holshausen, Wed Nov 13 09:49:21 2024 +1100)
+* c6aff26f - feat: Add join_index to DocPath (Ronald Holshausen, Fri Nov 1 17:03:10 2024 +1100)
+* 9cc38a2f - chore: do not write empty matching rules to the Pact file (Ronald Holshausen, Tue Aug 27 11:23:43 2024 +1000)
+* 60ce3bc6 - bump version to 1.2.5 (Ronald Holshausen, Tue Aug 13 11:45:30 2024 +1000)
+
 # 1.2.4 - Bugfix Release
 
 * 50fc022c - fix(pact_models): Provider state values may be passed in under a "providerState" key (Ronald Holshausen, Thu Aug 8 11:53:23 2024 +1000)
diff --git a/rust/pact_models/Cargo.toml b/rust/pact_models/Cargo.toml
index d9441928..4bded3e3 100644
--- a/rust/pact_models/Cargo.toml
+++ b/rust/pact_models/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pact_models"
-version = "1.2.5"
+version = "1.2.6"
 authors = ["Ronald Holshausen <ronald.holshausen@gmail.com>"]
 edition = "2021"
 description = "Pact-Rust support library that provides the core models for dealing with Pact files"
@@ -20,30 +20,30 @@ datetime = ["dep:chrono", "dep:chrono-tz", "dep:gregorian"] # Support for date/t
 xml = ["dep:sxd-document"] # support for matching XML documents
 
 [dependencies]
-ariadne = "0.3.0"
-anyhow = "1.0.71"
-base64 = "0.21.2"
-bytes = { version = "1.4.0", features = ["serde"] }
-chrono = { version = "0.4.22", features = ["std", "clock"], default-features = false, optional = true }
-chrono-tz = { version = "0.8.0", optional = true }
+ariadne = "0.5.0"
+anyhow = "1.0.93"
+base64 = "0.22.1"
+bytes = { version = "1.8.0", features = ["serde"] }
+chrono = { version = "0.4.38", features = ["std", "clock"], default-features = false, optional = true }
+chrono-tz = { version = "0.10.0", optional = true }
 gregorian = { version = "0.2.4", optional = true }
 hashers = "1.0.1"
 hex = "0.4.3"
-indextree = "4.6.0"
-itertools = "0.10.5"
-lazy_static = "1.4.0"
+indextree = "4.7.3"
+itertools = "0.13.0"
+lazy_static = "1.5.0"
 lenient_semver = "0.4.2"
-logos = "0.13.0"
+logos = "0.14.2"
 maplit = "1.0.2"
 mime = "0.3.17"
 nom = "7.1.3"
 rand = "0.8.5"
-rand_regex = "0.15.1"
-regex = "1.8.4"
-regex-syntax = "0.6.27"
-semver = "1.0.17"
-serde = { version = "1.0.163", features = ["derive"] }
-serde_json = "1.0.96"
+rand_regex = "0.17.0"
+regex = "1.11.1"
+regex-syntax = "0.8.5"
+semver = "1.0.23"
+serde = { version = "1.0.215", features = ["derive"] }
+serde_json = "1.0.132"
 sxd-document = { version = "0.3.2", optional = true }
 tracing = "0.1.40" # This needs to be the same version across all the libs (i.e. Pact FFI and plugin driver)
 
@@ -58,15 +58,15 @@ uuid = { version = "1.3.3", features = ["v4"] }
 
 [dev-dependencies]
 expectest = "0.12.0"
-env_logger = "0.11.3"
+env_logger = "0.11.5"
 hamcrest2 = "0.3.0"
-pretty_assertions = "1.3.0"
-rstest = "0.19.0"
+pretty_assertions = "1.4.1"
+rstest = "0.23.0"
 speculate = "0.1.2"
-test-log = { version = "0.2.11", features = ["trace"] }
+test-log = { version = "0.2.16", features = ["trace"] }
 tracing-subscriber = { version = "0.3.18", features = ["env-filter", "tracing-log", "fmt"] }
 trim-margin = "0.1.0"
 
 [build-dependencies]
-parse-zoneinfo = "0.3.0"
+parse-zoneinfo = "0.3.1"
 maplit = "1.0.2"
diff --git a/rust/pact_models/src/generators/datetime_expressions.rs b/rust/pact_models/src/generators/datetime_expressions.rs
index 8ee48aa6..d22c6aaf 100644
--- a/rust/pact_models/src/generators/datetime_expressions.rs
+++ b/rust/pact_models/src/generators/datetime_expressions.rs
@@ -401,7 +401,7 @@ pub(crate) fn error(exp: &str, expected: &str, span: Option<Span>) -> anyhow::Er
     }
     Some(span) => span
   };
-  let report = Report::build(ReportKind::Error, "expression", span.start)
+  let report = Report::build(ReportKind::Error, ("expression", span.start..span.start))
     .with_config(Config::default().with_color(false))
     .with_message(format!("Expected {}", expected))
     .with_label(Label::new(("expression", span)).with_message(format!("Expected {} here", expected)))
diff --git a/rust/pact_models/src/generators/mod.rs b/rust/pact_models/src/generators/mod.rs
index bd68b191..21bfb0a1 100644
--- a/rust/pact_models/src/generators/mod.rs
+++ b/rust/pact_models/src/generators/mod.rs
@@ -1069,10 +1069,10 @@ impl GenerateValue<Value> for Generator {
       Generator::RandomString(size) => Ok(json!(generate_ascii_string(*size as usize))),
       Generator::Regex(ref regex) => {
         let mut parser = regex_syntax::ParserBuilder::new().unicode(false).build();
-        match parser.parse(regex) {
+        match parser.parse(strip_anchors(regex)) {
           Ok(hir) => {
             match rand_regex::Regex::with_hir(hir, 20) {
-              Ok(gen) => Ok(json!(rand::thread_rng().sample::<String, _>(gen))),
+              Ok(gen) => Ok(json!(thread_rng().sample::<String, _>(gen))),
               Err(err) => {
                 warn!("Failed to generate a value from regular expression - {}", err);
                 Err(anyhow!("Failed to generate a value from regular expression - {}", err))
@@ -1362,7 +1362,6 @@ mod tests {
   use pretty_assertions::assert_eq;
   use test_log::test;
 
-  use crate::contain;
   use crate::generators::Generator::{RandomDecimal, RandomInt, Regex};
 
   use super::*;
@@ -2103,14 +2102,10 @@ mod tests {
     let generator = Generator::Regex(r"^\/api\/families\/[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}$".into());
 
     let generated = generator.generate_value(&"".to_string(), &hashmap!{}, &NoopVariantMatcher.boxed());
-    let err = generated.unwrap_err().to_string();
-    expect!(&err).to(contain("'^\\/api\\/families\\/[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}$' is not a valid regular expression"));
-    expect!(&err).to(contain("error: unrecognized escape sequence"));
+    assert_that!(generated.unwrap(), matches_regex(r"\/api\/families\/[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}"));
 
     let generated = generator.generate_value(&json!(""), &hashmap!{}, &NoopVariantMatcher.boxed());
-    let err = generated.unwrap_err().to_string();
-    expect!(&err).to(contain("'^\\/api\\/families\\/[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}$' is not a valid regular expression"));
-    expect!(&err).to(contain("error: unrecognized escape sequence"));
+    assert_that!(generated.unwrap().as_str().unwrap(), matches_regex(r"\/api\/families\/[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}"));
   }
 
   #[test]
diff --git a/rust/pact_models/src/matchingrules/expressions.rs b/rust/pact_models/src/matchingrules/expressions.rs
index 80f39cc6..c73314bb 100644
--- a/rust/pact_models/src/matchingrules/expressions.rs
+++ b/rust/pact_models/src/matchingrules/expressions.rs
@@ -418,7 +418,7 @@ fn matching_definition_exp(lex: &mut Lexer<MatcherDefinitionToken>, v: &str) ->
     } else {
       let mut buffer = BytesMut::new().writer();
       let span = lex.span();
-      let report = Report::build(ReportKind::Error, "expression", span.start)
+      let report = Report::build(ReportKind::Error, ("expression", span.start..span.start))
         .with_config(Config::default().with_color(false))
         .with_message(format!("Expected a type of matching rule definition, but got '{}'", lex.slice()))
         .with_label(Label::new(("expression", span)).with_message("Expected a matching rule definition here"))
@@ -431,7 +431,7 @@ fn matching_definition_exp(lex: &mut Lexer<MatcherDefinitionToken>, v: &str) ->
   } else {
     let mut buffer = BytesMut::new().writer();
     let span = lex.span();
-    let report = Report::build(ReportKind::Error, "expression", span.start)
+    let report = Report::build(ReportKind::Error, ("expression", span.start..span.start))
       .with_config(Config::default().with_color(false))
       .with_message(format!("Expected a type of matching rule definition but got the end of the expression"))
       .with_label(Label::new(("expression", span)).with_message("Expected a matching rule definition here"))
@@ -467,7 +467,7 @@ fn parse_each_value(lex: &mut Lexer<MatcherDefinitionToken>, v: &str) -> anyhow:
   } else {
     let mut buffer = BytesMut::new().writer();
     let span = lex.span();
-    let report = Report::build(ReportKind::Error, "expression", span.start)
+    let report = Report::build(ReportKind::Error, ("expression", span.start..span.start))
       .with_config(Config::default().with_color(false))
       .with_message(format!("Expected an opening bracket, got '{}'", lex.slice()))
       .with_label(Label::new(("expression", span)).with_message("Expected an opening bracket before this"))
@@ -481,7 +481,7 @@ fn parse_each_value(lex: &mut Lexer<MatcherDefinitionToken>, v: &str) -> anyhow:
 fn error_message(lex: &mut Lexer<MatcherDefinitionToken>, v: &str, error: &str, additional: &str) -> Result<String, Error> {
   let mut buffer = BytesMut::new().writer();
   let span = lex.span();
-  let report = Report::build(ReportKind::Error, "expression", span.start)
+  let report = Report::build(ReportKind::Error, ("expression", span.start..span.start))
     .with_config(Config::default().with_color(false))
     .with_message(format!("{}, got '{}'", error, lex.slice()))
     .with_label(Label::new(("expression", span)).with_message(additional))
@@ -508,7 +508,7 @@ fn parse_each_key(lex: &mut Lexer<MatcherDefinitionToken>, v: &str) -> anyhow::R
     } else {
       let mut buffer = BytesMut::new().writer();
       let span = lex.span();
-      let report = Report::build(ReportKind::Error, "expression", span.start)
+      let report = Report::build(ReportKind::Error, ("expression", span.start..span.start))
         .with_config(Config::default().with_color(false))
         .with_message(format!("Expected a closing bracket, got '{}'", lex.slice()))
         .with_label(Label::new(("expression", span)).with_message("Expected a closing bracket before this"))
@@ -520,7 +520,7 @@ fn parse_each_key(lex: &mut Lexer<MatcherDefinitionToken>, v: &str) -> anyhow::R
   } else {
     let mut buffer = BytesMut::new().writer();
     let span = lex.span();
-    let report = Report::build(ReportKind::Error, "expression", span.start)
+    let report = Report::build(ReportKind::Error, ("expression", span.start..span.start))
       .with_config(Config::default().with_color(false))
       .with_message(format!("Expected an opening bracket, got '{}'", lex.slice()))
       .with_label(Label::new(("expression", span)).with_message("Expected an opening bracket before this"))
@@ -607,7 +607,7 @@ fn parse_matching_rule(lex: &mut logos::Lexer<MatcherDefinitionToken>, v: &str)
       _ => {
         let mut buffer = BytesMut::new().writer();
         let span = lex.span();
-        let report = Report::build(ReportKind::Error, "expression", span.start)
+        let report = Report::build(ReportKind::Error, ("expression", span.start..span.start))
           .with_config(Config::default().with_color(false))
           .with_message(format!("Expected the type of matcher, got '{}'", lex.slice()))
           .with_label(Label::new(("expression", span)).with_message("This is not a valid matcher type"))
@@ -623,7 +623,7 @@ fn parse_matching_rule(lex: &mut logos::Lexer<MatcherDefinitionToken>, v: &str)
   } else {
     let mut buffer = BytesMut::new().writer();
     let span = lex.span();
-    let report = Report::build(ReportKind::Error, "expression", span.start)
+    let report = Report::build(ReportKind::Error, ("expression", span.start..span.start))
       .with_config(Config::default().with_color(false))
       .with_message(format!("Expected the type of matcher, got '{}'", lex.slice()))
       .with_label(Label::new(("expression", span)).with_message("Expected a matcher (equalTo, regex, etc.) here"))
@@ -649,7 +649,7 @@ fn parse_semver(lex: &mut Lexer<MatcherDefinitionToken>, v: &str) -> anyhow::Res
     Err(err) => {
       let mut buffer = BytesMut::new().writer();
       let span = lex.span();
-      let report = Report::build(ReportKind::Error, "expression", span.start)
+      let report = Report::build(ReportKind::Error, ("expression", span.start..span.start))
         .with_config(Config::default().with_color(false))
         .with_message(format!("Expected a semver compatible string, got {} - {}", lex.slice(), err))
         .with_label(Label::new(("expression", span)).with_message("This is not a valid semver value"))
@@ -905,7 +905,7 @@ fn parse_string(lex: &mut Lexer<MatcherDefinitionToken>, v: &str) -> anyhow::Res
   } else {
     let mut buffer = BytesMut::new().writer();
     let span = lex.span();
-    let report = Report::build(ReportKind::Error, "expression", span.start)
+    let report = Report::build(ReportKind::Error, ("expression", span.start..span.start))
       .with_config(Config::default().with_color(false))
       .with_message(format!("Expected a string value, got {}", lex.slice()))
       .with_label(Label::new(("expression", span.clone())).with_message("Expected this to be a string"))
@@ -976,7 +976,7 @@ fn process_raw_string(raw_str: &str, span: Span, v: &str) -> anyhow::Result<Stri
 
 fn string_error(err: &dyn std::error::Error, span: &Span, v: &str) -> anyhow::Result<String> {
   let mut buffer = BytesMut::new().writer();
-  let report = Report::build(ReportKind::Error, "expression", span.start)
+  let report = Report::build(ReportKind::Error, ("expression", span.start..span.start))
     .with_config(Config::default().with_color(false))
     .with_message(format!("Invalid unicode character escape sequence: {}", err))
     .with_label(Label::new(("expression", span.clone())).with_message("This string contains an invalid escape sequence"))
@@ -992,7 +992,7 @@ fn char_or_error(ch: Option<char>, span: &Span, v: &str) -> anyhow::Result<char>
     Some(ch) => Ok(ch),
     None => {
       let mut buffer = BytesMut::new().writer();
-      let report = Report::build(ReportKind::Error, "expression", span.start)
+      let report = Report::build(ReportKind::Error, ("expression", span.start..span.start))
         .with_config(Config::default().with_color(false))
         .with_message("Invalid unicode character escape sequence")
         .with_label(Label::new(("expression", span.clone())).with_message("This string contains an invalid escape sequence"))
@@ -1012,7 +1012,7 @@ fn parse_comma(lex: &mut Lexer<MatcherDefinitionToken>, v: &str) -> anyhow::Resu
   } else {
     let mut buffer = BytesMut::new().writer();
     let span = lex.span();
-    let report = Report::build(ReportKind::Error, "expression", span.start)
+    let report = Report::build(ReportKind::Error, ("expression", span.start..span.start))
       .with_config(Config::default().with_color(false))
       .with_message(format!("Expected a comma, got '{}'", lex.slice()))
       .with_label(Label::new(("expression", span)).with_message("Expected a comma before this"))
@@ -1026,7 +1026,7 @@ fn parse_comma(lex: &mut Lexer<MatcherDefinitionToken>, v: &str) -> anyhow::Resu
 fn end_of_expression(v: &str, expected: &str) -> Error {
   let mut buffer = BytesMut::new().writer();
   let i = v.len();
-  let report = Report::build(ReportKind::Error, "expression", i)
+  let report = Report::build(ReportKind::Error, ("expression", i..i))
     .with_config(Config::default().with_color(false))
     .with_message(format!("Expected {}, got the end of the expression", expected))
     .with_label(Label::new(("expression", i..i)).with_message(format!("Expected {} here", expected)))
diff --git a/rust/pact_models/src/path_exp.rs b/rust/pact_models/src/path_exp.rs
index dc631682..ce40d5e1 100644
--- a/rust/pact_models/src/path_exp.rs
+++ b/rust/pact_models/src/path_exp.rs
@@ -201,6 +201,27 @@ impl DocPath {
     path
   }
 
+  /// Creates a new path by cloning this one and joining the index onto the end. Paths that end
+  /// with `*` will have the `*` replaced with the index.
+  pub fn join_index(&self, index: usize) -> Self {
+    let mut path = self.clone();
+    match self.path_tokens.last() {
+      Some(PathToken::Root) => { path.push_index(index); }
+      Some(PathToken::Field(_)) => { path.push_index(index); }
+      Some(PathToken::Index(_)) => { path.push_index(index); }
+      Some(PathToken::Star) | Some(PathToken::StarIndex) => {
+        if let Some(part) = path.path_tokens.last_mut() {
+          *part = PathToken::Index(index);
+          path.expr = path.build_expr();
+        } else {
+          path.push_index(index);
+        }
+      }
+      None => { path.push_index(index); }
+    }
+    path
+  }
+
   /// Mutates this path by pushing a field value onto the end.
   pub fn push_field(&mut self, field: impl Into<String>) -> &mut Self {
     let field = field.into();
@@ -614,9 +635,8 @@ pub fn parse_path_exp(path: &str) -> Result<Vec<PathToken>, String> {
 
 #[cfg(test)]
 mod tests {
-  use expectest::expect;
   use expectest::prelude::*;
-
+  use rstest::rstest;
   use super::*;
 
   #[test]
@@ -962,4 +982,18 @@ mod tests {
     expect!(something.push(PathToken::Index(101)).as_json_pointer().unwrap())
       .to(be_equal_to("/something/101"));
   }
+
+  #[rstest(
+    case("", "[0]"),
+    case("$", "$[0]"),
+    case("$.a", "$.a[0]"),
+    case("$.a[1]", "$.a[1][0]"),
+    case("$.a.*", "$.a[0]"),
+    case("$.a[*]", "$.a[0]")
+  )]
+  fn join_index_test(#[case] base: &'static str, #[case] result: &str) {
+    let base_path = DocPath::new_unwrap(base);
+    let result_path = base_path.join_index(0);
+    expect!(result_path.to_string()).to(be_equal_to(result));
+  }
 }
diff --git a/rust/pact_verifier/Cargo.toml b/rust/pact_verifier/Cargo.toml
index d566503d..0ec6bce3 100644
--- a/rust/pact_verifier/Cargo.toml
+++ b/rust/pact_verifier/Cargo.toml
@@ -36,7 +36,7 @@ lazy_static = "1.4.0"
 maplit = "1.0.2"
 mime = "0.3.17"
 pact_matching = { version = "~2.0.0-beta", path = "../pact_matching", default-features = false }
-pact_models = { version = "~1.2.4", default-features = false }
+pact_models = { version = "~1.2.5", default-features = false }
 pact-plugin-driver = { version = "~0.7.1", optional = true, default-features = false }
 regex = "1.10.4"
 reqwest = { version = "0.12.3", default-features = false, features = ["rustls-tls-native-roots", "blocking", "json"] }
diff --git a/rust/pact_verifier_cli/Cargo.toml b/rust/pact_verifier_cli/Cargo.toml
index e4315778..7304c6f2 100644
--- a/rust/pact_verifier_cli/Cargo.toml
+++ b/rust/pact_verifier_cli/Cargo.toml
@@ -30,7 +30,7 @@ junit-report = { version = "0.8.3", optional = true }
 lazy_static = "1.5.0"
 log = "0.4.20"
 maplit = "1.0.2"
-pact_models = { version = "~1.2.4", default-features = false }
+pact_models = { version = "~1.2.5", default-features = false }
 pact_verifier = { version = "~1.2.4", path = "../pact_verifier", default-features = false }
 regex = "1.10.2"
 reqwest = { version = "0.12.4", default-features = false, features = ["rustls-tls-native-roots", "blocking", "json"] }