From 267b0ed31213b30c7a7943af6b94e57d6cbe639d Mon Sep 17 00:00:00 2001 From: xphoniex Date: Tue, 7 Mar 2023 09:36:18 +0000 Subject: [PATCH] httpd: Use `radicle-term` instead of `radicle-cli::terminal` Signed-off-by: xphoniex --- Cargo.lock | 1 + radicle-httpd/Cargo.toml | 5 +++-- radicle-httpd/src/tracing_extra.rs | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3ad0e634..76755f7c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1952,6 +1952,7 @@ dependencies = [ "radicle-cli", "radicle-crypto", "radicle-surf", + "radicle-term", "serde", "serde_json", "tempfile", diff --git a/radicle-httpd/Cargo.toml b/radicle-httpd/Cargo.toml index 7152366d..619d0304 100644 --- a/radicle-httpd/Cargo.toml +++ b/radicle-httpd/Cargo.toml @@ -40,12 +40,13 @@ tracing-subscriber = { version = "0.3", default-features = false, features = ["s path = "../radicle" version = "0.2.0" -[dependencies.radicle-cli] -path = "../radicle-cli" +[dependencies.radicle-term] +path = "../radicle-term" [dev-dependencies] hyper = { version = "0.14.17", default-features = false, features = ["client"] } pretty_assertions = { version = "1.3.0" } +radicle-cli = { path = "../radicle-cli" } radicle-crypto = { path = "../radicle-crypto" } tempfile = { version = "3.3.0" } tower = { version = "0.4", features = ["util"] } diff --git a/radicle-httpd/src/tracing_extra.rs b/radicle-httpd/src/tracing_extra.rs index 1e0b4c78..91cecae5 100644 --- a/radicle-httpd/src/tracing_extra.rs +++ b/radicle-httpd/src/tracing_extra.rs @@ -10,7 +10,7 @@ use axum::response::IntoResponse; use axum::Extension; use hyper::{Method, StatusCode, Uri, Version}; -pub use radicle_cli::terminal::ansi::Paint; +pub use radicle_term::ansi::Paint; #[derive(Clone)] pub struct RequestId(Arc);