Skip to content

Commit 738034e

Browse files
authored
Merge pull request #321 from danieleades/clippy/lossless_conversions
use lossless conversions where available
2 parents d05fedd + 260e3b2 commit 738034e

File tree

6 files changed

+90
-90
lines changed

6 files changed

+90
-90
lines changed

capnp-futures/src/serialize_packed.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@ impl <R> AsyncRead for PackedRead<R> where R: AsyncRead + Unpin {
135135
while ii < outbuf.len() && bitnum < 8
136136
{
137137
let is_nonzero = (buf[0] & (1u8 << bitnum)) != 0;
138-
outbuf[ii] = buf[*buf_pos] & ((-(is_nonzero as i8)) as u8);
138+
outbuf[ii] = buf[*buf_pos] & ((-i8::from(is_nonzero)) as u8);
139139
ii += 1;
140-
*buf_pos += is_nonzero as usize;
140+
*buf_pos += usize::from(is_nonzero);
141141
bitnum += 1;
142142
}
143143
if bitnum == 8 {

capnp/src/private/arena.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ impl <S> ReaderArena for ReaderArenaImpl<S> where S: ReaderSegments {
103103
let (segment_start, segment_len) = self.get_segment(segment_id)?;
104104
let this_start: usize = segment_start as usize;
105105
let this_size: usize = segment_len as usize * BYTES_PER_WORD;
106-
let offset: i64 = offset_in_words as i64 * BYTES_PER_WORD as i64;
106+
let offset: i64 = i64::from(offset_in_words) * BYTES_PER_WORD as i64;
107107
let start_idx = start as usize;
108108
if start_idx < this_start || ((start_idx - this_start) as i64 + offset) as usize > this_size {
109109
Err(Error::failed(String::from("message contained out-of-bounds pointer")))
@@ -219,7 +219,7 @@ impl <A> ReaderArena for BuilderArenaImpl<A> where A: Allocator {
219219
}
220220

221221
fn check_offset(&self, _segment_id: u32, start: *const u8, offset_in_words: i32) -> Result<*const u8> {
222-
unsafe { Ok(start.offset((offset_in_words as i64 * BYTES_PER_WORD as i64) as isize)) }
222+
unsafe { Ok(start.offset((i64::from(offset_in_words) * BYTES_PER_WORD as i64) as isize)) }
223223
}
224224

225225
fn contains_interval(&self, _id: u32, _start: *const u8, _size: usize) -> Result<()> {

0 commit comments

Comments
 (0)