Merge branch 'main' into linux-and-mac-compatibility-branched

Author: aimir

.github/workflows/cargo-semver-check.yml

@@ -39,5 +39,5 @@ jobs:
         uses: obi1kenobi/cargo-semver-checks-action@v2
         with:
           manifest-path: firmware/
-          exclude: defmt-semihosting
+          exclude: defmt-semihosting,defmt-test
           # rust-target: thumbv7em-none-eabihf

.github/workflows/ci.yml

@@ -36,7 +36,7 @@ jobs:
         if: matrix.os == 'ubuntu-latest'
         run: sudo apt-get update && sudo apt-get install libudev-dev libusb-1.0-0-dev
       - name: Check that all crates that can be compiled for the host build, check that defmt compiles with different features, run all unit tests on the host
-        run: cargo xtask -d test-host ${{ matrix.toolchain == '1.83' && '--skip-ui-tests' || '' }}
+        run: cargo xtask -d test-host ${{ matrix.toolchain == 'stable' && '--skip-ui-tests' || '' }}
 
   cross:
     strategy:

CHANGELOG.md

@@ -69,6 +69,7 @@ We have several packages which live in this repository. Changes are tracked sepa
 * [#983] Add `Format` implementation for `core::num::Wrapping<T>`
 * [#1022] Re-fix accidental breaking change in `Format` macro
 * [#1041] Ignore RUSTSEC-2026-0009
+* [#1052] Pin UI tests to host MSRV
 
 ### [defmt-v1.0.1] (2025-04-01)
 
@@ -439,6 +440,7 @@ Initial release
 
 ### [defmt-macros-next]
 
+* [#1044]: Add support for `bound` attribute via a `#[defmt(bound(T: MyCustomBound))]`
 * [#956]: Link LICENSE-* in the crate folder
 
 ### [defmt-macros-v1.0.1] (2025-04-01)
@@ -888,7 +890,8 @@ Initial release
 
 ### [defmt-test-next]
 
-* No changes
+* [#1049] Pin trybuild to 1.0.89
+* [#1046] Replace `cortex-m-semihosting` with generic `semihosting` crate to support non-Cortex-M thumb targets
 
 ### [defmt-test-v0.4.0] (2025-04-01)
 
@@ -969,7 +972,7 @@ Initial release
 
 ### [qemu-run-next]
 
-* No changes
+* [#1048] Fixed UART read timeout issue ([#1047])
 
 ### [qemu-run-v0.1.1]
 
@@ -1004,6 +1007,12 @@ Initial release
 
 ---
 
+[#1052]: https://github.com/knurling-rs/defmt/pull/1052
+[#1049]: https://github.com/knurling-rs/defmt/pull/1049
+[#1048]: https://github.com/knurling-rs/defmt/pull/1048
+[#1047]: https://github.com/knurling-rs/defmt/pull/1047
+[#1046]: https://github.com/knurling-rs/defmt/pull/1046
+[#1044]: https://github.com/knurling-rs/defmt/pull/1044
 [#1041]: https://github.com/knurling-rs/defmt/pull/1041
 [#1036]: https://github.com/knurling-rs/defmt/pull/1036
 [#1028]: https://github.com/knurling-rs/defmt/pull/1028

book/src/format.md

@@ -56,6 +56,27 @@ struct Header {
 }
 ```
 
+## `#[derive(Format)]`'s `bound()` attribute
+
+Sometimes, the bounds generated by the `Format` derive can be incorrect for your use-case (ie: using a generic as a flavored ZST).
+
+```rs
+#[derive(Format)]
+struct Foo<T: AssociatedStrType>(T::Str);
+```
+
+will generate a `T: ::defmt::Format` bound over the `Format` implementation even if `T` isn't actually used.
+
+For cases like these you can use the `bound()` attribute:
+
+```rs
+#[derive(Format)]
+#[defmt(bound())] // empties out the default generated bounds
+#[defmt(bound(T::Str: ::defmt::Format))] // overwrites the default generated bounds
+struct Foo<T: AssociatedStrType>(T::Str);
+```
+
+
 ## Manual implementation with `write!`
 
 It is also possible to implement the `Format` trait manually.

defmt/tests/derive-bounds.rs

@@ -1,3 +1,4 @@
+#![allow(dead_code)]
 extern crate defmt as defmt2;
 
 fn main() {
@@ -56,3 +57,25 @@ struct Transparent<T: Foo>(Quux<T>);
 #[defmt(crate = defmt3, crate = defmt2)]
 #[allow(dead_code)]
 struct Variations<T: Foo>(Quux<T>);
+
+struct Flavor;
+
+trait FlavorT {
+    type List<'a, T: 'a + ::defmt::Format>: ::defmt::Format;
+}
+
+impl FlavorT for Flavor {
+    type List<'a, T: 'a + ::defmt::Format> = &'a [T];
+}
+
+#[derive(defmt::Format)]
+#[defmt(bound())] // fixes the compile error from `ui/derive_bound_overflow.rs`
+enum Flavored<F: FlavorT + 'static> {
+    Str(F::List<'static, Self>),
+}
+
+const _: () = {
+    const fn implements_format<T: defmt::Format>() {}
+
+    implements_format::<Flavored<Flavor>>();
+};

defmt/tests/ui/derive-invalid-crate-overwrite.stderr

@@ -18,16 +18,8 @@ error[E0432]: unresolved import `unresolved`
   |
   = note: this error originates in the derive macro `defmt::Format` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0433]: failed to resolve: use of unresolved module or unlinked crate `unresolved`
+error[E0433]: failed to resolve: use of undeclared crate or module `unresolved`
  --> tests/ui/derive-invalid-crate-overwrite.rs:2:17
   |
 2 | #[defmt(crate = unresolved)]
-  |                 ^^^^^^^^^^ use of unresolved module or unlinked crate `unresolved`
-
-error[E0433]: failed to resolve: use of unresolved module or unlinked crate `unresolved`
- --> tests/ui/derive-invalid-crate-overwrite.rs:2:17
-  |
-2 | #[defmt(crate = unresolved)]
-  |                 ^^^^^^^^^^ use of unresolved module or unlinked crate `unresolved`
-  |
-  = help: if you wanted to use a crate named `unresolved`, use `cargo add unresolved` to add it to your `Cargo.toml`
+  |                 ^^^^^^^^^^ use of undeclared crate or module `unresolved`

defmt/tests/ui/derive_bound_overflow.rs

@@ -0,0 +1,23 @@
+struct Flavor;
+
+trait FlavorT {
+    type List<'a, T: 'a + ::defmt::Format>: ::defmt::Format; 
+}
+
+impl FlavorT for Flavor {
+    type List<'a, T: 'a + ::defmt::Format> = &'a [T];
+}
+
+#[derive(defmt::Format)]
+// #[defmt(bound())] // fixes the compile error
+enum Flavored<F: FlavorT + 'static> {
+    Str(F::List<'static, Self>),
+}
+
+const _: () = {
+    const fn implements_format<T: defmt::Format>() {}
+
+    implements_format::<Flavored<Flavor>>(); // overflow by the compiler, can only be fixed by removing the bound
+};
+
+fn main() {}

defmt/tests/ui/derive_bound_overflow.stderr

@@ -0,0 +1,32 @@
+error[E0275]: overflow evaluating the requirement `<F as FlavorT>::List<'static, Flavored<F>>: Format`
+  --> tests/ui/derive_bound_overflow.rs:14:9
+   |
+14 |     Str(F::List<'static, Self>),
+   |         ^^^^^^^^^^^^^^^^^^^^^^
+   |
+note: required for `Flavored<F>` to implement `Format`
+  --> tests/ui/derive_bound_overflow.rs:11:10
+   |
+11 | #[derive(defmt::Format)]
+   |          ^^^^^^^^^^^^^ unsatisfied trait bound introduced in this `derive` macro
+12 | // #[defmt(bound())] // fixes the compile error
+13 | enum Flavored<F: FlavorT + 'static> {
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+note: required by a bound in `FlavorT::List`
+  --> tests/ui/derive_bound_overflow.rs:4:27
+   |
+4  |     type List<'a, T: 'a + ::defmt::Format>: ::defmt::Format;
+   |                           ^^^^^^^^^^^^^^^ required by this bound in `FlavorT::List`
+   = note: this error originates in the derive macro `defmt::Format` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0275]: overflow evaluating the requirement `Flavored<Flavor>: Format`
+  --> tests/ui/derive_bound_overflow.rs:20:5
+   |
+20 |     implements_format::<Flavored<Flavor>>(); // overflow by the compiler, can only be fixed by removing the bound
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+note: required by a bound in `implements_format`
+  --> tests/ui/derive_bound_overflow.rs:18:35
+   |
+18 |     const fn implements_format<T: defmt::Format>() {}
+   |                                   ^^^^^^^^^^^^^ required by this bound in `implements_format`

defmt/tests/ui/derive_removed_bound.rs

@@ -0,0 +1,24 @@
+struct Flavor;
+
+trait FlavorT {
+    type Str; 
+}
+
+impl FlavorT for Flavor {
+    type Str = &'static str;
+}
+
+#[derive(defmt::Format)]
+#[defmt(bound())]
+#[defmt(bound(F: Sized))]
+enum Flavored<F: FlavorT> {
+    Str(F::Str),
+}
+
+const _: () = {
+    const fn implements_format<T: defmt::Format>() {}
+
+    implements_format::<Flavored<Flavor>>();
+};
+
+fn main() {}

defmt/tests/ui/derive_removed_bound.stderr

@@ -0,0 +1,12 @@
+error[E0277]: the trait bound `<F as FlavorT>::Str: Format` is not satisfied
+  --> tests/ui/derive_removed_bound.rs:11:10
+   |
+11 | #[derive(defmt::Format)]
+   |          ^^^^^^^^^^^^^ the trait `Format` is not implemented for `<F as FlavorT>::Str`
+   |
+note: required by a bound in `defmt::export::fmt`
+  --> src/export/mod.rs
+   |
+   | pub fn fmt<T: Format + ?Sized>(f: &T) {
+   |               ^^^^^^ required by this bound in `fmt`
+   = note: this error originates in the derive macro `defmt::Format` (in Nightly builds, run with -Z macro-backtrace for more info)