Skip to content

Commit

Permalink
Merge #17
Browse files Browse the repository at this point in the history
17: Update to defmt 0.2.0 r=jonas-schievink a=jonas-schievink



Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
  • Loading branch information
bors[bot] and jonas-schievink committed Mar 3, 2021
2 parents 61d7a22 + 7ef8dd9 commit e4fdfd2
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ maintenance = { status = "actively-developed" }

[dependencies]
bitflags = "1.2.1"
defmt = "0.1.3"
defmt = "0.2.0"
vcell = "0.1.2"
nb = "1.0.0"
embedded-can = "0.3"
Expand Down
2 changes: 1 addition & 1 deletion src/frame.rs
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ impl PartialEq for Data {
impl Eq for Data {}

impl Format for Data {
fn format(&self, fmt: &mut defmt::Formatter) {
fn format(&self, fmt: defmt::Formatter<'_>) {
self.as_ref().format(fmt)
}
}
Expand Down
10 changes: 5 additions & 5 deletions testsuite/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ harness = false
bxcan = { path = ".." }
cortex-m = "0.6.3"
cortex-m-rt = "0.6.13"
defmt = "0.1.3"
defmt-rtt = "0.1.0"
defmt-test = "0.1.1"
panic-probe = "0.1.0"
#panic-probe = { version = "0.1.0", features = ["print-defmt"] }
defmt = "0.2.0"
defmt-rtt = "0.2.0"
defmt-test = "0.2.0"
panic-probe = "0.2.0"
#panic-probe = { version = "0.2.0", features = ["print-defmt"] }
# NB: We use F107 here, which seems to share its SVD file with the F105. The difference is that the
# 107 has Ethernet, but we don't use that.
stm32f1 = { version = "0.12.1", features = ["stm32f107"] }
Expand Down

0 comments on commit e4fdfd2

Please sign in to comment.