From 2ce35b42af2dd849bb2c4a41500b4e6c2ed45485 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Oct 2022 18:08:43 +0000
Subject: [PATCH 1/2] build(deps): update clap requirement from 3.0.7 to 4.0.7

Updates the requirements on [clap](https://github.com/clap-rs/clap) to permit the latest version.
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v3.1.0...v4.0.7)

---
updated-dependencies:
- dependency-name: clap
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 skia-org/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/skia-org/Cargo.toml b/skia-org/Cargo.toml
index 706d2b12f..97f5569f5 100644
--- a/skia-org/Cargo.toml
+++ b/skia-org/Cargo.toml
@@ -40,7 +40,7 @@ offscreen_gl_context = { git = "https://github.com/rust-skia/rust-offscreen-rend
 # sparkle 0.1.9 fails to compile on macOS targeting aarch64-linux-android
 # sparkle 0.1.25 is incompatible with offscreen_gl_context
 sparkle = { version = "=0.1.24", optional = true }
-clap = { version = "3.0.7", features = ["derive"] }
+clap = { version = "4.0.7", features = ["derive"] }
 ash = { version = "0.37.0", optional = true }
 # need to rename the package because of the feature with the same name.
 metal-rs = { package = "metal", version = "0.23.0", optional = true }

From 08f3d8331099f60fa2554e7e5b9c9bf0245fa5ff Mon Sep 17 00:00:00 2001
From: Armin Sander <armin@replicator.org>
Date: Wed, 5 Oct 2022 17:03:42 +0200
Subject: [PATCH 2/2] skia-org: Port to clap 4

---
 skia-org/src/drivers.rs | 4 ++--
 skia-org/src/main.rs    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/skia-org/src/drivers.rs b/skia-org/src/drivers.rs
index f003c8937..0b96b80b3 100644
--- a/skia-org/src/drivers.rs
+++ b/skia-org/src/drivers.rs
@@ -1,4 +1,4 @@
-use clap::ArgEnum;
+use clap::ValueEnum;
 use skia_safe::Canvas;
 use std::{fmt::Display, path::Path, str::FromStr};
 
@@ -42,7 +42,7 @@ pub trait DrawingDriver {
     }
 }
 
-#[derive(Copy, Clone, PartialEq, Eq, Debug, ArgEnum)]
+#[derive(Copy, Clone, PartialEq, Eq, Debug, ValueEnum)]
 pub enum Driver {
     Cpu,
     Pdf,
diff --git a/skia-org/src/main.rs b/skia-org/src/main.rs
index 61df9fdd4..3c3523497 100644
--- a/skia-org/src/main.rs
+++ b/skia-org/src/main.rs
@@ -33,7 +33,7 @@ struct Arguments {
     out_path: PathBuf,
     #[clap(
         long,
-        arg_enum,
+        value_enum,
         help = "In addition with the CPU, render with the given driver."
     )]
     driver: Vec<Driver>,