From 7a04933d22805adeea4d5c8bedb026ae9dbdb363 Mon Sep 17 00:00:00 2001 From: Chandrakana Nandi Date: Mon, 31 Jan 2022 10:02:06 -0800 Subject: [PATCH] update clap --- Cargo.toml | 3 ++- src/lib.rs | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index fa6c89e8..3b267d47 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,8 @@ libm = "0.2.1" float-cmp = "0.8.0" lazy_static = "1.4.0" itertools = "0.9.0" -clap = "3.0.0-beta.2" +clap = { version = "3.0.7", features = ["derive"] } +#clap = "3.0.0-beta.2" z3 = {version="0.10.0", features = ["static-link-z3"]} # z3 = {version="0.10.0"} rustc-hash = "1" diff --git a/src/lib.rs b/src/lib.rs index 3bc058ae..363872c2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -5,7 +5,7 @@ It uses equality saturation in two novel ways to scale the rule synthesis: currently in the ruleset. !*/ -use clap::Clap; +use clap::Parser; use egg::*; use rand::SeedableRng; use rand_pcg::Pcg64; @@ -633,7 +633,7 @@ struct SlimReport { } /// All parameters for rule synthesis. -#[derive(Clap, Deserialize, Serialize)] +#[derive(Parser, Deserialize, Serialize)] #[clap(rename_all = "kebab-case")] pub struct SynthParams { /// Seed for random number generator, used for random cvec value generation @@ -723,7 +723,7 @@ pub struct SynthParams { } /// Derivability report. -#[derive(Clap)] +#[derive(Parser)] #[clap(rename_all = "kebab-case")] pub struct DeriveParams { in1: String, @@ -734,7 +734,7 @@ pub struct DeriveParams { } /// Report for rules generated by CVC4. -#[derive(Clap)] +#[derive(Parser)] #[clap(rename_all = "kebab-case")] pub struct ConvertParams { cvc_log: String, @@ -743,7 +743,7 @@ pub struct ConvertParams { /// Ruler can be run to synthesize rules, compare two rulesets /// for derivability, and convert CVC4 rewrites to patterns in Ruler. -#[derive(Clap)] +#[derive(Parser)] #[clap(rename_all = "kebab-case")] pub enum Command { Synth(SynthParams),