From 343ee23601e13e4bf95c04ffe73426f993ef9324 Mon Sep 17 00:00:00 2001 From: Finn Hermeling Date: Tue, 4 Apr 2023 19:48:29 +0200 Subject: [PATCH 1/6] Bump wire version --- defmt/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defmt/src/lib.rs b/defmt/src/lib.rs index 0bdfa053..4e86483c 100644 --- a/defmt/src/lib.rs +++ b/defmt/src/lib.rs @@ -30,7 +30,7 @@ extern crate alloc; #[used] #[cfg_attr(target_os = "macos", link_section = ".defmt,end.VERSION")] #[cfg_attr(not(target_os = "macos"), link_section = ".defmt.end")] -#[export_name = "_defmt_version_ = 3"] +#[export_name = "_defmt_version_ = 4"] static DEFMT_VERSION: u8 = 0; #[used] From 0e92d3a88aa472377b964979f522829d961d8986 Mon Sep 17 00:00:00 2001 From: Urhengulas Date: Wed, 5 Apr 2023 13:24:00 +0200 Subject: [PATCH 2/6] `defmt-decoder`: Bump wire version --- decoder/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/decoder/src/lib.rs b/decoder/src/lib.rs index 05cfd22b..1a2f0a9a 100644 --- a/decoder/src/lib.rs +++ b/decoder/src/lib.rs @@ -10,7 +10,7 @@ #![cfg_attr(docsrs, doc(cfg(unstable)))] #![doc(html_logo_url = "https://knurling.ferrous-systems.com/knurling_logo_light_text.svg")] -pub const DEFMT_VERSION: &str = "3"; +pub const DEFMT_VERSION: &str = "4"; mod decoder; mod elf2table; From e9108a4548e637c6ca6d4473cabddefb961977c0 Mon Sep 17 00:00:00 2001 From: Urhengulas Date: Wed, 5 Apr 2023 13:26:30 +0200 Subject: [PATCH 3/6] Update `CHANGELOG.md` --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80049266..7a58fc25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] +- [#747]: Bump wire version + +[#747]: https://github.com/knurling-rs/defmt/pull/747 + ## [v0.3.3] - 2023-03-29 - [#745]: Release `defmt-v0.3.3`, `defmt-decoder-v0.3.5`, `defmt-macros v0.3.4`, `defmt-parser v0.3.2`, `defmt-print v0.3.5` and `panic-probe v0.3.1` From d38595ecf43c3038f5e89e12484134b7707830fd Mon Sep 17 00:00:00 2001 From: Urhengulas Date: Wed, 5 Apr 2023 13:38:51 +0200 Subject: [PATCH 4/6] `defmt-decoder`: Refine version mismatch error message --- decoder/src/elf2table/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/decoder/src/elf2table/mod.rs b/decoder/src/elf2table/mod.rs index 749f2927..230eb26d 100644 --- a/decoder/src/elf2table/mod.rs +++ b/decoder/src/elf2table/mod.rs @@ -220,7 +220,7 @@ pub fn parse_impl(elf: &[u8], check_version: bool) -> Result, anyh fn check_version(version: &str) -> Result<(), String> { if version != DEFMT_VERSION { let msg = format!( - "defmt wire format version mismatch: firmware is using {}, `probe-run` supports {}\nsuggestion: `cargo install` a different version of `probe-run` that supports defmt {}", + "defmt wire format version mismatch: firmware is using {}, `probe-run` supports {}\nsuggestion: use a newer version of `defmt` or `cargo install` a different version of `probe-run` that supports defmt {}", version, DEFMT_VERSION, version ); From 7a80fc145baa015627b07c7b27aa2e0392a1f802 Mon Sep 17 00:00:00 2001 From: Urhengulas Date: Wed, 5 Apr 2023 13:42:59 +0200 Subject: [PATCH 5/6] `CI`: Bump backcombat version --- xtask/src/backcompat.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xtask/src/backcompat.rs b/xtask/src/backcompat.rs index 9e1cdbe0..0c7a1eca 100644 --- a/xtask/src/backcompat.rs +++ b/xtask/src/backcompat.rs @@ -40,8 +40,8 @@ use crate::{ALL_ERRORS, ALL_SNAPSHOT_TESTS, SNAPSHOT_TESTS_DIRECTORY}; const DISABLED: bool = false; // use this format: PR - -// PR #569 - defmt::println! -const REVISION_UNDER_TEST: &str = "8a6e8eebe40f943d9b0ba8725cd6da033b9c399e"; +// PR #742 - Adds `crate_name` to `Symbol` +const REVISION_UNDER_TEST: &str = "c16f1b79d730749e1ca21c17e7fa27385e0f5b7d"; // the target name is in `firmware/qemu/.cargo/config.toml` but it'd be hard to extract it from that file const RUNNER_ENV_VAR: &str = "CARGO_TARGET_THUMBV7M_NONE_EABI_RUNNER"; From 22ef5bf37f0fbb732a6e8f3cbefbab24ad691e9e Mon Sep 17 00:00:00 2001 From: Urhengulas Date: Wed, 5 Apr 2023 13:52:50 +0200 Subject: [PATCH 6/6] CI: Fix --- xtask/src/backcompat.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xtask/src/backcompat.rs b/xtask/src/backcompat.rs index 0c7a1eca..202e316b 100644 --- a/xtask/src/backcompat.rs +++ b/xtask/src/backcompat.rs @@ -40,8 +40,8 @@ use crate::{ALL_ERRORS, ALL_SNAPSHOT_TESTS, SNAPSHOT_TESTS_DIRECTORY}; const DISABLED: bool = false; // use this format: PR - -// PR #742 - Adds `crate_name` to `Symbol` -const REVISION_UNDER_TEST: &str = "c16f1b79d730749e1ca21c17e7fa27385e0f5b7d"; +// PR #747 - Bump wire format +const REVISION_UNDER_TEST: &str = "0e92d3a88aa472377b964979f522829d961d8986"; // the target name is in `firmware/qemu/.cargo/config.toml` but it'd be hard to extract it from that file const RUNNER_ENV_VAR: &str = "CARGO_TARGET_THUMBV7M_NONE_EABI_RUNNER";