diff --git a/Cargo.lock b/Cargo.lock index c4bd11f35b445..c855252a12a34 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8095,7 +8095,16 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "011cbb39cf7c1f62871aea3cc46e5817b0937b49e9447370c93cacbe93a766d8" dependencies = [ - "vte", + "vte 0.10.1", +] + +[[package]] +name = "strip-ansi-escapes" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ff8ef943b384c414f54aefa961dd2bd853add74ec75e7ac74cf91dba62bcfa" +dependencies = [ + "vte 0.11.1", ] [[package]] @@ -9542,7 +9551,7 @@ dependencies = [ "snap", "socket2 0.5.3", "stream-cancel", - "strip-ansi-escapes", + "strip-ansi-escapes 0.2.0", "syslog", "tempfile", "test-generator", @@ -9961,7 +9970,7 @@ dependencies = [ "sha2 0.10.7", "sha3", "snafu", - "strip-ansi-escapes", + "strip-ansi-escapes 0.1.1", "syslog_loose", "termcolor", "thiserror", @@ -9986,6 +9995,16 @@ dependencies = [ "vte_generate_state_changes", ] +[[package]] +name = "vte" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" +dependencies = [ + "utf8parse", + "vte_generate_state_changes", +] + [[package]] name = "vte_generate_state_changes" version = "0.1.1" diff --git a/Cargo.toml b/Cargo.toml index 40dc29b12c2a7..e477eca441a11 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -313,7 +313,7 @@ snafu = { version = "0.7.5", default-features = false, features = ["futures"] } snap = { version = "1.1.0", default-features = false, optional = true } socket2 = { version = "0.5.3", default-features = false } stream-cancel = { version = "0.8.1", default-features = false } -strip-ansi-escapes = { version = "0.1.1", default-features = false } +strip-ansi-escapes = { version = "0.2.0", default-features = false } syslog = { version = "6.1.0", default-features = false, optional = true } tikv-jemallocator = { version = "0.5.4", default-features = false, optional = true } tokio-postgres = { version = "0.7.7", default-features = false, features = ["runtime", "with-chrono-0_4"], optional = true } diff --git a/src/validate.rs b/src/validate.rs index 0803e11423a2a..5800db5355b79 100644 --- a/src/validate.rs +++ b/src/validate.rs @@ -403,7 +403,7 @@ impl Formatter { .as_ref() .lines() .map(|line| { - String::from_utf8_lossy(&strip_ansi_escapes::strip(line).unwrap()) + String::from_utf8_lossy(&strip_ansi_escapes::strip(line)) .chars() .count() })