bump clap 3 -> 4

analyzeme/src/testing_common.rs

@@ -2,7 +2,6 @@ use crate::{Event, EventPayload, ProfilingData, Timestamp};
 use measureme::{EventId, EventIdBuilder, Profiler, StringId};
 use rustc_hash::FxHashMap;
 use std::borrow::Cow;
-use std::default::Default;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use std::time::SystemTime;

crox/Cargo.toml

@@ -10,4 +10,4 @@ analyzeme = { path = "../analyzeme" }
 rustc-hash = "1.0.1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-clap = { version = "3.2", features = ["derive"] }
+clap = { version = "4.5.0", features = ["derive"] }

crox/src/main.rs

@@ -44,16 +44,16 @@ struct Event {
 
 #[derive(Parser, Debug)]
 struct Opt {
-    #[clap(required_unless = "dir")]
+    #[arg(required_unless_present = "dir")]
     file_prefix: Vec<PathBuf>,
     /// all event trace files in dir will be merged to one chrome_profiler.json file
-    #[clap(long = "dir")]
+    #[arg(long = "dir")]
     dir: Option<PathBuf>,
     /// collapse threads without overlapping events
-    #[clap(long = "collapse-threads")]
+    #[arg(long = "collapse-threads")]
     collapse_threads: bool,
     /// filter out events with shorter duration (in microseconds)
-    #[clap(long = "minimum-duration")]
+    #[arg(long = "minimum-duration")]
     minimum_duration: Option<u128>,
 }
 
@@ -135,7 +135,7 @@ fn get_args(full_event: &analyzeme::Event<'_>) -> Option<FxHashMap<String, Strin
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-    let opt = Opt::from_args();
+    let opt = Opt::parse();
 
     let chrome_file = BufWriter::new(fs::File::create("chrome_profiler.json")?);
     let mut serializer = serde_json::Serializer::new(chrome_file);

flamegraph/Cargo.toml

@@ -11,5 +11,5 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 measureme = { path = "../measureme" }
 analyzeme = { path = "../analyzeme" }
-clap = { version = "3.2", features = ["derive"] }
+clap = { version = "4.5.0", features = ["derive"] }
 inferno = { version = "0.11", default-features = false }

flamegraph/src/main.rs

@@ -13,7 +13,7 @@ struct Opt {
 }
 
 fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
-    let opt = Opt::from_args();
+    let opt = Opt::parse();
 
     let profiling_data = ProfilingData::new(&opt.file_prefix)?;
 

mmedit/Cargo.toml

@@ -6,4 +6,4 @@ edition = "2018"
 [dependencies]
 measureme = { path = "../measureme" }
 decodeme = { path = "../decodeme" }
-clap = { version = "3.2", features = ["derive"] }
+clap = { version = "4.5.0", features = ["derive"] }

mmedit/src/main.rs

@@ -12,7 +12,7 @@ struct TruncateOpt {
 #[derive(Parser, Debug)]
 enum Opt {
     /// Truncate to a single page per tag
-    #[clap(name = "truncate")]
+    #[command(name = "truncate")]
     Truncate(TruncateOpt),
 }
 
@@ -61,7 +61,7 @@ fn truncate(file_contents: &[u8]) -> Result<Vec<u8>, Box<dyn Error + Send + Sync
 }
 
 fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
-    let opt = Opt::from_args();
+    let opt = Opt::parse();
 
     match opt {
         Opt::Truncate(opt) => {

mmview/Cargo.toml

@@ -8,4 +8,4 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 analyzeme = { path = "../analyzeme" }
 measureme = { path = "../measureme" }
-clap = { version = "3.2", features = ["derive"] }
+clap = { version = "4.5.0", features = ["derive"] }

mmview/src/main.rs

@@ -9,12 +9,12 @@ struct Opt {
     file_prefix: PathBuf,
 
     /// Filter to events which occured on the specified thread id
-    #[clap(short = 't', long = "thread-id")]
+    #[arg(short = 't', long = "thread-id")]
     thread_id: Option<u32>,
 }
 
 fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
-    let opt = Opt::from_args();
+    let opt = Opt::parse();
 
     let data = ProfilingData::new(&opt.file_prefix)?;
 

stack_collapse/Cargo.toml

@@ -8,4 +8,4 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 measureme = { path = "../measureme" }
 analyzeme = { path = "../analyzeme" }
-clap = { version = "3.2", features = ["derive"] }
+clap = { version = "4.5.0", features = ["derive"] }

stack_collapse/src/main.rs

@@ -12,7 +12,7 @@ struct Opt {
 }
 
 fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
-    let opt = Opt::from_args();
+    let opt = Opt::parse();
 
     let profiling_data = ProfilingData::new(&opt.file_prefix)?;
 

summarize/Cargo.toml

@@ -12,4 +12,4 @@ prettytable-rs = "0.10"
 rustc-hash = "1.0.1"
 serde = { version = "1.0", features = [ "derive" ] }
 serde_json = "1.0"
-clap = { version = "3.2", features = ["derive"] }
+clap = { version = "4.5.0", features = ["derive"] }

summarize/src/main.rs

@@ -25,10 +25,10 @@ struct DiffOpt {
     base: PathBuf,
     change: PathBuf,
 
-    #[clap(short = 'e', long = "exclude")]
+    #[arg(short = 'e', long = "exclude")]
     exclude: Vec<String>,
 
-    #[clap(long = "json")]
+    #[arg(long = "json")]
     json: bool,
 }
 
@@ -37,25 +37,25 @@ struct SummarizeOpt {
     file_prefix: PathBuf,
 
     /// Writes the analysis to a json file next to <file_prefix> instead of stdout
-    #[clap(long = "json")]
+    #[arg(long = "json")]
     json: bool,
 
     /// Filter the output to items whose self-time is greater than this value
-    #[clap(short = 'p', long = "percent-above", default_value = "0.0")]
+    #[arg(short = 'p', long = "percent-above", default_value = "0.0")]
     percent_above: f64,
 }
 
 #[derive(Parser, Debug)]
 enum Opt {
     /// Processes a set of trace files with identical events and analyze variance
-    #[clap(name = "aggregate")]
+    #[command(name = "aggregate")]
     Aggregate(AggregateOpt),
 
-    #[clap(name = "diff")]
+    #[command(name = "diff")]
     Diff(DiffOpt),
 
     /// Processes trace files and produces a summary
-    #[clap(name = "summarize")]
+    #[command(name = "summarize")]
     Summarize(SummarizeOpt),
 }
 
@@ -312,7 +312,7 @@ fn summarize(opt: SummarizeOpt) -> Result<(), Box<dyn Error + Send + Sync>> {
 }
 
 fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
-    let opt = Opt::from_args();
+    let opt = Opt::parse();
 
     match opt {
         Opt::Summarize(opt) => summarize(opt),