diff --git a/Cargo.lock b/Cargo.lock index 6e4ef03f8d..1987b9fc0b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6366,7 +6366,6 @@ name = "trogging" version = "0.1.0" dependencies = [ "clap", - "is-terminal", "logfmt", "observability_deps", "regex", @@ -6961,7 +6960,6 @@ dependencies = [ "regex-syntax 0.7.4", "reqwest", "ring", - "rustix", "rustls", "scopeguard", "serde", diff --git a/trogging/Cargo.toml b/trogging/Cargo.toml index 4ace2280ae..2da6d5a363 100644 --- a/trogging/Cargo.toml +++ b/trogging/Cargo.toml @@ -8,7 +8,6 @@ license.workspace = true [dependencies] clap = { version = "4", features = ["derive", "env"], optional = true } -is-terminal = "0.4.9" logfmt = { path = "../logfmt" } observability_deps = { path = "../observability_deps" } thiserror = "1.0.47" diff --git a/trogging/src/lib.rs b/trogging/src/lib.rs index 01487abf93..47b4131a26 100644 --- a/trogging/src/lib.rs +++ b/trogging/src/lib.rs @@ -20,14 +20,14 @@ pub mod config; pub use config::*; -use is_terminal::IsTerminal; // Re-export tracing_subscriber pub use tracing_subscriber; use observability_deps::tracing::{self, Subscriber}; -use std::cmp::min; -use std::io; -use std::io::Write; +use std::{ + cmp::min, + io::{self, IsTerminal, Write}, +}; use thiserror::Error; use tracing_subscriber::{ fmt::{self, writer::BoxMakeWriter, MakeWriter}, diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 7cbb5bb485..ef188a0998 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -166,39 +166,33 @@ uuid = { version = "1", features = ["v4"] } bitflags = { version = "2", default-features = false, features = ["std"] } nix = { version = "0.26" } once_cell = { version = "1", default-features = false, features = ["unstable"] } -rustix = { version = "0.38", features = ["fs", "termios"] } rustls = { version = "0.21" } [target.x86_64-unknown-linux-gnu.build-dependencies] bitflags = { version = "2", default-features = false, features = ["std"] } once_cell = { version = "1", default-features = false, features = ["unstable"] } -rustix = { version = "0.38", features = ["fs", "termios"] } rustls = { version = "0.21" } [target.x86_64-apple-darwin.dependencies] bitflags = { version = "2", default-features = false, features = ["std"] } nix = { version = "0.26" } once_cell = { version = "1", default-features = false, features = ["unstable"] } -rustix = { version = "0.38", features = ["fs", "termios"] } rustls = { version = "0.21" } [target.x86_64-apple-darwin.build-dependencies] bitflags = { version = "2", default-features = false, features = ["std"] } once_cell = { version = "1", default-features = false, features = ["unstable"] } -rustix = { version = "0.38", features = ["fs", "termios"] } rustls = { version = "0.21" } [target.aarch64-apple-darwin.dependencies] bitflags = { version = "2", default-features = false, features = ["std"] } nix = { version = "0.26" } once_cell = { version = "1", default-features = false, features = ["unstable"] } -rustix = { version = "0.38", features = ["fs", "termios"] } rustls = { version = "0.21" } [target.aarch64-apple-darwin.build-dependencies] bitflags = { version = "2", default-features = false, features = ["std"] } once_cell = { version = "1", default-features = false, features = ["unstable"] } -rustix = { version = "0.38", features = ["fs", "termios"] } rustls = { version = "0.21" } [target.x86_64-pc-windows-msvc.dependencies]