summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMarkus Pettersson <markus.pettersson@mullvad.net>2023-10-04 11:54:29 +0200
committerDavid Lönnhager <david.l@mullvad.net>2023-10-11 17:10:59 +0200
commit105dd14971213a524ae6c22638e48f2ffa5589db (patch)
tree9b5464803391ea4d5d8518fc858703c65e5db9f3
parent9383325ea310ded42066b68402c1c3fc7ff63955 (diff)
downloadmullvadvpn-105dd14971213a524ae6c22638e48f2ffa5589db.tar.xz
mullvadvpn-105dd14971213a524ae6c22638e48f2ffa5589db.zip
Remove dependency `is-terminal` from `talpid-openvpn`
`std::io::IsTerminal` has been since Rust `1.70`, which allows us to migrate away from `is_terminal::IsTerminal`.
-rw-r--r--Cargo.lock1
-rw-r--r--talpid-openvpn/Cargo.toml1
-rw-r--r--talpid-openvpn/src/process/openvpn.rs2
3 files changed, 1 insertions, 3 deletions
diff --git a/Cargo.lock b/Cargo.lock
index b3b830e0ce..2a20b8c04b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3490,7 +3490,6 @@ dependencies = [
"duct",
"err-derive",
"futures",
- "is-terminal",
"log",
"once_cell",
"os_pipe",
diff --git a/talpid-openvpn/Cargo.toml b/talpid-openvpn/Cargo.toml
index 259bfa9b66..028519613c 100644
--- a/talpid-openvpn/Cargo.toml
+++ b/talpid-openvpn/Cargo.toml
@@ -14,7 +14,6 @@ async-trait = "0.1"
duct = "0.13"
err-derive = { workspace = true }
futures = "0.3.15"
-is-terminal = "0.4.2"
once_cell = "1.13"
log = { workspace = true }
os_pipe = "1.1.4"
diff --git a/talpid-openvpn/src/process/openvpn.rs b/talpid-openvpn/src/process/openvpn.rs
index 722468e3ca..0fbb292e2e 100644
--- a/talpid-openvpn/src/process/openvpn.rs
+++ b/talpid-openvpn/src/process/openvpn.rs
@@ -378,7 +378,7 @@ impl OpenVpnProcHandle {
/// Configures the expression to run OpenVPN in a way compatible with this handle
/// and spawns it. Returns the handle.
pub fn new(mut cmd: duct::Expression) -> io::Result<Self> {
- use is_terminal::IsTerminal;
+ use std::io::IsTerminal;
if !std::io::stdout().is_terminal() {
cmd = cmd.stdout_null();