Skip to content

Commit 12086b1

Browse files
newAMreitermarkus
authored andcommitted
defmt: 0.3 -> 1
1 parent 4b78bc1 commit 12086b1

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ jobs:
165165
run: |
166166
cargo check --target=${{ matrix.target }}
167167
cargo check --target=${{ matrix.target }} --features="portable-atomic-critical-section"
168-
cargo check --target=${{ matrix.target }} --features="ufmt serde defmt-03 mpmc_large"
168+
cargo check --target=${{ matrix.target }} --features="ufmt serde defmt-1 mpmc_large"
169169
170170
doc:
171171
name: doc
@@ -208,7 +208,7 @@ jobs:
208208

209209
- name: cargo rustdoc
210210
env: {"RUSTDOCFLAGS": "-D warnings --cfg docsrs"}
211-
run: cargo rustdoc --target=${{ matrix.target }} --features="ufmt serde defmt-03 mpmc_large portable-atomic-critical-section"
211+
run: cargo rustdoc --target=${{ matrix.target }} --features="ufmt serde defmt-1 mpmc_large portable-atomic-critical-section"
212212

213213
# Run cpass tests
214214
testcpass:

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
4444

4545
### Changed
4646

47+
- Updated defmt from 0.3 to 1.0.1
48+
- Changed the feature name from `defmt-03` to `defmt-1`.
4749
- Changed the error type of these methods from `()` to `CapacityError`.
4850
- `String::push_str`
4951
- `String::push`

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ serde = ["dep:serde"]
3333
# implement ufmt traits.
3434
ufmt = ["dep:ufmt-write"]
3535

36-
# Implement defmt::Format from defmt v0.3
37-
defmt-03 = ["dep:defmt"]
36+
# Implement defmt::Format from defmt v1
37+
defmt-1 = ["dep:defmt"]
3838

3939
# Enable larger MPMC sizes.
4040
mpmc_large = []
@@ -46,7 +46,7 @@ portable-atomic = { version = "1.0", optional = true }
4646
hash32 = "0.3.0"
4747
serde = { version = "1", optional = true, default-features = false }
4848
ufmt-write = { version = "0.1", optional = true }
49-
defmt = { version = ">=0.2.0,<0.4", optional = true }
49+
defmt = { version = "1.0.1", optional = true }
5050

5151
# for the pool module
5252
[target.'cfg(any(target_arch = "arm", target_pointer_width = "32", target_pointer_width = "64"))'.dependencies]
@@ -57,7 +57,7 @@ ufmt = "0.2"
5757
static_assertions = "1.1.0"
5858

5959
[package.metadata.docs.rs]
60-
features = ["ufmt", "serde", "defmt-03", "mpmc_large", "portable-atomic-critical-section"]
60+
features = ["ufmt", "serde", "defmt-1", "mpmc_large", "portable-atomic-critical-section"]
6161
# for the pool module
6262
targets = ["i686-unknown-linux-gnu"]
6363
rustdoc-args = ["--cfg", "docsrs"]

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ mod de;
192192
mod ser;
193193

194194
pub mod binary_heap;
195-
#[cfg(feature = "defmt-03")]
195+
#[cfg(feature = "defmt-1")]
196196
mod defmt;
197197
#[cfg(any(
198198
// assume we have all atomics available if we're using portable-atomic

0 commit comments

Comments
 (0)