Update crate dependencies

This is not only regular dependency gardening, it also switches from
`structopt` to `clap` to avoid some unmaintained dependencies (`atty`,
`ansi_term`). This also switches to `env_logger` instead of the
`pretty_env_logger` wrapper.

Author: abrown

Cargo.lock

@@ -16,4 +16,4 @@ cfg-if = "1.0"
 log = "0.4"
 
 [dev-dependencies]
-pretty_env_logger = "0.4"
+env_logger = "0.10"

crates/openvino-finder/Cargo.toml

@@ -25,18 +25,20 @@ include = [
 links = "inference_engine_c_api"
 
 [dependencies]
-once_cell = {version = "1.12.0", optional = true }
-libloading = {version = "0.7", optional = true }
-openvino-finder = {version = "0.5.0", path = "../openvino-finder" }
+once_cell = { version = "1.18", optional = true }
+libloading = { version = "0.8", optional = true }
+openvino-finder = { version = "0.5.0", path = "../openvino-finder" }
 
 [build-dependencies]
-openvino-finder = {version = "0.5.0", path = "../openvino-finder" }
-pretty_env_logger = "0.4"
+openvino-finder = { version = "0.5.0", path = "../openvino-finder" }
+env_logger = "0.10"
 
 [features]
 # Linking features: `build.rs` will default to dynamic linking if none is selected.
-dynamic-linking = [] # Will find and bind to an OpenVINO shared library at compile time.
-runtime-linking = ["libloading", "once_cell"] # Will bind to an OpenVINO shared library at runtime using `load`.
+# - Will find and bind to an OpenVINO shared library at compile time.
+dynamic-linking = []
+# - Will bind to an OpenVINO shared library at runtime using `load`.
+runtime-linking = ["libloading", "once_cell"]
 
 [package.metadata.docs.rs]
 features = ["runtime-linking"]

crates/openvino-sys/Cargo.toml

@@ -10,14 +10,12 @@ documentation = "https://docs.rs/openvino"
 keywords = ["openvino", "machine-learning", "ml", "neural-network"]
 categories = ["api-bindings", "science"]
 edition = "2018"
-exclude = [
-    "/tests"
-]
+exclude = ["/tests"]
 
 [dependencies]
 openvino-sys = { path = "../openvino-sys", version = "0.5.0" }
 openvino-finder = { path = "../openvino-finder", version = "0.5.0" }
-thiserror = "1.0.20"
+thiserror = "1.0"
 
 [dev-dependencies]
 float-cmp = "0.9"

crates/openvino/Cargo.toml

@@ -9,7 +9,7 @@ publish = false
 
 [dependencies]
 anyhow = "1.0"
-bindgen = "0.61"
-structopt = { version = "0.3", features = ["color", "suggestions"] }
-toml = "0.5.8"
+bindgen = "0.68.1"
+clap = { version = "4.4.4", features = ["derive"] }
+toml = "0.8.0"
 semver = "1.0"

crates/xtask/Cargo.toml

@@ -1,23 +1,22 @@
 use crate::util::{get_crates, Crate};
 use anyhow::{anyhow, Context, Result};
+use clap::Args;
 use semver::{BuildMetadata, Prerelease};
 use std::fs;
 use std::process::Command;
-use structopt::StructOpt;
 
-#[derive(Debug, StructOpt)]
-#[structopt(name = "bump")]
+#[derive(Debug, Args)]
 pub struct BumpCommand {
     /// Do not modify the Cargo.toml files; instead, simply print the actions that would have been
     /// taken.
-    #[structopt(long = "dry-run")]
+    #[arg(long = "dry-run")]
     dry_run: bool,
     /// Add a conventional Git commit message for the bump changes; equivalent to `git commit -a -m
     /// 'Release v[bumped version]'`.
-    #[structopt(long)]
+    #[arg(long)]
     git: bool,
     /// What part of the semver version to change: major | minor | patch | [version string]
-    #[structopt(name = "KIND")]
+    #[arg(name = "KIND")]
     bump: Bump,
 }
 
@@ -91,7 +90,7 @@ impl BumpCommand {
 }
 
 /// Enumerate the ways a version can change.
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 pub enum Bump {
     Major,
     Minor,

crates/xtask/src/bump.rs

@@ -1,21 +1,20 @@
 use crate::util::path_to_crates;
 use anyhow::{anyhow, ensure, Context, Result};
+use clap::Args;
 use std::fs::{File, OpenOptions};
 use std::io::Write;
 use std::path::{Path, PathBuf};
-use structopt::StructOpt;
 
-#[derive(Debug, StructOpt)]
-#[structopt(name = "codegen")]
+#[derive(Debug, Args)]
 pub struct CodegenCommand {
     /// The path to OpenVINO's Inference Engine C API header; by default,
     /// `.../openvino-sys/upstream/inference-engine/ie_bridges/c/include/c_api/ie_c_api.h`.
-    #[structopt(short = "i", long = "input-header-file")]
+    #[arg(short = 'i', long = "input-header-file")]
     header_file: Option<PathBuf>,
 
     /// The path to the directory in which to output the generated files; by default,
     /// `.../openvino-sys/crates/src/generated`.
-    #[structopt(short = "o", long = "output-directory")]
+    #[arg(short = 'o', long = "output-directory")]
     output_directory: Option<PathBuf>,
 }
 

crates/xtask/src/codegen.rs

@@ -10,24 +10,31 @@ mod util;
 
 use anyhow::Result;
 use bump::BumpCommand;
+use clap::{Parser, Subcommand};
 use codegen::CodegenCommand;
 use publish::PublishCommand;
-use structopt::{clap::AppSettings, StructOpt};
 
 fn main() -> Result<()> {
-    let command = XtaskCommand::from_args();
-    command.execute()?;
+    let cli = Cli::parse();
+    cli.command.execute()?;
     Ok(())
 }
 
-#[derive(StructOpt, Debug)]
-#[structopt(
-    version = env!("CARGO_PKG_VERSION"),
-    global_settings = &[
-        AppSettings::VersionlessSubcommands,
-        AppSettings::ColoredHelp
-    ],
-)]
+#[derive(Parser, Debug)]
+#[command(author, version, about, long_about = None)]
+struct Cli {
+    #[command(subcommand)]
+    command: XtaskCommand,
+}
+
+// #[structopt(
+//     version = env!("CARGO_PKG_VERSION"),
+//     global_settings = &[
+//         AppSettings::VersionlessSubcommands,
+//         AppSettings::ColoredHelp
+//     ],
+// )]
+#[derive(Debug, Subcommand)]
 enum XtaskCommand {
     /// Generate the Rust bindings for OpenVINO to use in the openvino-sys crate.
     Codegen(CodegenCommand),

crates/xtask/src/main.rs

@@ -1,17 +1,16 @@
 use crate::util::{exec, get_crates, path_to_crates, Crate};
 use anyhow::{anyhow, Result};
+use clap::Args;
 use std::{process::Command, thread::sleep, time::Duration};
-use structopt::StructOpt;
 
-#[derive(Debug, StructOpt)]
-#[structopt(name = "bump")]
+#[derive(Debug, Args)]
 pub struct PublishCommand {
     /// Tag the current commit and push the tags to the default upstream; equivalent to `git tag
     /// v[version] && git push origin v[version]`.
-    #[structopt(long)]
+    #[arg(long)]
     git: bool,
     /// Do not publish any crates; instead, simply print the actions that would have been taken.
-    #[structopt(long = "dry-run")]
+    #[arg(long = "dry-run")]
     dry_run: bool,
 }
 

crates/xtask/src/publish.rs

@@ -34,8 +34,9 @@ pub fn get_crates() -> Result<Vec<Crate>> {
     let mut crates = Vec::new();
     for entry in fs::read_dir(crates_dir)? {
         let path = entry?.path().join("Cargo.toml");
-        let contents: Vec<u8> = fs::read(&path)?;
-        let toml: Value = toml::from_slice(&contents)
+        let contents = fs::read_to_string(&path)?;
+        let toml: Value = contents
+            .parse()
             .with_context(|| format!("unable to parse TOML of {}", &path.display()))?;
 
         let name = toml["package"]["name"]