Skip to content
This repository has been archived by the owner on Jan 30, 2024. It is now read-only.

Commit

Permalink
Fix CI (clippy, changelog)
Browse files Browse the repository at this point in the history
  • Loading branch information
andresovela committed Jul 15, 2023
1 parent 29b5c12 commit 68c941c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p

## [Unreleased]

- [#416] Add support for log_format option for defmt decoder
- [#410] Simplify canary
- [#405] Also enable merge queue for changelog enforcer
- [#404] Switch from bors to merge queue
- [#402] Do not panic if locations do not contain the frame

[#416]: https://github.com/knurling-rs/probe-run/pull/416
[#410]: https://github.com/knurling-rs/probe-run/pull/410
[#405]: https://github.com/knurling-rs/probe-run/pull/405
[#404]: https://github.com/knurling-rs/probe-run/pull/404
Expand Down
2 changes: 1 addition & 1 deletion src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ const HELPER_CMDS: [&str; 3] = ["list_chips", "list_probes", "version"];
pub fn handle_arguments() -> anyhow::Result<i32> {
let opts = Opts::parse();
let verbose = opts.verbose;
let log_format = opts.log_format.as_ref().map(|s| s.as_str());
let log_format = opts.log_format.as_deref();

defmt_decoder::log::init_logger(log_format, opts.json, move |metadata| {
if defmt_decoder::log::is_defmt_frame(metadata) {
Expand Down

0 comments on commit 68c941c

Please sign in to comment.