From 451a322ff7dbd8a5260330254085f0785d816199 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Apr 2022 19:57:31 +0000
Subject: [PATCH] Bump expectorate from 1.0.4 to 1.0.5

Bumps [expectorate](https://github.com/oxidecomputer/expectorate) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/oxidecomputer/expectorate/releases)
- [Commits](https://github.com/oxidecomputer/expectorate/commits/v1.0.5)

---
updated-dependencies:
- dependency-name: expectorate
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock                    | 21 ++++++++++++---------
 common/Cargo.toml             |  2 +-
 gateway/Cargo.toml            |  2 +-
 internal-dns/Cargo.toml       |  2 +-
 nexus/Cargo.toml              |  2 +-
 oximeter/collector/Cargo.toml |  2 +-
 sled-agent/Cargo.toml         |  2 +-
 test-utils/Cargo.toml         |  2 +-
 8 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ae26bfd36ec..21b68aaf6f8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -433,7 +433,9 @@ dependencies = [
  "encode_unicode",
  "libc",
  "once_cell",
+ "regex",
  "terminal_size",
+ "unicode-width",
  "winapi",
 ]
 
@@ -877,12 +879,6 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
 
-[[package]]
-name = "difference"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
-
 [[package]]
 name = "difflib"
 version = "0.4.0"
@@ -1119,12 +1115,13 @@ dependencies = [
 
 [[package]]
 name = "expectorate"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "804d601ea8a13ddbecf5ab4b6cf75b5d6d0539479c6fb2aea1596e352a5ee27e"
+checksum = "5d9b457178b54cf0321a39fb6643ad7b9c705cf483ad4fb6d6092054e9ce839e"
 dependencies = [
- "difference",
+ "console",
  "newline-converter",
+ "similar",
 ]
 
 [[package]]
@@ -4026,6 +4023,12 @@ dependencies = [
  "rand_core 0.6.3",
 ]
 
+[[package]]
+name = "similar"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e24979f63a11545f5f2c60141afe249d4f19f84581ea2138065e400941d83d3"
+
 [[package]]
 name = "siphasher"
 version = "0.3.10"
diff --git a/common/Cargo.toml b/common/Cargo.toml
index f7f495ecbce..a15d357e866 100644
--- a/common/Cargo.toml
+++ b/common/Cargo.toml
@@ -35,6 +35,6 @@ parse-display = "0.5.4"
 progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
 
 [dev-dependencies]
-expectorate = "1.0.4"
+expectorate = "1.0.5"
 serde_urlencoded = "0.7.1"
 tokio = { version = "1.17", features = [ "test-util" ] }
diff --git a/gateway/Cargo.toml b/gateway/Cargo.toml
index 15de1b0ced4..14242cf69e1 100644
--- a/gateway/Cargo.toml
+++ b/gateway/Cargo.toml
@@ -31,7 +31,7 @@ version = "1.16"
 features = [ "full" ]
 
 [dev-dependencies]
-expectorate = "1.0.4"
+expectorate = "1.0.5"
 http = "0.2.5"
 omicron-test-utils = { path = "../test-utils" }
 openapi-lint = { git = "https://github.com/oxidecomputer/openapi-lint", branch = "main" }
diff --git a/internal-dns/Cargo.toml b/internal-dns/Cargo.toml
index 04a1543fbd9..72d4088d983 100644
--- a/internal-dns/Cargo.toml
+++ b/internal-dns/Cargo.toml
@@ -25,7 +25,7 @@ trust-dns-proto = "0.21"
 trust-dns-server = "0.21"
 
 [dev-dependencies]
-expectorate = "1.0.4"
+expectorate = "1.0.5"
 internal-dns-client = { path = "../internal-dns-client" }
 omicron-test-utils = { path = "../test-utils" }
 openapiv3 = "1.0"
diff --git a/nexus/Cargo.toml b/nexus/Cargo.toml
index 102cb078beb..dbd52ef6699 100644
--- a/nexus/Cargo.toml
+++ b/nexus/Cargo.toml
@@ -117,7 +117,7 @@ features = [ "serde", "v4" ]
 
 [dev-dependencies]
 criterion = { version = "0.3", features = [ "async_tokio" ] }
-expectorate = "1.0.4"
+expectorate = "1.0.5"
 nexus-test-utils-macros = { path = "test-utils-macros" }
 nexus-test-utils = { path = "test-utils" }
 omicron-test-utils = { path = "../test-utils" }
diff --git a/oximeter/collector/Cargo.toml b/oximeter/collector/Cargo.toml
index a14cbd42a92..3e1886545a3 100644
--- a/oximeter/collector/Cargo.toml
+++ b/oximeter/collector/Cargo.toml
@@ -22,7 +22,7 @@ toml = "0.5.8"
 uuid = { version = "0.8.2", features = [ "v4", "serde" ] }
 
 [dev-dependencies]
-expectorate = "1.0.4"
+expectorate = "1.0.5"
 omicron-test-utils = { path = "../../test-utils" }
 openapiv3 = "1.0"
 serde_json = "1.0.79"
diff --git a/sled-agent/Cargo.toml b/sled-agent/Cargo.toml
index 6cc2069fbeb..c557ad53e0b 100644
--- a/sled-agent/Cargo.toml
+++ b/sled-agent/Cargo.toml
@@ -46,7 +46,7 @@ vsss-rs = { version = "2.0.0-pre0", default-features = false, features = ["std"]
 zone = "0.1"
 
 [dev-dependencies]
-expectorate = "1.0.4"
+expectorate = "1.0.5"
 http = "0.2.5"
 mockall = "0.11"
 omicron-test-utils = { path = "../test-utils" }
diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml
index ce7a211fc69..0ba8001feef 100644
--- a/test-utils/Cargo.toml
+++ b/test-utils/Cargo.toml
@@ -37,7 +37,7 @@ version = "0.7"
 features = [ "with-chrono-0_4", "with-uuid-0_8" ]
 
 [dev-dependencies]
-expectorate = "1.0.4"
+expectorate = "1.0.5"
 
 # Disable doc builds by default for our binaries to work around issue
 # rust-lang/cargo#8373.  These docs would not be very useful anyway.