Bump dependencies

Author: Mark-Simulacrum

Cargo.lock

@@ -3,33 +3,33 @@ name = "rust-log-analyzer"
 version = "0.1.0"
 authors = ["Rust Project Developers"]
 license = "MIT"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
-aho-corasick = "0.6"
-atomicwrites = "0.2"
+aho-corasick = "0.7"
+atomicwrites = "0.4"
 bincode = "1.0"
-brotli = "1.2"
-digest = "0.7"
+brotli = "3.3"
 failure = "0.1"
-futures = "0.1"
+futures = "0.3"
 fnv = "1.0"
-hex = "0.3"
-hmac = "0.6"
-hyper = "0.12"
+hex = "0.4"
+hmac = "0.12"
+hyper = { version = "0.14.25", features = ["http1", "server", "runtime"] }
 lazy_static = "1.0"
-regex = "0.2"
-reqwest = "0.9"
+regex = "1.7.1"
+reqwest = { version = "0.11.14", features = ["json", "blocking"] }
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
-sha-1 = "0.7"
+sha1 = "0.10"
 walkdir = "2.1"
-structopt = "0.2.16"
-dotenv = "0.14"
-crossbeam = "0.7"
+dotenv = "0.15"
+crossbeam = "0.8"
 percent-encoding = "2.1.0"
 threadpool = "1.8.1"
 tracing = "0.1.16"
-tracing-subscriber = "0.2.8"
+tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
 atty = "0.2.14"
+clap = { version = "4.1.8", features = ["derive"] }
+tokio = { version = "1.26.0", features = ["rt-multi-thread", "rt"] }

Cargo.toml

@@ -37,7 +37,7 @@ pub fn download(
     only_passed: bool,
     only_failed: bool,
 ) -> rla::Result<()> {
-    let client = reqwest::Client::new();
+    let client = reqwest::blocking::Client::new();
     let filter_branches = filter_branches
         .iter()
         .map(|s| s.as_str())

src/bin/offline/dl.rs

@@ -13,140 +13,141 @@ extern crate tracing;
 extern crate rust_log_analyzer as rla;
 extern crate walkdir;
 
+use clap::Parser;
 use std::path::PathBuf;
-use structopt::StructOpt;
 
 mod offline;
 mod util;
 
-#[derive(StructOpt)]
-#[structopt(
+#[derive(Debug, Parser)]
+#[command(
     name = "Rust Log Analyzer Offline Tools",
     about = "A collection of tools to run the log analyzer without starting a server."
 )]
 enum Cli {
-    #[structopt(
+    #[command(
         name = "cat",
         about = "Read, and optionally process, a previously downloaded log file, then dump it to stdout."
     )]
     Cat {
-        #[structopt(
-            short = "s",
+        #[arg(
+            short = 's',
             long = "strip-control",
             help = "Removes all ASCII control characters, except newlines, before dumping."
         )]
         strip_control: bool,
-        #[structopt(
-            short = "d",
+        #[arg(
+            short = 'd',
             long = "decode-utf8",
             help = "Lossily decode as UTF-8 before dumping."
         )]
         decode_utf8: bool,
-        #[structopt(help = "The log file to read and dump.")]
+        #[arg(help = "The log file to read and dump.")]
         input: PathBuf,
     },
 
-    #[structopt(name = "learn", about = "Learn from previously downloaded log files.")]
+    #[command(name = "learn", about = "Learn from previously downloaded log files.")]
     Learn {
-        #[structopt(long = "ci", help = "CI platform to download from.")]
+        #[arg(long = "ci", help = "CI platform to download from.")]
         ci: util::CliCiPlatform,
-        #[structopt(
-            short = "i",
+        #[arg(
+            short = 'i',
             long = "index-file",
             help = "The index file to read / write. An existing index file is updated."
         )]
         index_file: PathBuf,
-        #[structopt(
-            short = "m",
+        #[arg(
+            short = 'm',
             long = "multiplier",
             default_value = "1",
             help = "A multiplier to apply when learning."
         )]
         multiplier: u32,
-        #[structopt(
+        #[arg(
             help = "The log files to learn from.\nDirectories are traversed recursively. Hidden files are ignore."
         )]
         logs: Vec<PathBuf>,
     },
 
-    #[structopt(
+    #[command(
         name = "extract-dir",
         about = "Extract potential error messages from all log files in a directory, writing the results to a different directory."
     )]
     ExtractDir {
-        #[structopt(long = "ci", help = "CI platform to download from.")]
+        #[arg(long = "ci", help = "CI platform to download from.")]
         ci: util::CliCiPlatform,
-        #[structopt(
-            short = "i",
+        #[arg(
+            short = 'i',
             long = "index-file",
             help = "The index file to read / write."
         )]
         index_file: PathBuf,
-        #[structopt(
-            short = "s",
+        #[arg(
+            short = 's',
             long = "source",
             help = "The directory in which to (non-recursively) look for log files. Hidden files are ignored."
         )]
         source: PathBuf,
-        #[structopt(
-            short = "d",
+        #[arg(
+            short = 'd',
             long = "destination",
             help = "The directory in which to write the results. All non-hidden will be deleted from the directory."
         )]
         dest: PathBuf,
     },
 
-    #[structopt(
+    #[command(
         name = "extract-one",
         about = "Extract a potential error message from a single log file."
     )]
     ExtractOne {
-        #[structopt(long = "ci", help = "CI platform to download from.")]
+        #[arg(long = "ci", help = "CI platform to download from.")]
         ci: util::CliCiPlatform,
-        #[structopt(
-            short = "i",
+        #[arg(
+            short = 'i',
             long = "index-file",
             help = "The index file to read / write."
         )]
         index_file: PathBuf,
-        #[structopt(help = "The log file to analyze.")]
+        #[arg(help = "The log file to analyze.")]
         log: PathBuf,
     },
 
-    #[structopt(name = "dl", about = "Download build logs from the CI platform.")]
+    #[command(name = "dl", about = "Download build logs from the CI platform.")]
     Dl {
-        #[structopt(long = "ci", help = "CI platform to download from.")]
+        #[arg(long = "ci", help = "CI platform to download from.")]
         ci: util::CliCiPlatform,
-        #[structopt(long = "repo", help = "Repository to download from.")]
+        #[arg(long = "repo", help = "Repository to download from.")]
         repo: String,
-        #[structopt(short = "o", long = "output", help = "Log output directory.")]
+        #[arg(short = 'o', long = "output", help = "Log output directory.")]
         output: PathBuf,
-        #[structopt(short = "c", long = "count", help = "Number of _builds_ to process.")]
+        #[arg(short = 'c', long = "count", help = "Number of _builds_ to process.")]
         count: u32,
-        #[structopt(
-            short = "s",
+        #[arg(
+            short = 's',
             long = "skip",
             default_value = "0",
             help = "Number of _builds_ to skip."
         )]
         skip: u32,
-        #[structopt(
-            short = "b",
-            long = "branch",
-            multiple = true,
-            help = "Branches to filter by."
-        )]
+        #[arg(short = 'b', long = "branch", help = "Branches to filter by.")]
         branches: Vec<String>,
-        #[structopt(long = "passed", help = "Only download passed builds and jobs.")]
+        #[arg(long = "passed", help = "Only download passed builds and jobs.")]
         passed: bool,
-        #[structopt(long = "failed", help = "Only download failed builds and jobs.")]
+        #[arg(long = "failed", help = "Only download failed builds and jobs.")]
         failed: bool,
     },
 }
 
+#[test]
+fn verify_cli() {
+    use clap::CommandFactory;
+    Cli::command().debug_assert()
+}
+
 fn main() {
     dotenv::dotenv().ok();
-    util::run(|| match Cli::from_args() {
+    util::run(|| match Cli::parse() {
         Cli::Cat {
             strip_control,
             decode_utf8,

src/bin/rla-offline.rs

@@ -16,73 +16,77 @@ extern crate regex;
 extern crate rust_log_analyzer as rla;
 extern crate serde_json;
 
-use hyper::rt::Future;
+use clap::Parser;
 use std::process;
 use std::sync::Arc;
 use std::thread;
-use structopt::StructOpt;
 
 mod server;
 mod util;
 
-#[derive(StructOpt)]
-#[structopt(
+#[derive(Parser, Debug)]
+#[command(
     name = "Rust Log Analyzer WebHook Server",
     about = "A http server that listens for GitHub webhooks and posts comments with potential causes on failed builds."
 )]
 struct Cli {
-    #[structopt(
-        short = "p",
+    #[arg(
+        short = 'p',
         long = "port",
         default_value = "8080",
         help = "The port to listen on for HTTP connections."
     )]
     port: u16,
-    #[structopt(
-        short = "b",
+    #[arg(
+        short = 'b',
         long = "bind",
         default_value = "127.0.0.1",
         help = "The address to bind."
     )]
     bind: std::net::IpAddr,
-    #[structopt(
-        short = "i",
+    #[arg(
+        short = 'i',
         long = "index-file",
         help = "The index file to read / write. An existing index file is updated."
     )]
     index_file: std::path::PathBuf,
-    #[structopt(
+    #[arg(
         long = "debug-post",
         help = "Post all comments to the given issue instead of the actual PR. Format: \"user/repo#id\""
     )]
     debug_post: Option<String>,
-    #[structopt(
+    #[arg(
         long = "webhook-verify",
         help = "If enabled, web hooks that cannot be verified are rejected."
     )]
     webhook_verify: bool,
-    #[structopt(long = "ci", help = "CI platform to interact with.")]
+    #[arg(long = "ci", help = "CI platform to interact with.")]
     ci: util::CliCiPlatform,
-    #[structopt(long = "repo", help = "Repository to interact with.")]
+    #[arg(long = "repo", help = "Repository to interact with.")]
     repo: String,
-    #[structopt(
+    #[arg(
         long = "secondary-repo",
         help = "Secondary repositories to listen for builds.",
-        required = false,
-        multiple = true
+        required = false
     )]
     secondary_repos: Vec<String>,
-    #[structopt(
+    #[arg(
         long = "query-builds-from-primary-repo",
         help = "Always query builds from the primary repo instead of the repo receiving them."
     )]
     query_builds_from_primary_repo: bool,
 }
 
+#[test]
+fn verify_cli() {
+    use clap::CommandFactory;
+    Cli::command().debug_assert()
+}
+
 fn main() {
     dotenv::dotenv().ok();
     util::run(|| {
-        let args = Cli::from_args();
+        let args = Cli::parse();
 
         let addr = std::net::SocketAddr::new(args.bind, args.port);
 
@@ -111,14 +115,24 @@ fn main() {
             process::exit(0);
         });
 
-        let server = hyper::server::Server::bind(&addr).serve(move || {
-            let s = service.clone();
-            hyper::service::service_fn(move |req| s.call(req))
-        });
+        let s = service.clone();
+        let server =
+            hyper::server::Server::bind(&addr).serve(hyper::service::make_service_fn(move |_| {
+                let s = s.clone();
+                async move {
+                    Ok::<_, hyper::Error>(hyper::service::service_fn(move |req| {
+                        let s = s.clone();
+                        async move { s.call(req).await }
+                    }))
+                }
+            }));
 
-        hyper::rt::run(server.map_err(|e| {
-            error!("server error: {}", e);
-        }));
+        tokio::runtime::Runtime::new()?
+            .block_on(server)
+            .map_err(|e| {
+                error!("server error: {}", e);
+                e
+            })?;
 
         Ok(())
     });