From 9457675320278121bfbf8f283ba63c85646c09e7 Mon Sep 17 00:00:00 2001 From: fox0 <15684995+fox0@users.noreply.github.com> Date: Sun, 29 Sep 2024 13:11:23 +0700 Subject: [PATCH] Fix clippy::comparison_chain --- text/sort.rs | 10 ++++------ users/talk.rs | 21 ++++++++++++++------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/text/sort.rs b/text/sort.rs index 3e83d8ee..33dbb7f1 100644 --- a/text/sort.rs +++ b/text/sort.rs @@ -223,12 +223,10 @@ fn update_range_field(mut field1: RangeField, mut field2: RangeField) -> (RangeF /// the second RangeField object based on their field numbers and first characters. /// fn compare_range_fields(field1: &RangeField, field2: &RangeField) -> bool { - if field1.field_number < field2.field_number { - true - } else if field1.field_number == field2.field_number { - field1.first_character <= field2.first_character - } else { - false + match field1.field_number.cmp(&field2.field_number) { + Ordering::Less => true, + Ordering::Equal => field1.first_character <= field2.first_character, + Ordering::Greater => false, } } diff --git a/users/talk.rs b/users/talk.rs index d9c0703b..d17b9662 100644 --- a/users/talk.rs +++ b/users/talk.rs @@ -745,6 +745,7 @@ fn handle_character( handle.flush().unwrap(); Ok(()) } + /// Handles user input from stdin, sending it over a TCP stream. /// /// # Arguments @@ -762,18 +763,24 @@ fn handle_stdin_input( top_line: Arc>, output_buffer: &mut String, ) -> Result<(), io::Error> { - let mut buffer: [u8; 1] = [0; 1]; // Buffer for raw input + // Buffer for raw input + let mut buffer: [u8; 1] = [0; 1]; let mut line_buffer = String::new(); loop { // Read one byte from stdin let result = unsafe { libc::read(STDIN_FILENO, buffer.as_mut_ptr() as *mut libc::c_void, 1) }; - if result < 0 { - eprintln!("Error reading from stdin: {}", io::Error::last_os_error()); - break; - } else if result == 0 { - // EOF reached - break; + + match result.cmp(&0) { + std::cmp::Ordering::Less => { + eprintln!("Error reading from stdin: {}", io::Error::last_os_error()); + break; + } + std::cmp::Ordering::Equal => { + // EOF reached + break; + } + _ => {} } let input_char = char::from(buffer[0]);