Skip to content

Commit bd9c3e2

Browse files
committed
Fix defmt build
1 parent 76d9a7d commit bd9c3e2

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

  • rs-matter/src/pairing

rs-matter/src/pairing/qr.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ where
271271
}
272272

273273
// Can't fail as `emit_chars` generates a valid UTF-8 string
274-
let str = unwrap!(core::str::from_utf8(str_buf));
274+
let str = unwrap!(core::str::from_utf8(str_buf).map_err(|_| ErrorCode::InvalidData));
275275

276276
Ok((str, remaining_buf))
277277
}
@@ -494,7 +494,7 @@ impl<'a> Qr<'a> {
494494
let (str_buf, remaining_buf) = out_buf.split_at_mut(offset);
495495

496496
// Can't fail as `emit_chars` generates a valid UTF-8 string
497-
let str = unwrap!(core::str::from_utf8(str_buf));
497+
let str = unwrap!(core::str::from_utf8(str_buf).map_err(|_| ErrorCode::InvalidData));
498498

499499
Ok((str, remaining_buf))
500500
}
@@ -538,7 +538,7 @@ impl<'a> Qr<'a> {
538538
let (str_buf, remaining_buf) = out_buf.split_at_mut(offset);
539539

540540
// Can't fail as `emit_chars` generates a valid UTF-8 string
541-
let str = unwrap!(core::str::from_utf8(str_buf));
541+
let str = unwrap!(core::str::from_utf8(str_buf).map_err(|_| ErrorCode::InvalidData));
542542

543543
Ok((str, remaining_buf))
544544
}
@@ -721,7 +721,7 @@ impl<'a> QrTextRenderer<'a> {
721721
let (str_buf, remaining_buf) = out_buf.split_at_mut(offset);
722722

723723
// Can't fail as `emit_chars` generates a valid UTF-8 string
724-
let str = unwrap!(core::str::from_utf8(str_buf));
724+
let str = unwrap!(core::str::from_utf8(str_buf).map_err(|_| ErrorCode::InvalidData));
725725

726726
Ok((str, remaining_buf))
727727
}
@@ -763,7 +763,7 @@ impl<'a> QrTextRenderer<'a> {
763763
let (str_buf, remaining_buf) = out_buf.split_at_mut(offset);
764764

765765
// Can't fail as `emit_chars` generates a valid UTF-8 string
766-
let str = unwrap!(core::str::from_utf8(str_buf));
766+
let str = unwrap!(core::str::from_utf8(str_buf).map_err(|_| ErrorCode::InvalidData));
767767

768768
Ok((str, remaining_buf))
769769
}

0 commit comments

Comments
 (0)