Merge pull request #546 from newAM/defmt-1

defmt: 0.3 -> 1

Author: reitermarkus

.github/workflows/build.yml

@@ -165,7 +165,7 @@ jobs:
         run: |
           cargo check --target=${{ matrix.target }}
           cargo check --target=${{ matrix.target }} --features="portable-atomic-critical-section"
-          cargo check --target=${{ matrix.target }} --features="ufmt serde defmt-03 mpmc_large"
+          cargo check --target=${{ matrix.target }} --features="ufmt serde defmt mpmc_large"
 
   doc:
     name: doc
@@ -208,7 +208,7 @@ jobs:
 
       - name: cargo rustdoc
         env: {"RUSTDOCFLAGS": "-D warnings --cfg docsrs"}
-        run: cargo rustdoc --target=${{ matrix.target }} --features="ufmt serde defmt-03 mpmc_large portable-atomic-critical-section"
+        run: cargo rustdoc --target=${{ matrix.target }} --features="ufmt serde defmt mpmc_large portable-atomic-critical-section"
 
   # Run cpass tests
   testcpass:

CHANGELOG.md

@@ -45,6 +45,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+- Updated defmt from 0.3 to 1.0.1
+  - Changed the feature name from `defmt-03` to `defmt`.
 - Changed the error type of these methods from `()` to `CapacityError`.
   - `String::push_str`
   - `String::push`

Cargo.toml

@@ -33,8 +33,8 @@ serde = ["dep:serde"]
 # implement ufmt traits.
 ufmt = ["dep:ufmt-write"]
 
-# Implement defmt::Format from defmt v0.3
-defmt-03 = ["dep:defmt"]
+# Implement `defmt::Format`.
+defmt = ["dep:defmt"]
 
 # Enable larger MPMC sizes.
 mpmc_large = []
@@ -46,7 +46,7 @@ portable-atomic = { version = "1.0", optional = true }
 hash32 = "0.3.0"
 serde = { version = "1", optional = true, default-features = false }
 ufmt-write = { version = "0.1", optional = true }
-defmt = { version = ">=0.2.0,<0.4", optional = true }
+defmt = { version = "1.0.1", optional = true }
 
 # for the pool module
 [target.'cfg(any(target_arch = "arm", target_pointer_width = "32", target_pointer_width = "64"))'.dependencies]
@@ -57,7 +57,13 @@ ufmt = "0.2"
 static_assertions = "1.1.0"
 
 [package.metadata.docs.rs]
-features = ["ufmt", "serde", "defmt-03", "mpmc_large", "portable-atomic-critical-section"]
+features = [
+  "ufmt",
+  "serde",
+  "defmt",
+  "mpmc_large",
+  "portable-atomic-critical-section",
+]
 # for the pool module
 targets = ["i686-unknown-linux-gnu"]
 rustdoc-args = ["--cfg", "docsrs"]

src/lib.rs

@@ -192,7 +192,7 @@ mod de;
 mod ser;
 
 pub mod binary_heap;
-#[cfg(feature = "defmt-03")]
+#[cfg(feature = "defmt")]
 mod defmt;
 #[cfg(any(
     // assume we have all atomics available if we're using portable-atomic