From 67bd5837cdc3a83684f0f781dae0334a72ce9329 Mon Sep 17 00:00:00 2001
From: Jesse Braham <jesse@beta7.io>
Date: Thu, 5 May 2022 11:56:43 +0200
Subject: [PATCH] Make cargo manifests consistent and bump dependencies

---
 esp-hal-common/Cargo.toml     | 10 ++++------
 esp-hal-procmacros/Cargo.toml |  2 +-
 esp32-hal/Cargo.toml          | 14 +++++++-------
 esp32c3-hal/Cargo.toml        | 21 ++++++++++-----------
 esp32s2-hal/Cargo.toml        | 14 +++++++-------
 esp32s3-hal/Cargo.toml        | 14 +++++++-------
 6 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/esp-hal-common/Cargo.toml b/esp-hal-common/Cargo.toml
index b7d2f1042..ebbb7ac36 100644
--- a/esp-hal-common/Cargo.toml
+++ b/esp-hal-common/Cargo.toml
@@ -19,14 +19,12 @@ procmacros   = { path = "../esp-hal-procmacros", package = "esp-hal-procmacros"
 void         = { version = "1.0", default-features = false }
 
 # RISC-V
-riscv                       = { version = "0.8.0", optional = true }
+riscv                       = { version = "0.8", optional = true }
 riscv-atomic-emulation-trap = { version = "0.1", optional = true }
 
 # Xtensa
-xtensa-lx = { version = "0.7.0", optional = true }
-
-# Xtensa Runtime
-xtensa-lx-rt = { version = "0.11.0", optional = true }
+xtensa-lx    = { version = "0.7",  optional = true }
+xtensa-lx-rt = { version = "0.11", optional = true }
 
 # Part of `ufmt` containing only `uWrite` trait
 ufmt-write = { version = "0.1", optional = true }
@@ -41,7 +39,7 @@ esp32s2_pac = { package = "esp32s2", git = "https://github.com/esp-rs/esp-pacs.g
 esp32s3_pac = { package = "esp32s3", git = "https://github.com/esp-rs/esp-pacs.git", branch = "with_source", optional = true }
 
 [features]
-esp32   = [  "esp32_pac/rt", "xtensa",   "dual_core", "xtensa-lx-rt/esp32", "xtensa-lx/esp32"]
+esp32   = [  "esp32_pac/rt", "xtensa",   "dual_core", "xtensa-lx-rt/esp32",   "xtensa-lx/esp32"]
 esp32c3 = ["esp32c3_pac/rt", "risc_v", "single_core"]
 esp32s2 = ["esp32s2_pac/rt", "xtensa", "single_core", "xtensa-lx-rt/esp32s2", "xtensa-lx/esp32s2"]
 esp32s3 = ["esp32s3_pac/rt", "xtensa",   "dual_core", "xtensa-lx-rt/esp32s3", "xtensa-lx/esp32s3"]
diff --git a/esp-hal-procmacros/Cargo.toml b/esp-hal-procmacros/Cargo.toml
index 4dda205de..f1ba3a65c 100644
--- a/esp-hal-procmacros/Cargo.toml
+++ b/esp-hal-procmacros/Cargo.toml
@@ -16,7 +16,7 @@ proc-macro = true
 [dependencies]
 quote = "1.0"
 proc-macro2 = "1.0"
-darling = "0.10"
+darling = "0.14"
 syn = {version = "1.0", features = ["extra-traits", "full"]}
 proc-macro-error = "1.0.4"
 
diff --git a/esp32-hal/Cargo.toml b/esp32-hal/Cargo.toml
index 75aec29d0..c381f1ddd 100644
--- a/esp32-hal/Cargo.toml
+++ b/esp32-hal/Cargo.toml
@@ -25,20 +25,20 @@ categories = [
 
 [dependencies]
 bare-metal   = "1.0"
-embedded-hal = { version = "0.2", features = ["unproven"] }
+embedded-hal = { version = "0.2",  features = ["unproven"] }
 nb           = "1.0"
-void         = { version = "1.0", default-features = false }
-xtensa-lx    = { version = "0.7.0", features = ["esp32"] }
-xtensa-lx-rt = { version = "0.11.0", features = ["esp32"], optional = true }
+void         = { version = "1.0",  default-features = false }
+xtensa-lx    = { version = "0.7",  features = ["esp32"] }
+xtensa-lx-rt = { version = "0.11", features = ["esp32"], optional = true }
 
 [dependencies.esp-hal-common]
 path     = "../esp-hal-common"
 features = ["esp32"]
 
 [dev-dependencies]
-panic-halt = "0.2"
-ssd1306 = "0.7.0"
-embedded-graphics = "0.7.1"
+embedded-graphics = "0.7"
+panic-halt        = "0.2"
+ssd1306           = "0.7"
 
 [features]
 default = ["rt"]
diff --git a/esp32c3-hal/Cargo.toml b/esp32c3-hal/Cargo.toml
index 1b3e862ee..00f82a629 100644
--- a/esp32c3-hal/Cargo.toml
+++ b/esp32c3-hal/Cargo.toml
@@ -24,23 +24,22 @@ categories = [
 ]
 
 [dependencies]
-bare-metal                  = "1.0"
-embedded-hal                = { version = "0.2", features = ["unproven"] }
-nb                          = "1.0"
-riscv                       = "0.8.0"
-riscv-rt                    = { version = "0.8.1", optional = true }
-void                        = { version = "1.0", default-features = false }
-r0                          = "1.0.0"
-riscv-atomic-emulation-trap = "0.1.0"
+bare-metal   = "1.0"
+embedded-hal = { version = "0.2", features = ["unproven"] }
+nb           = "1.0"
+r0           = "1.0.0"
+riscv        = "0.8.0"
+riscv-rt     = { version = "0.8", optional = true }
+void         = { version = "1.0", default-features = false }
 
 [dependencies.esp-hal-common]
 path     = "../esp-hal-common"
 features = ["esp32c3"]
 
 [dev-dependencies]
-panic-halt = "0.2"
-ssd1306 = "0.7.0"
-embedded-graphics = "0.7.1"
+embedded-graphics = "0.7"
+panic-halt        = "0.2"
+ssd1306           = "0.7"
 
 [features]
 default     = ["rt"]
diff --git a/esp32s2-hal/Cargo.toml b/esp32s2-hal/Cargo.toml
index 3af005b40..1bde0f704 100644
--- a/esp32s2-hal/Cargo.toml
+++ b/esp32s2-hal/Cargo.toml
@@ -25,20 +25,20 @@ categories = [
 
 [dependencies]
 bare-metal   = "1.0"
-embedded-hal = { version = "0.2", features = ["unproven"] }
+embedded-hal = { version = "0.2",  features = ["unproven"] }
 nb           = "1.0"
-void         = { version = "1.0", default-features = false }
-xtensa-lx    = { version = "0.7.0", features = ["esp32s2"] }
-xtensa-lx-rt = { version = "0.11.0", features = ["esp32s2"], optional = true }
+void         = { version = "1.0",  default-features = false }
+xtensa-lx    = { version = "0.7",  features = ["esp32s2"] }
+xtensa-lx-rt = { version = "0.11", features = ["esp32s2"], optional = true }
 
 [dependencies.esp-hal-common]
 path     = "../esp-hal-common"
 features = ["esp32s2"]
 
 [dev-dependencies]
-panic-halt = "0.2"
-ssd1306 = "0.7.0"
-embedded-graphics = "0.7.1"
+embedded-graphics = "0.7"
+panic-halt        = "0.2"
+ssd1306           = "0.7"
 
 [features]
 default = ["rt"]
diff --git a/esp32s3-hal/Cargo.toml b/esp32s3-hal/Cargo.toml
index 2382a60dc..8f5edaec1 100644
--- a/esp32s3-hal/Cargo.toml
+++ b/esp32s3-hal/Cargo.toml
@@ -25,20 +25,20 @@ categories = [
 
 [dependencies]
 bare-metal   = "1.0"
-embedded-hal = { version = "0.2", features = ["unproven"] }
+embedded-hal = { version = "0.2",  features = ["unproven"] }
 nb           = "1.0"
-void         = { version = "1.0", default-features = false }
-xtensa-lx    = { version = "0.7.0", features = ["esp32s3"] }
-xtensa-lx-rt = { version = "0.11.0", features = ["esp32s3"], optional = true }
+void         = { version = "1.0",  default-features = false }
+xtensa-lx    = { version = "0.7",  features = ["esp32s3"] }
+xtensa-lx-rt = { version = "0.11", features = ["esp32s3"], optional = true }
 
 [dependencies.esp-hal-common]
 path     = "../esp-hal-common"
 features = ["esp32s3"]
 
 [dev-dependencies]
-panic-halt = "0.2"
-ssd1306 = "0.7.0"
-embedded-graphics = "0.7.1"
+embedded-graphics = "0.7"
+panic-halt        = "0.2"
+ssd1306           = "0.7"
 
 [features]
 default = ["rt"]