From 4d71f432ad05cd8cce50b13cf6de6a1422f3b401 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Mon, 22 Sep 2025 00:47:08 +0200 Subject: [PATCH] Update manifests to satisfy new checks. --- cyw43-pio/Cargo.toml | 3 +++ embassy-boot-nrf/Cargo.toml | 3 ++- embassy-boot/Cargo.toml | 2 ++ embassy-embedded-hal/Cargo.toml | 1 + embassy-executor/Cargo.toml | 6 ++++++ embassy-futures/Cargo.toml | 4 ++++ embassy-hal-internal/Cargo.toml | 3 +++ embassy-imxrt/Cargo.toml | 2 +- embassy-net-driver-channel/Cargo.toml | 4 ++++ embassy-net-driver/Cargo.toml | 3 +++ embassy-net-enc28j60/Cargo.toml | 4 ++++ embassy-net-wiznet/Cargo.toml | 3 +++ embassy-net/Cargo.toml | 2 ++ embassy-nrf/Cargo.toml | 2 ++ embassy-nxp/Cargo.toml | 1 + embassy-rp/Cargo.toml | 4 ++++ embassy-stm32/Cargo.toml | 4 ++++ embassy-sync/Cargo.toml | 2 ++ embassy-time/Cargo.toml | 5 +++++ embassy-usb-dfu/Cargo.toml | 3 +++ embassy-usb-driver/Cargo.toml | 3 +++ embassy-usb-synopsys-otg/Cargo.toml | 4 ++++ embassy-usb/Cargo.toml | 1 + examples/mimxrt1011/Cargo.toml | 2 +- examples/mimxrt1062-evk/Cargo.toml | 2 +- examples/mimxrt6/Cargo.toml | 2 +- tests/perf-client/Cargo.toml | 1 + tests/perf-server/Cargo.toml | 1 + tests/utils/Cargo.toml | 1 + 29 files changed, 73 insertions(+), 5 deletions(-) diff --git a/cyw43-pio/Cargo.toml b/cyw43-pio/Cargo.toml index 40dd02f61..6ab5c453e 100644 --- a/cyw43-pio/Cargo.toml +++ b/cyw43-pio/Cargo.toml @@ -15,6 +15,9 @@ embassy-rp = { version = "0.8.0", path = "../embassy-rp" } fixed = "1.23.1" defmt = { version = "1.0.1", optional = true } +[features] +defmt = ["dep:defmt"] + [package.metadata.embassy] build = [ {target = "thumbv6m-none-eabi", features = ["embassy-rp/rp2040"]}, diff --git a/embassy-boot-nrf/Cargo.toml b/embassy-boot-nrf/Cargo.toml index 3b631ef0c..49dff061a 100644 --- a/embassy-boot-nrf/Cargo.toml +++ b/embassy-boot-nrf/Cargo.toml @@ -52,6 +52,7 @@ defmt = [ "embassy-boot/defmt", "embassy-nrf/defmt", ] +log = ["dep:log"] softdevice = [ - "nrf-softdevice-mbr", + "dep:nrf-softdevice-mbr", ] diff --git a/embassy-boot/Cargo.toml b/embassy-boot/Cargo.toml index ed0242c13..a18438c81 100644 --- a/embassy-boot/Cargo.toml +++ b/embassy-boot/Cargo.toml @@ -45,6 +45,8 @@ critical-section = { version = "1.1.1", features = ["std"] } ed25519-dalek = { version = "2", default-features = false, features = ["std", "rand_core", "digest"] } [features] +defmt = ["dep:defmt"] +log = ["dep:log"] ed25519-dalek = ["dep:ed25519-dalek", "_verify"] ed25519-salty = ["dep:salty", "_verify"] flash-erase-zero = [] diff --git a/embassy-embedded-hal/Cargo.toml b/embassy-embedded-hal/Cargo.toml index a66e01717..8b8122567 100644 --- a/embassy-embedded-hal/Cargo.toml +++ b/embassy-embedded-hal/Cargo.toml @@ -25,6 +25,7 @@ src_base_git = "https://github.com/embassy-rs/embassy/blob/$COMMIT/embassy-embed target = "x86_64-unknown-linux-gnu" [features] +defmt = ["dep:defmt"] time = ["dep:embassy-time"] [dependencies] diff --git a/embassy-executor/Cargo.toml b/embassy-executor/Cargo.toml index f6dce5c0e..61d060630 100644 --- a/embassy-executor/Cargo.toml +++ b/embassy-executor/Cargo.toml @@ -123,6 +123,12 @@ rustversion = "1.0.21" ## Enable nightly-only features nightly = ["embassy-executor-macros/nightly"] +## Enable defmt logging +defmt = ["dep:defmt"] + +## Enable log logging +log = ["dep:log"] + # Enables turbo wakers, which requires patching core. Not surfaced in the docs by default due to # being an complicated advanced and undocumented feature. # See: https://github.com/embassy-rs/embassy/pull/1263 diff --git a/embassy-futures/Cargo.toml b/embassy-futures/Cargo.toml index 2d62b28e5..07d5219cf 100644 --- a/embassy-futures/Cargo.toml +++ b/embassy-futures/Cargo.toml @@ -26,3 +26,7 @@ features = ["defmt"] [dependencies] defmt = { version = "1.0.1", optional = true } log = { version = "0.4.14", optional = true } + +[features] +defmt = ["dep:defmt"] +log = ["dep:log"] diff --git a/embassy-hal-internal/Cargo.toml b/embassy-hal-internal/Cargo.toml index b4c52ccfa..11dcc2466 100644 --- a/embassy-hal-internal/Cargo.toml +++ b/embassy-hal-internal/Cargo.toml @@ -14,6 +14,9 @@ categories = [ [features] +defmt = ["dep:defmt"] +log = ["dep:log"] + # Define the number of NVIC priority bits. prio-bits-0 = [] prio-bits-1 = [] diff --git a/embassy-imxrt/Cargo.toml b/embassy-imxrt/Cargo.toml index 8a9c1252e..7561640dd 100644 --- a/embassy-imxrt/Cargo.toml +++ b/embassy-imxrt/Cargo.toml @@ -2,7 +2,7 @@ name = "embassy-imxrt" version = "0.1.0" edition = "2021" -license = "MIT" +license = "MIT OR Apache-2.0" description = "Embassy Hardware Abstraction Layer (HAL) for the IMXRT microcontroller" keywords = ["embedded", "async", "imxrt", "rt600", "embedded-hal"] categories = ["embedded", "hardware-support", "no-std", "asynchronous"] diff --git a/embassy-net-driver-channel/Cargo.toml b/embassy-net-driver-channel/Cargo.toml index cf498c59f..1e40c2d87 100644 --- a/embassy-net-driver-channel/Cargo.toml +++ b/embassy-net-driver-channel/Cargo.toml @@ -28,3 +28,7 @@ log = { version = "0.4.14", optional = true } embassy-sync = { version = "0.7.2", path = "../embassy-sync" } embassy-futures = { version = "0.1.2", path = "../embassy-futures" } embassy-net-driver = { version = "0.2.0", path = "../embassy-net-driver" } + +[features] +defmt = ["dep:defmt"] +log = ["dep:log"] diff --git a/embassy-net-driver/Cargo.toml b/embassy-net-driver/Cargo.toml index 34bc6c91a..a36e412ad 100644 --- a/embassy-net-driver/Cargo.toml +++ b/embassy-net-driver/Cargo.toml @@ -23,3 +23,6 @@ features = ["defmt"] [dependencies] defmt = { version = "1.0.1", optional = true } + +[features] +defmt = ["dep:defmt"] diff --git a/embassy-net-enc28j60/Cargo.toml b/embassy-net-enc28j60/Cargo.toml index a3e3285a3..e7bad118b 100644 --- a/embassy-net-enc28j60/Cargo.toml +++ b/embassy-net-enc28j60/Cargo.toml @@ -19,6 +19,10 @@ embassy-futures = { version = "0.1.2", path = "../embassy-futures" } defmt = { version = "1.0.1", optional = true } log = { version = "0.4.14", optional = true } +[features] +defmt = ["dep:defmt", "embassy-net-driver/defmt"] +log = ["dep:log"] + [package.metadata.embassy_docs] src_base = "https://github.com/embassy-rs/embassy/blob/embassy-net-enc28j60-v$VERSION/embassy-net-enc28j60/src/" src_base_git = "https://github.com/embassy-rs/embassy/blob/$COMMIT/embassy-net-enc28j60/src/" diff --git a/embassy-net-wiznet/Cargo.toml b/embassy-net-wiznet/Cargo.toml index 36c349df1..6e6dccebd 100644 --- a/embassy-net-wiznet/Cargo.toml +++ b/embassy-net-wiznet/Cargo.toml @@ -17,6 +17,9 @@ embassy-time = { version = "0.5.0", path = "../embassy-time" } embassy-futures = { version = "0.1.2", path = "../embassy-futures" } defmt = { version = "1.0.1", optional = true } +[features] +defmt = ["dep:defmt", "embassy-net-driver-channel/defmt"] + [package.metadata.embassy_docs] src_base = "https://github.com/embassy-rs/embassy/blob/embassy-net-wiznet-v$VERSION/embassy-net-wiznet/src/" src_base_git = "https://github.com/embassy-rs/embassy/blob/$COMMIT/embassy-net-wiznet/src/" diff --git a/embassy-net/Cargo.toml b/embassy-net/Cargo.toml index 61a2c858a..31ce7e9a6 100644 --- a/embassy-net/Cargo.toml +++ b/embassy-net/Cargo.toml @@ -53,6 +53,8 @@ features = ["defmt", "tcp", "udp", "raw", "dns", "icmp", "dhcpv4", "proto-ipv6", [features] ## Enable defmt defmt = ["dep:defmt", "smoltcp/defmt", "embassy-net-driver/defmt", "embassy-time/defmt", "heapless/defmt-03", "defmt?/ip_in_core"] +## Enable log +log = ["dep:log"] ## Trace all raw received and transmitted packets using defmt or log. packet-trace = [] diff --git a/embassy-nrf/Cargo.toml b/embassy-nrf/Cargo.toml index 4afd28fbd..1af633500 100644 --- a/embassy-nrf/Cargo.toml +++ b/embassy-nrf/Cargo.toml @@ -66,6 +66,8 @@ time = ["dep:embassy-time", "embassy-embedded-hal/time"] ## Enable defmt defmt = ["dep:defmt", "embassy-hal-internal/defmt", "embassy-sync/defmt", "embassy-usb-driver/defmt", "embassy-embedded-hal/defmt"] +## Enable log +log = ["dep:log"] ## Reexport the PAC for the currently enabled chip at `embassy_nrf::pac` (unstable) unstable-pac = [] diff --git a/embassy-nxp/Cargo.toml b/embassy-nxp/Cargo.toml index 455915f29..073fdabe4 100644 --- a/embassy-nxp/Cargo.toml +++ b/embassy-nxp/Cargo.toml @@ -2,6 +2,7 @@ name = "embassy-nxp" version = "0.1.0" edition = "2021" +license = "MIT OR Apache-2.0" publish = false diff --git a/embassy-rp/Cargo.toml b/embassy-rp/Cargo.toml index 101914a36..f6b0900f2 100644 --- a/embassy-rp/Cargo.toml +++ b/embassy-rp/Cargo.toml @@ -45,6 +45,10 @@ rt = [ "rp-pac/rt" ] ## Enable [defmt support](https://docs.rs/defmt) and enables `defmt` debug-log messages and formatting in embassy drivers. defmt = ["dep:defmt", "embassy-usb-driver/defmt", "embassy-hal-internal/defmt"] +## Enable log support +log = ["dep:log"] +## Enable chrono support +chrono = ["dep:chrono"] ## Configure the [`critical-section`](https://docs.rs/critical-section) crate to use an implementation that is safe for multicore use on rp2040. critical-section-impl = ["critical-section/restore-state-u8"] diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml index 6cd8ed262..369fabc50 100644 --- a/embassy-stm32/Cargo.toml +++ b/embassy-stm32/Cargo.toml @@ -225,6 +225,10 @@ defmt = [ "embassy-usb-synopsys-otg/defmt", "stm32-metapac/defmt" ] +## Use log for logging +log = ["dep:log"] +## Enable chrono support +chrono = ["dep:chrono"] exti = [] low-power = [ "dep:embassy-executor", "embassy-executor?/arch-cortex-m", "time" ] diff --git a/embassy-sync/Cargo.toml b/embassy-sync/Cargo.toml index 6494da727..64d76baba 100644 --- a/embassy-sync/Cargo.toml +++ b/embassy-sync/Cargo.toml @@ -27,6 +27,8 @@ src_base_git = "https://github.com/embassy-rs/embassy/blob/$COMMIT/embassy-sync/ target = "thumbv7em-none-eabi" [features] +defmt = ["dep:defmt"] +log = ["dep:log"] std = [] turbowakers = [] diff --git a/embassy-time/Cargo.toml b/embassy-time/Cargo.toml index 2d7c3c1fa..bad6ecf97 100644 --- a/embassy-time/Cargo.toml +++ b/embassy-time/Cargo.toml @@ -31,6 +31,11 @@ target = "x86_64-unknown-linux-gnu" features = ["defmt", "std"] [features] +## Enable defmt +defmt = ["dep:defmt"] +## Enable log +log = ["dep:log"] + ## Display the time since startup next to defmt log messages. ## At most 1 `defmt-timestamp-uptime-*` feature can be used. ## `defmt-timestamp-uptime` is provided for backwards compatibility (provides the same format as `uptime-us`). diff --git a/embassy-usb-dfu/Cargo.toml b/embassy-usb-dfu/Cargo.toml index 4a65c6895..e70ab970e 100644 --- a/embassy-usb-dfu/Cargo.toml +++ b/embassy-usb-dfu/Cargo.toml @@ -49,6 +49,9 @@ esp32c3-hal = { version = "0.13.0", optional = true, default-features = false } dfu = [] application = [] defmt = ["dep:defmt", "embassy-boot/defmt", "embassy-usb/defmt"] +log = ["dep:log"] +cortex-m = ["dep:cortex-m"] +esp32c3-hal = ["dep:esp32c3-hal"] ed25519-dalek = ["embassy-boot/ed25519-dalek", "_verify"] ed25519-salty = ["embassy-boot/ed25519-salty", "_verify"] diff --git a/embassy-usb-driver/Cargo.toml b/embassy-usb-driver/Cargo.toml index de69bf694..6e4c31273 100644 --- a/embassy-usb-driver/Cargo.toml +++ b/embassy-usb-driver/Cargo.toml @@ -21,3 +21,6 @@ features = ["defmt"] [dependencies] embedded-io-async = "0.6.1" defmt = { version = "1", optional = true } + +[features] +defmt = ["dep:defmt"] diff --git a/embassy-usb-synopsys-otg/Cargo.toml b/embassy-usb-synopsys-otg/Cargo.toml index ec518ac93..61b14a215 100644 --- a/embassy-usb-synopsys-otg/Cargo.toml +++ b/embassy-usb-synopsys-otg/Cargo.toml @@ -23,3 +23,7 @@ embassy-usb-driver = { version = "0.2.0", path = "../embassy-usb-driver" } defmt = { version = "1.0.1", optional = true } log = { version = "0.4.14", optional = true } + +[features] +defmt = ["dep:defmt", "embassy-usb-driver/defmt"] +log = ["dep:log"] diff --git a/embassy-usb/Cargo.toml b/embassy-usb/Cargo.toml index e309eec93..bff48c4a6 100644 --- a/embassy-usb/Cargo.toml +++ b/embassy-usb/Cargo.toml @@ -31,6 +31,7 @@ features = ["defmt", "usbd-hid"] [features] defmt = ["dep:defmt", "embassy-usb-driver/defmt"] +log = ["dep:log"] usbd-hid = ["dep:usbd-hid", "dep:ssmarshal"] default = ["usbd-hid"] diff --git a/examples/mimxrt1011/Cargo.toml b/examples/mimxrt1011/Cargo.toml index 488f3167b..3038f5d4d 100644 --- a/examples/mimxrt1011/Cargo.toml +++ b/examples/mimxrt1011/Cargo.toml @@ -2,7 +2,7 @@ name = "embassy-imxrt1011-examples" version = "0.1.0" edition = "2021" -license = "MIT or Apache-2.0" +license = "MIT OR Apache-2.0" publish = false [dependencies] diff --git a/examples/mimxrt1062-evk/Cargo.toml b/examples/mimxrt1062-evk/Cargo.toml index ec6c5c872..82a24490d 100644 --- a/examples/mimxrt1062-evk/Cargo.toml +++ b/examples/mimxrt1062-evk/Cargo.toml @@ -2,7 +2,7 @@ name = "embassy-imxrt1062-evk-examples" version = "0.1.0" edition = "2021" -license = "MIT or Apache-2.0" +license = "MIT OR Apache-2.0" publish = false [dependencies] diff --git a/examples/mimxrt6/Cargo.toml b/examples/mimxrt6/Cargo.toml index 28de9d273..3f7ad8485 100644 --- a/examples/mimxrt6/Cargo.toml +++ b/examples/mimxrt6/Cargo.toml @@ -2,7 +2,7 @@ name = "embassy-imxrt-examples" version = "0.1.0" edition = "2021" -license = "MIT or Apache-2.0" +license = "MIT OR Apache-2.0" publish = false [dependencies] diff --git a/tests/perf-client/Cargo.toml b/tests/perf-client/Cargo.toml index 581b60d6f..c426fdd74 100644 --- a/tests/perf-client/Cargo.toml +++ b/tests/perf-client/Cargo.toml @@ -2,6 +2,7 @@ name = "perf-client" version = "0.1.0" edition = "2021" +license = "MIT OR Apache-2.0" publish = false [dependencies] diff --git a/tests/perf-server/Cargo.toml b/tests/perf-server/Cargo.toml index 22614a33a..f048eade2 100644 --- a/tests/perf-server/Cargo.toml +++ b/tests/perf-server/Cargo.toml @@ -2,6 +2,7 @@ name = "perf-server" version = "0.1.0" edition = "2021" +license = "MIT OR Apache-2.0" publish = false [dependencies] diff --git a/tests/utils/Cargo.toml b/tests/utils/Cargo.toml index f76feaa20..ddb990e0f 100644 --- a/tests/utils/Cargo.toml +++ b/tests/utils/Cargo.toml @@ -2,6 +2,7 @@ name = "test-utils" version = "0.1.0" edition = "2021" +license = "MIT OR Apache-2.0" publish = false [dependencies]