fix: apply taplo fmt

future-proof-iot · Mar 12, 2024 · f47921f · f47921f
1 parent 713fc08
commit f47921f
Show file tree

Hide file tree

Showing 20 changed files with 64 additions and 43 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,16 +1,16 @@
 [workspace]
 members = [
-    "examples/*",
-    "src/*",
-    "src/lib/*",
-    "src/riot-rs",
-    "src/riot-rs-boards",
-    "src/riot-rs-boards/lm3s6965evb",
-    "src/riot-rs-boards/nrf52",
-    "src/riot-rs-boards/nrf52840dk",
-    "src/riot-rs-boards/nucleo-f401re",
-    "src/riot-rs-chips",
-    "src/riot-rs-macros"
+  "examples/*",
+  "src/*",
+  "src/lib/*",
+  "src/riot-rs",
+  "src/riot-rs-boards",
+  "src/riot-rs-boards/lm3s6965evb",
+  "src/riot-rs-boards/nrf52",
+  "src/riot-rs-boards/nrf52840dk",
+  "src/riot-rs-boards/nucleo-f401re",
+  "src/riot-rs-chips",
+  "src/riot-rs-macros",
 ]
 
 exclude = ["src/lib"]
@@ -26,7 +26,9 @@ repository = "https://github.com/future-proof-iot/riot-rs"
 
 [workspace.dependencies]
 cfg-if = { version = "1.0.0" }
-cortex-m = { version = "0.7", default-features = false, features = [ "inline-asm" ] }
+cortex-m = { version = "0.7", default-features = false, features = [
+  "inline-asm",
+] }
 cortex-m-rt = { version = "0.7" }
 cortex-m-semihosting = { version = "0.5" }
 critical-section = { version = "1.1.2" }
@@ -50,7 +52,7 @@ const_panic = { version = "0.2.8", default_features = false }
 heapless = { version = "0.8.0", default-features = false }
 konst = { version = "0.3.8", default_features = false }
 ld-memory = { version = "0.2.9" }
-static_cell = { version = "2.0.0", features = [ "nightly" ] }
+static_cell = { version = "2.0.0", features = ["nightly"] }
 
 [profile.dev]
 incremental = false

diff --git a/examples/benchmark/Cargo.toml b/examples/benchmark/Cargo.toml
@@ -7,5 +7,5 @@ edition = "2021"
 publish = false
 
 [dependencies]
-riot-rs = { path = "../../src/riot-rs", features = [ "threading" ] }
+riot-rs = { path = "../../src/riot-rs", features = ["threading"] }
 riot-rs-boards = { path = "../../src/riot-rs-boards" }
diff --git a/examples/core-sizes/Cargo.toml b/examples/core-sizes/Cargo.toml
@@ -6,5 +6,5 @@ edition = "2021"
 publish = false
 
 [dependencies]
-riot-rs = { path = "../../src/riot-rs", features = [ "threading" ] }
+riot-rs = { path = "../../src/riot-rs", features = ["threading"] }
 riot-rs-boards = { path = "../../src/riot-rs-boards" }
diff --git a/examples/embassy-http-server/Cargo.toml b/examples/embassy-http-server/Cargo.toml
@@ -13,8 +13,13 @@ embassy-time = { workspace = true, default-features = false }
 embedded-io-async = "0.6.0"
 heapless = { workspace = true }
 httparse = { version = "1.8.0", default-features = false }
-picoserve = { version = "0.8.0", default-features = false, features = ["embassy"] }
-riot-rs = { path = "../../src/riot-rs", features = ["time", "override-network-config"] }
+picoserve = { version = "0.8.0", default-features = false, features = [
+  "embassy",
+] }
+riot-rs = { path = "../../src/riot-rs", features = [
+  "time",
+  "override-network-config",
+] }
 riot-rs-boards = { path = "../../src/riot-rs-boards" }
 serde = { version = "1.0", default-features = false }
 static_cell = { workspace = true }

diff --git a/examples/embassy-net-tcp/Cargo.toml b/examples/embassy-net-tcp/Cargo.toml
@@ -7,9 +7,12 @@ publish = false
 
 [dependencies]
 embassy-executor = { workspace = true, default-features = false }
-embassy-net = { workspace = true, features = ["tcp" ] }
+embassy-net = { workspace = true, features = ["tcp"] }
 embassy-time = { workspace = true, default-features = false }
 embedded-io-async = "0.6.1"
 heapless = { workspace = true }
-riot-rs = { path = "../../src/riot-rs", features = ["time", "override-network-config"] }
+riot-rs = { path = "../../src/riot-rs", features = [
+  "time",
+  "override-network-config",
+] }
 riot-rs-boards = { path = "../../src/riot-rs-boards" }
diff --git a/examples/embassy-net-udp/Cargo.toml b/examples/embassy-net-udp/Cargo.toml
@@ -11,5 +11,8 @@ embassy-net = { workspace = true, features = ["udp"] }
 embassy-time = { workspace = true, default-features = false }
 embedded-io-async = "0.6.1"
 heapless = { workspace = true }
-riot-rs = { path = "../../src/riot-rs", features = ["time", "override-network-config"] }
+riot-rs = { path = "../../src/riot-rs", features = [
+  "time",
+  "override-network-config",
+] }
 riot-rs-boards = { path = "../../src/riot-rs-boards" }
diff --git a/examples/embassy/Cargo.toml b/examples/embassy/Cargo.toml
@@ -9,5 +9,5 @@ publish = false
 embassy-executor = { workspace = true, default-features = false }
 embassy-sync = { workspace = true, default-features = false }
 embassy-time = { workspace = true, default-features = false }
-riot-rs = { path = "../../src/riot-rs", features = [ "threading", "time"] }
+riot-rs = { path = "../../src/riot-rs", features = ["threading", "time"] }
 riot-rs-boards = { path = "../../src/riot-rs-boards" }
diff --git a/examples/hello-world/Cargo.toml b/examples/hello-world/Cargo.toml
@@ -6,5 +6,5 @@ edition.workspace = true
 publish = false
 
 [dependencies]
-riot-rs = { path = "../../src/riot-rs", features = [ "threading" ] }
+riot-rs = { path = "../../src/riot-rs", features = ["threading"] }
 riot-rs-boards = { path = "../../src/riot-rs-boards" }
diff --git a/src/riot-rs-boards/dwm1001/Cargo.toml b/src/riot-rs-boards/dwm1001/Cargo.toml
@@ -12,4 +12,4 @@ cortex-m.workspace = true
 
 riot-rs-rt = { path = "../../riot-rs-rt" }
 
-nrf52 = { path = "../nrf52", features = [ "nrf52832"] }
+nrf52 = { path = "../nrf52", features = ["nrf52832"] }
diff --git a/src/riot-rs-boards/lm3s6965evb/Cargo.toml b/src/riot-rs-boards/lm3s6965evb/Cargo.toml
@@ -5,4 +5,4 @@ authors = ["Kaspar Schleiser <kaspar@schleiser.de>"]
 edition = "2021"
 
 [dependencies]
-riot-rs-rt = { workspace = true, features = [ "cortex-m-semihosting" ] }
+riot-rs-rt = { workspace = true, features = ["cortex-m-semihosting"] }
diff --git a/src/riot-rs-boards/microbit-v2/Cargo.toml b/src/riot-rs-boards/microbit-v2/Cargo.toml
@@ -10,4 +10,4 @@ cortex-m.workspace = true
 
 riot-rs-rt.workspace = true
 
-nrf52 = { path = "../nrf52", features = [ "nrf52840" ] }
+nrf52 = { path = "../nrf52", features = ["nrf52840"] }
diff --git a/src/riot-rs-boards/nrf52840-mdk/Cargo.toml b/src/riot-rs-boards/nrf52840-mdk/Cargo.toml
@@ -12,4 +12,4 @@ cortex-m.workspace = true
 
 riot-rs-rt.workspace = true
 
-nrf52 = { path = "../nrf52", features = [ "nrf52840" ] }
+nrf52 = { path = "../nrf52", features = ["nrf52840"] }
diff --git a/src/riot-rs-boards/nrf52840dk/Cargo.toml b/src/riot-rs-boards/nrf52840dk/Cargo.toml
@@ -10,4 +10,4 @@ cortex-m-rt.workspace = true
 
 riot-rs-rt.workspace = true
 
-nrf52 = { path = "../nrf52", features = [ "nrf52840"] }
+nrf52 = { path = "../nrf52", features = ["nrf52840"] }
diff --git a/src/riot-rs-boards/nrf52dk/Cargo.toml b/src/riot-rs-boards/nrf52dk/Cargo.toml
@@ -10,4 +10,4 @@ cortex-m.workspace = true
 
 riot-rs-rt.workspace = true
 
-nrf52 = { path = "../nrf52", features = [ "nrf52832"] }
+nrf52 = { path = "../nrf52", features = ["nrf52832"] }
diff --git a/src/riot-rs-chips/rp2040/Cargo.toml b/src/riot-rs-chips/rp2040/Cargo.toml
@@ -7,4 +7,4 @@ edition = "2021"
 
 [target.'cfg(context = "rp2040")'.dependencies]
 riot-rs-embassy = { path = "../../riot-rs-embassy" }
-riot-rs-rt = { path = "../../riot-rs-rt", features = [ "rtt-target" ] }
+riot-rs-rt = { path = "../../riot-rs-rt", features = ["rtt-target"] }
diff --git a/src/riot-rs-chips/stm32f4xx/Cargo.toml b/src/riot-rs-chips/stm32f4xx/Cargo.toml
@@ -13,4 +13,4 @@ version = "0.11"
 #features = [ "rt" ]
 
 [features]
-stm32f401 = ["stm32f4xx-hal/stm32f401" ]
+stm32f401 = ["stm32f4xx-hal/stm32f401"]
diff --git a/src/riot-rs-embassy/Cargo.toml b/src/riot-rs-embassy/Cargo.toml
@@ -12,7 +12,10 @@ linkme.workspace = true
 static_cell.workspace = true
 
 embassy-executor = { workspace = true, features = ["nightly"] }
-embassy-net = { workspace = true, optional = true, features = [ "dhcpv4", "medium-ethernet" ] }
+embassy-net = { workspace = true, optional = true, features = [
+  "dhcpv4",
+  "medium-ethernet",
+] }
 embassy-net-driver-channel = { workspace = true, optional = true }
 embassy-sync = { workspace = true }
 embassy-time = { workspace = true, optional = true }
@@ -44,21 +47,17 @@ embassy-nrf = { workspace = true, features = [
 ] }
 
 [target.'cfg(context = "nrf52832")'.dependencies]
-embassy-nrf = { workspace = true, features = [
-  "nrf52832",
-] }
+embassy-nrf = { workspace = true, features = ["nrf52832"] }
 
 [target.'cfg(context = "nrf52840")'.dependencies]
-embassy-nrf = { workspace = true, features = [
-  "nrf52840",
-] }
+embassy-nrf = { workspace = true, features = ["nrf52840"] }
 
 [target.'cfg(context = "rp2040")'.dependencies]
 embassy-rp = { workspace = true, features = [
   "rt",
   "time-driver",
   "unstable-pac",
-#  "unstable-traits",
+  #  "unstable-traits",
 ] }
 
 [features]
@@ -67,7 +66,12 @@ usb = ["dep:embassy-usb"]
 net = ["dep:embassy-net"]
 usb-ethernet = ["usb", "net"]
 
-wifi-cyw43 = ["dep:cyw43", "dep:cyw43-pio", "dep:embassy-net-driver-channel", "net"]
+wifi-cyw43 = [
+  "dep:cyw43",
+  "dep:cyw43-pio",
+  "dep:embassy-net-driver-channel",
+  "net",
+]
 
 threading = ["dep:riot-rs-core"]
 override-network-config = []

diff --git a/src/riot-rs-threads/et-tests/.cargo/config.toml b/src/riot-rs-threads/et-tests/.cargo/config.toml
@@ -1,7 +1,7 @@
 [target.thumbv7m-none-eabi]
 runner = "qemu-system-arm -cpu cortex-m3 -machine lm3s6965evb -nographic -semihosting-config enable=on,target=native -kernel"
 #runner = "qemu-system-arm -cpu cortex-m3 -machine lm3s6965evb -nographic -semihosting-config enable=on,target=native -gdb tcp::3333 -S -kernel"
-rustflags = [ "-C", "link-arg=-Tlink.x" ]
+rustflags = ["-C", "link-arg=-Tlink.x"]
 
 [build]
-target = "thumbv7m-none-eabi"        # Cortex-M3
+target = "thumbv7m-none-eabi" # Cortex-M3
diff --git a/src/riot-rs-threads/et-tests/Cargo.toml b/src/riot-rs-threads/et-tests/Cargo.toml
@@ -16,4 +16,4 @@ panic-semihosting = { version = "0.6.0", features = ["exit"] }
 riot-rs-threads = { path = ".." }
 
 [profile.release]
-debug=true
+debug = true
diff --git a/src/riot-rs/Cargo.toml b/src/riot-rs/Cargo.toml
@@ -27,7 +27,11 @@ no-boards = ["riot-rs-boards/no-boards"]
 override-network-config = ["riot-rs-embassy/override-network-config"]
 override-usb-config = ["riot-rs-embassy/override-usb-config"]
 silent-panic = ["riot-rs-rt/silent-panic"]
-threading = ["dep:riot-rs-threads", "riot-rs-rt/threading", "riot-rs-embassy/threading"]
+threading = [
+  "dep:riot-rs-threads",
+  "riot-rs-rt/threading",
+  "riot-rs-embassy/threading",
+]
 time = ["riot-rs-embassy/time"]
 usb = ["riot-rs-embassy/usb"]
 usb-ethernet = ["riot-rs-embassy/usb-ethernet"]