fix clippy lints for 1.49

UnitedTraders · Feb 11, 2021 · c583efb · c583efb
1 parent 0ff5888
commit c583efb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/src/channel_uri_string_builder.rs b/src/channel_uri_string_builder.rs
@@ -196,7 +196,7 @@ impl ChannelUriStringBuilder {
 
     #[inline]
     pub fn mtu(&mut self, mtu: u32) -> Result<&mut Self, AeronError> {
-        if mtu < 32 || mtu > 65504 {
+        if !(32..=65504).contains(&mtu) {
             return Err(AeronError::IllegalArgumentException(format!(
                 "MTU is not in range 32-65504: {}",
                 mtu

diff --git a/src/concurrent/counters.rs b/src/concurrent/counters.rs
@@ -736,7 +736,7 @@ mod tests {
         let reader = UnsafeBufferPosition::new(reader_buffer, counter_id);
         let writer = UnsafeBufferPosition::new(writer_buffer, counter_id);
 
-        let expected_value = 0xFFFF_FFFFF;
+        let expected_value = 0x000F_FFFF_FFFF;
 
         writer.set_ordered(expected_value);
         assert_eq!(reader.get_volatile(), expected_value);

diff --git a/src/concurrent/logbuffer/term_reader.rs b/src/concurrent/logbuffer/term_reader.rs
@@ -57,9 +57,11 @@ pub fn read(
     header: &mut Header,
     _exception_handler: impl Fn(AeronError),
 ) -> ReadOutcome {
-    let mut outcome = ReadOutcome::default();
-    outcome.fragments_read = 0;
-    outcome.offset = term_offset;
+    let mut outcome = ReadOutcome {
+        offset: term_offset,
+        ..Default::default()
+    };
+
     let capacity = term_buffer.capacity();
 
     while outcome.fragments_read < fragments_limit && term_offset < capacity {

diff --git a/src/image.rs b/src/image.rs
@@ -320,7 +320,7 @@ impl Image {
             let position = self.subscriber_position.get();
             let term_offset: Index = (position as Index) & self.term_length_mask;
             let index = log_buffer_descriptor::index_by_position(position, self.position_bits_to_shift);
-            assert!(index >= 0 && index < log_buffer_descriptor::PARTITION_COUNT);
+            assert!((0..log_buffer_descriptor::PARTITION_COUNT).contains(&index));
             let term_buffer = self.term_buffers[index as usize];
 
             let read_outcome: ReadOutcome = term_reader::read(
@@ -366,7 +366,7 @@ impl Image {
             let initial_position = self.subscriber_position.get();
             let initial_offset = (initial_position & self.term_length_mask as i64) as i32;
             let index = log_buffer_descriptor::index_by_position(initial_position, self.position_bits_to_shift);
-            assert!(index >= 0 && index < log_buffer_descriptor::PARTITION_COUNT);
+            assert!((0..log_buffer_descriptor::PARTITION_COUNT).contains(&index));
 
             let term_buffer = self.term_buffers[index as usize];
             let mut offset = initial_offset as i32;
@@ -436,7 +436,7 @@ impl Image {
             let mut initial_offset: Index = (initial_position as i32) & self.term_length_mask;
             let index = log_buffer_descriptor::index_by_position(initial_position, self.position_bits_to_shift);
 
-            assert!(index >= 0 && index < log_buffer_descriptor::PARTITION_COUNT);
+            assert!((0..log_buffer_descriptor::PARTITION_COUNT).contains(&index));
 
             let term_buffer = self.term_buffers[index as usize];
             let mut resulting_offset: Index = initial_offset;
@@ -524,7 +524,7 @@ impl Image {
             let mut initial_position = self.subscriber_position.get();
             let mut initial_offset: Index = initial_position as Index & self.term_length_mask;
             let index = log_buffer_descriptor::index_by_position(initial_position, self.position_bits_to_shift);
-            assert!(index >= 0 && index < log_buffer_descriptor::PARTITION_COUNT);
+            assert!((0..log_buffer_descriptor::PARTITION_COUNT).contains(&index));
             let term_buffer = self.term_buffers[index as usize];
             let mut resulting_offset: Index = initial_offset;
             let capacity = term_buffer.capacity() as i64;
@@ -612,7 +612,7 @@ impl Image {
             let mut offset: Index = initial_offset;
             let mut position: i64 = initial_position;
             let index: Index = log_buffer_descriptor::index_by_position(initial_position, self.position_bits_to_shift);
-            assert!(index >= 0 && index < log_buffer_descriptor::PARTITION_COUNT);
+            assert!((0..log_buffer_descriptor::PARTITION_COUNT).contains(&index));
             let termb_buffer = self.term_buffers[index as usize];
             let capacity: Index = termb_buffer.capacity();
 
@@ -696,7 +696,7 @@ impl Image {
             let position = self.subscriber_position.get();
             let term_offset = position as Index & self.term_length_mask;
             let index = log_buffer_descriptor::index_by_position(position, self.position_bits_to_shift);
-            assert!(index >= 0 && index < log_buffer_descriptor::PARTITION_COUNT);
+            assert!((0..log_buffer_descriptor::PARTITION_COUNT).contains(&index));
             let term_buffer = self.term_buffers[index as usize];
             let limit_offset: Index = min(term_offset + block_length_limit, term_buffer.capacity());
             let resulting_offset: Index = scan(&term_buffer, term_offset, limit_offset);

diff --git a/src/utils/memory_mapped_file.rs b/src/utils/memory_mapped_file.rs
@@ -189,7 +189,7 @@ mod tests {
             .open(&file_path)
             .unwrap();
 
-        let size = 10000 as Index;
+        let size = 10000;
         tmp_file.set_len(size as u64).unwrap();
 
         {