Skip to content

Commit

Permalink
Merge pull request #152 from tonarino/fix-clippy-warnings
Browse files Browse the repository at this point in the history
Fix clippy warnings (casting to the same type)
  • Loading branch information
Y-Nak committed Mar 11, 2023
2 parents 98b4530 + be1710c commit 4341ea0
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 7 deletions.
4 changes: 1 addition & 3 deletions cameleon/src/u3v/register_map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -793,9 +793,7 @@ impl ManifestTable {
let entry_num: u64 = self.read_register(device, (0, 8))?;
let first_entry_addr = self.manifest_address + 8;

Ok((0..entry_num)
.into_iter()
.map(move |i| ManifestEntry::new(first_entry_addr + i * 64)))
Ok((0..entry_num).map(move |i| ManifestEntry::new(first_entry_addr + i * 64)))
}

fn read_register<T, Ctrl: DeviceControl + ?Sized>(
Expand Down
2 changes: 1 addition & 1 deletion cameleon/src/u3v/stream_handle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ fn read_trailer<'a>(
params: &StreamParams,
buf: &'a mut [u8],
) -> StreamResult<u3v_stream::Trailer<'a>> {
let trailer_size = params.trailer_size as usize;
let trailer_size = params.trailer_size;
recv(inner, params, buf, trailer_size)?;

u3v_stream::Trailer::parse(buf)
Expand Down
2 changes: 1 addition & 1 deletion device/src/u3v/protocol/ack.rs
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ impl<'a> ParseScd<'a> for WriteMemStacked {
fn parse(buf: &'a [u8], ccd: &AckCcd) -> Result<Self> {
let mut cursor = Cursor::new(buf);
let mut to_read = ccd.scd_len as usize;
let mut lengths = Vec::with_capacity(to_read as usize / 4);
let mut lengths = Vec::with_capacity(to_read / 4);

while to_read > 0 {
let reserved: u16 = cursor.read_bytes_le()?;
Expand Down
2 changes: 1 addition & 1 deletion genapi/src/masked_int_reg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ impl IInteger for MaskedIntRegNode {
let new_reg_value =
self.bit_mask
.masked_value(old_reg_value, value, length, self.endianness, self.sign)?;
let mut buf = vec![0; length as usize];
let mut buf = vec![0; length];
utils::bytes_from_int(new_reg_value, &mut buf, self.endianness, self.sign)?;
reg.write_and_cache(nid, &buf, device, store, cx)?;

Expand Down
2 changes: 1 addition & 1 deletion impl/tests/macros/wrong_init_array.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ error: literal out of range for `u8`
10 | ProtocolEndianness = &[0xFF, 1000, 0xFF, 0xFF],
| ^^^^
|
= note: `#[deny(overflowing_literals)]` on by default
= note: the literal `1000` does not fit into the type `u8` whose range is `0..=255`
= note: `#[deny(overflowing_literals)]` on by default

0 comments on commit 4341ea0

Please sign in to comment.