refactor: further separate CLI logic from the API related functionality (see #117)

Cargo.toml

@@ -12,7 +12,9 @@ required-features = ["cli"]
 annotate-snippets = {version = "^0.9.1", optional = true}
 clap = {version = "^4.5.18", features = ["cargo", "derive", "env", "wrap_help"], optional = true}
 clap_complete = {version = "^4.5.2", optional = true}
+enum_dispatch = {version = "0.3.13", optional = true}
 is-terminal = {version = "0.4.3", optional = true}
+lifetime = { version = "0.1.0", features = ["macros"] }
 pulldown-cmark = {version = "0.10.2", optional = true}
 reqwest = {version = "^0.11", default-features = false, features = ["json"]}
 serde = {version = "^1.0", features = ["derive"]}
@@ -33,7 +35,7 @@ tokio = {version = "^1.0", features = ["macros"]}
 
 [features]
 annotate = ["dep:annotate-snippets"]
-cli = ["annotate", "color", "dep:clap", "dep:is-terminal", "multithreaded"]
+cli = ["annotate", "color", "dep:clap", "dep:enum_dispatch", "dep:is-terminal", "multithreaded"]
 cli-complete = ["cli", "clap_complete"]
 color = ["annotate-snippets?/color", "dep:termcolor"]
 default = ["cli", "native-tls"]
@@ -61,7 +63,7 @@ license = "MIT"
 name = "languagetool-rust"
 readme = "README.md"
 repository = "https://github.com/jeertmans/languagetool-rust"
-rust-version = "1.74.0"
+rust-version = "1.75.0"
 version = "2.1.4"
 
 [package.metadata.docs.rs]

README.md

@@ -154,13 +154,14 @@ languagetool-rust = "^2.1"
 
 ```rust
 use languagetool_rust::api::{check, server::ServerClient};
+use std::borrow::Cow;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let client = ServerClient::from_env_or_default();
 
     let req = check::Request::default()
-        .with_text("Some phrase with a smal mistake".to_string());  // # codespell:ignore smal
+        .with_text(Cow::Borrowed("Some phrase with a smal mistake"));  // # codespell:ignore smal
 
     println!(
         "{}",

benches/benchmarks/check_texts.rs

@@ -1,3 +1,5 @@
+use std::borrow::Cow;
+
 use codspeed_criterion_compat::{criterion_group, Criterion, Throughput};
 use futures::future::join_all;
 use languagetool_rust::{
@@ -14,7 +16,7 @@ static FILES: [(&str, &str); 3] = [
     ("large", include_str!("../large.txt")),
 ];
 
-async fn request_until_success(req: &Request, client: &ServerClient) -> Response {
+async fn request_until_success<'source>(req: &Request<'source>, client: &ServerClient) -> Response {
     loop {
         match client.check(req).await {
             Ok(resp) => return resp,
@@ -29,12 +31,12 @@ async fn request_until_success(req: &Request, client: &ServerClient) -> Response
 }
 
 #[tokio::main]
-async fn check_text_basic(text: &str) -> Response {
+async fn check_text_basic(text: &'static str) -> Response {
     let client = ServerClient::from_env().expect(
         "Please use a local server for benchmarking, and configure the environ variables to use \
          it.",
     );
-    let req = Request::default().with_text(text.to_string());
+    let req = Request::default().with_text(Cow::Borrowed(text));
     request_until_success(&req, &client).await
 }
 
@@ -48,9 +50,9 @@ async fn check_text_split(text: &str) -> Response {
 
     let resps = join_all(lines.map(|line| {
         async {
-            let req = Request::default().with_text(line.to_string());
+            let req = Request::default().with_text(Cow::Owned(line.to_string()));
             let resp = request_until_success(&req, &client).await;
-            check::ResponseWithContext::new(req.get_text(), resp)
+            check::ResponseWithContext::new(req.get_text().into_owned(), resp)
         }
     }))
     .await;

rustfmt.toml

@@ -1,4 +1,5 @@
 condense_wildcard_suffixes = true
+edition = "2021"
 # error_on_line_overflow = true
 # error_on_unformatted = true
 force_multiline_blocks = true
@@ -9,5 +10,4 @@ imports_granularity = "Crate"
 match_block_trailing_comma = true
 normalize_doc_attributes = true
 unstable_features = true
-version = "Two"
 wrap_comments = true