Skip to content

Commit b97ab70

Browse files
UrhengulasUrhengulas
authored
Merge pull request #832 from knurling-rs/release
Release `defmt v0.3.7`
2 parents 9f1708d + 037c52d commit b97ab70

11 files changed

Lines changed: 25 additions & 20 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
77

88
## [Unreleased]
99

10+
## [v0.3.7] - 2024-05-13
11+
1012
- [#831]: Fix CI
1113
- [#830]: `book`: Add section about feature-gated derive Format
1214
- [#828]: `defmt-decoder`: Update to `gimli 0.29`
@@ -624,7 +626,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
624626

625627
Initial release
626628

627-
[Unreleased]: https://github.com/knurling-rs/defmt/compare/defmt-v0.3.6...main
629+
[Unreleased]: https://github.com/knurling-rs/defmt/compare/defmt-v0.3.7...main
630+
[v0.3.7]: https://github.com/knurling-rs/defmt/compare/defmt-v0.3.6...defmt-v0.3.7
628631
[v0.3.6]: https://github.com/knurling-rs/defmt/compare/defmt-v0.3.5...defmt-v0.3.6
629632
[v0.3.5]: https://github.com/knurling-rs/defmt/compare/defmt-v0.3.4...defmt-v0.3.5
630633
[v0.3.4]: https://github.com/knurling-rs/defmt/compare/defmt-v0.3.3...defmt-v0.3.4

‎decoder/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
77
name = "defmt-decoder"
88
readme = "../README.md"
99
repository = "https://github.com/knurling-rs/defmt"
10-
version = "0.3.10"
10+
version = "0.3.11"
1111

1212
[dependencies]
1313
byteorder = "1"
@@ -35,7 +35,7 @@ gimli = { version = "0.29", default-features = false, features = [
3535
"read",
3636
"std",
3737
] }
38-
object = { version = "0.32", default-features = false, features = [
38+
object = { version = "0.35", default-features = false, features = [
3939
"read_core",
4040
"elf",
4141
"std",

‎decoder/src/elf2table/mod.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ use std::{
1313
path::{Path, PathBuf},
1414
};
1515

16-
use crate::{BitflagsKey, StringEntry, Table, TableEntry, Tag, DEFMT_VERSIONS};
1716
use anyhow::{anyhow, bail, ensure};
1817
use object::{Object, ObjectSection, ObjectSymbol};
1918

19+
use crate::{BitflagsKey, StringEntry, Table, TableEntry, Tag, DEFMT_VERSIONS};
20+
2021
pub fn parse_impl(elf: &[u8], check_version: bool) -> Result<Option<Table>, anyhow::Error> {
2122
let elf = object::File::parse(elf)?;
2223
// first pass to extract the `_defmt_version`

‎decoder/src/elf2table/symbol.rs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
use crate::Tag;
21
use serde::Deserialize;
32

3+
use crate::Tag;
4+
45
#[derive(Deserialize, PartialEq, Eq, Hash)]
5-
pub struct Symbol {
6+
pub(super) struct Symbol {
67
/// Name of the Cargo package in which the symbol is being instantiated. Used for avoiding
78
/// symbol name collisions.
89
package: String,
@@ -27,12 +28,12 @@ pub struct Symbol {
2728
crate_name: Option<String>,
2829
}
2930

30-
pub enum SymbolTag<'a> {
31+
pub(super) enum SymbolTag {
3132
/// `defmt_*` tag that we can interpret.
3233
Defmt(Tag),
3334

3435
/// Non-`defmt_*` tag for custom tooling.
35-
Custom(&'a str),
36+
Custom(()),
3637
}
3738

3839
impl Symbol {
@@ -41,7 +42,7 @@ impl Symbol {
4142
.map_err(|j| anyhow::anyhow!("failed to demangle defmt symbol `{}`: {}", raw, j))
4243
}
4344

44-
pub fn tag(&self) -> SymbolTag<'_> {
45+
pub fn tag(&self) -> SymbolTag {
4546
match &*self.tag {
4647
"defmt_prim" => SymbolTag::Defmt(Tag::Prim),
4748
"defmt_derived" => SymbolTag::Defmt(Tag::Derived),
@@ -56,7 +57,7 @@ impl Symbol {
5657
"defmt_info" => SymbolTag::Defmt(Tag::Info),
5758
"defmt_warn" => SymbolTag::Defmt(Tag::Warn),
5859
"defmt_error" => SymbolTag::Defmt(Tag::Error),
59-
_ => SymbolTag::Custom(&self.tag),
60+
_ => SymbolTag::Custom(()),
6061
}
6162
}
6263

‎defmt/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ name = "defmt"
1515
readme = "../README.md"
1616
repository = "https://github.com/knurling-rs/defmt"
1717
homepage = "https://knurling.ferrous-systems.com/"
18-
version = "0.3.6"
18+
version = "0.3.7"
1919

2020
[features]
2121
alloc = []

‎firmware/defmt-rtt/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
88
name = "defmt-rtt"
99
readme = "README.md"
1010
repository = "https://github.com/knurling-rs/defmt"
11-
version = "0.4.0"
11+
version = "0.4.1"
1212

1313
[dependencies]
1414
defmt = { version = "0.3", path = "../../defmt" }

‎firmware/panic-probe/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ license = "MIT OR Apache-2.0"
88
name = "panic-probe"
99
readme = "README.md"
1010
repository = "https://github.com/knurling-rs/defmt"
11-
version = "0.3.1"
11+
version = "0.3.2"
1212

1313
[dependencies]
1414
cortex-m = "0.7"
1515
defmt = { version = "0.3", path = "../../defmt", optional = true }
16-
rtt-target = { version = "0.4", optional = true }
16+
rtt-target = { version = "0.5", optional = true }
1717

1818

1919
[features]

‎macros/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
77
name = "defmt-macros"
88
readme = "../README.md"
99
repository = "https://github.com/knurling-rs/defmt"
10-
version = "0.3.7"
10+
version = "0.3.8"
1111

1212
[lib]
1313
proc-macro = true
@@ -26,4 +26,4 @@ syn = { version = "2", features = ["full", "extra-traits"] }
2626
[dev-dependencies]
2727
maplit = "1"
2828
pretty_assertions = "1"
29-
rstest = { version = "0.17", default-features = false }
29+
rstest = { version = "0.19", default-features = false }

‎parser/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ version = "0.3.4"
1313
thiserror = "1.0"
1414

1515
[dev-dependencies]
16-
rstest = { version = "0.17", default-features = false }
16+
rstest = { version = "0.19", default-features = false }
1717

1818
[features]
1919
unstable = []

‎print/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ license = "MIT OR Apache-2.0"
88
name = "defmt-print"
99
readme = "README.md"
1010
repository = "https://github.com/knurling-rs/defmt"
11-
version = "0.3.11"
11+
version = "0.3.12"
1212

1313
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1414

1515
[dependencies]
1616
anyhow = "1"
1717
clap = { version = "4.0", features = ["derive", "env"] }
18-
defmt-decoder = { version = "=0.3.10", path = "../decoder", features = [
18+
defmt-decoder = { version = "=0.3.11", path = "../decoder", features = [
1919
"unstable",
2020
] }
2121
log = "0.4"

0 commit comments

Comments
 (0)