From 38e467f1c0d9f8a18244745a5cb9b29b91083003 Mon Sep 17 00:00:00 2001
From: "Brandon H. Gomes" <bhgomes@pm.me>
Date: Thu, 3 Nov 2022 11:41:12 -0700
Subject: [PATCH] chore: fix serde-cbor and run cargo-sort

Signed-off-by: Brandon H. Gomes <bhgomes@pm.me>
---
 Cargo.toml             | 2 +-
 evm/Cargo.toml         | 8 ++++----
 insertion/Cargo.toml   | 2 +-
 plonky2/Cargo.toml     | 6 +++---
 starky/Cargo.toml      | 6 +++---
 system_zero/Cargo.toml | 6 +++---
 waksman/Cargo.toml     | 8 ++++----
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index a78d0a96..82fb725e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members = ["field", "insertion", "plonky2", "starky", "system_zero", "util", "waksman", "ecdsa", "u32", "evm", "maybe_rayon"]
+members = ["ecdsa", "evm", "field", "insertion", "maybe_rayon", "plonky2", "starky", "system_zero", "u32", "util", "waksman"]
 
 [profile.release]
 opt-level = 3
diff --git a/evm/Cargo.toml b/evm/Cargo.toml
index 314a2b50..2c9a5ce2 100644
--- a/evm/Cargo.toml
+++ b/evm/Cargo.toml
@@ -5,22 +5,22 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-plonky2 = { path = "../plonky2", default-features = false, features = ["timing"] }
-plonky2_util = { path = "../util" }
-eth_trie_utils = "0.4.0"
 anyhow = "1.0.40"
 env_logger = "0.9.0"
+eth_trie_utils = "0.4.0"
 ethereum-types = "0.14.0"
 hex = { version = "0.4.3", optional = true }
 hex-literal = "0.3.4"
 itertools = "0.10.3"
 keccak-hash = "0.10.0"
 log = "0.4.14"
-num = "0.4.0"
 maybe_rayon = { path = "../maybe_rayon" }
+num = "0.4.0"
 once_cell = "1.13.0"
 pest = "2.1.3"
 pest_derive = "2.1.0"
+plonky2 = { path = "../plonky2", default-features = false, features = ["timing"] }
+plonky2_util = { path = "../util" }
 rand = "0.8.5"
 rand_chacha = "0.3.1"
 ripemd = "0.1.3"
diff --git a/insertion/Cargo.toml b/insertion/Cargo.toml
index 481c2d5d..afaefd4f 100644
--- a/insertion/Cargo.toml
+++ b/insertion/Cargo.toml
@@ -5,5 +5,5 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-plonky2 = { path = "../plonky2" }
 anyhow = "1.0.40"
+plonky2 = { path = "../plonky2" }
diff --git a/plonky2/Cargo.toml b/plonky2/Cargo.toml
index 82b82091..25fe16c7 100644
--- a/plonky2/Cargo.toml
+++ b/plonky2/Cargo.toml
@@ -31,18 +31,18 @@ plonky2_util = { path = "../util", default-features = false }
 rand = { version = "0.8.4", default-features = false }
 rand_chacha = { version = "0.3.1", optional = true, default-features = false }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
-serde_cbor = { version = "0.11.1", default-features = false }
 static_assertions = { version = "1.1.0", default-features = false }
 unroll = { version = "0.1.5", default-features = false }
 
 [dev-dependencies]
-criterion = { version = "0.3.5", default-features = false }
+criterion = { version = "0.4.0", default-features = false }
 env_logger = { version = "0.9.0", default-features = false }
-num_cpus = { version = "1.13.1", default-features = false }
+num_cpus = { version = "1.14.0", default-features = false }
 plonky2 = { path = "." }
 rand = { version = "0.8.4", default-features = false, features = ["getrandom"] }
 rand_chacha = { version = "0.3.1", default-features = false }
 rayon = { version = "1.5.1", default-features = false }
+serde_cbor = { version = "0.11.2" }
 structopt = { version = "0.3.26", default-features = false }
 tynm = { version = "0.1.6", default-features = false }
 
diff --git a/starky/Cargo.toml b/starky/Cargo.toml
index fd39d098..a33d03cf 100644
--- a/starky/Cargo.toml
+++ b/starky/Cargo.toml
@@ -9,10 +9,10 @@ default = ["parallel"]
 parallel = ["plonky2/parallel", "maybe_rayon/parallel"]
 
 [dependencies]
-plonky2 = { path = "../plonky2", default-features = false, features = ["timing"] }
-plonky2_util = { path = "../util" }
-maybe_rayon = { path = "../maybe_rayon"}
 anyhow = "1.0.40"
 env_logger = "0.9.0"
 itertools = "0.10.0"
 log = "0.4.14"
+maybe_rayon = { path = "../maybe_rayon" }
+plonky2 = { path = "../plonky2", default-features = false, features = ["timing"] }
+plonky2_util = { path = "../util" }
diff --git a/system_zero/Cargo.toml b/system_zero/Cargo.toml
index f1cb5729..00765dcc 100644
--- a/system_zero/Cargo.toml
+++ b/system_zero/Cargo.toml
@@ -5,15 +5,15 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-plonky2 = { path = "../plonky2" }
-plonky2_util = { path = "../util" }
-starky = { path = "../starky" }
 anyhow = "1.0.40"
 env_logger = "0.9.0"
 itertools = "0.10.0"
 log = "0.4.14"
+plonky2 = { path = "../plonky2" }
+plonky2_util = { path = "../util" }
 rand = "0.8.4"
 rand_chacha = "0.3.1"
+starky = { path = "../starky" }
 
 [dev-dependencies]
 criterion = "0.3.5"
diff --git a/waksman/Cargo.toml b/waksman/Cargo.toml
index 5aa25dc9..7be3f414 100644
--- a/waksman/Cargo.toml
+++ b/waksman/Cargo.toml
@@ -5,11 +5,11 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
+anyhow = "1.0.40"
+array_tool = "1.0.3"
+bimap = "0.6.1"
+itertools = "0.10.0"
 "plonky2" = { path = "../plonky2" }
 "plonky2_field" = { path = "../field" }
 "plonky2_util" = { path = "../util" }
-anyhow = "1.0.40"
-bimap = "0.6.1"
-itertools = "0.10.0"
 rand = "0.8.4"
-array_tool = "1.0.3"