evie/rs-matter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More idiomatic logic

Browse source
This commit is contained in:
Marcel 2023-01-13 11:40:16 +01:00
parent d11d5e921d
commit 0569cfc771
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
matter/src/codec/base38.rs
View file

@ -55,10 +55,11 @@ pub fn encode(bytes: &[u8], length: usize) -> String {
fn encode_base38(mut value: u32, char_count: u8) -> String { fn encode_base38(mut value: u32, char_count: u8) -> String {
let mut result = String::new(); let mut result = String::new();
let chars = BASE38_CHARS.chars();
for _ in 0..char_count { for _ in 0..char_count {
let mut chars = BASE38_CHARS.chars(); let mut use_chars = chars.clone();
let remainder = value % 38; let remainder = value % 38;
result.push(chars.nth(remainder as usize).unwrap()); result.push(use_chars.nth(remainder as usize).unwrap());
value = (value - remainder) / 38; value = (value - remainder) / 38;
} }
result result

10
matter/src/pairing/qr.rs
View file

@ -492,14 +492,8 @@ fn populate_tlv_bits(
) -> Result<(), Error> { ) -> Result<(), Error> {
if let (Some(data), Some(data_length_in_bytes)) = (tlv_data.data, tlv_data.data_length_in_bytes) if let (Some(data), Some(data_length_in_bytes)) = (tlv_data.data, tlv_data.data_length_in_bytes)
{ {
for pos in 0..data_length_in_bytes { for b in data.iter().take(data_length_in_bytes) {
populate_bits( populate_bits(bits, offset, *b as u64, 8, total_payload_size_in_bits)?;
bits,
offset,
data[pos] as u64,
8,
total_payload_size_in_bits,
)?;
} }
} else { } else {
return Err(Error::InvalidArgument); return Err(Error::InvalidArgument);