Skip to content

Commit ae140c5

Browse files
authored
Merge pull request #277 from fox0/clippy--comparison_chain
Fix clippy::comparison_chain
2 parents 84095a6 + 9457675 commit ae140c5

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

text/sort.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -223,12 +223,10 @@ fn update_range_field(mut field1: RangeField, mut field2: RangeField) -> (RangeF
223223
/// the second RangeField object based on their field numbers and first characters.
224224
///
225225
fn compare_range_fields(field1: &RangeField, field2: &RangeField) -> bool {
226-
if field1.field_number < field2.field_number {
227-
true
228-
} else if field1.field_number == field2.field_number {
229-
field1.first_character <= field2.first_character
230-
} else {
231-
false
226+
match field1.field_number.cmp(&field2.field_number) {
227+
Ordering::Less => true,
228+
Ordering::Equal => field1.first_character <= field2.first_character,
229+
Ordering::Greater => false,
232230
}
233231
}
234232

users/talk.rs

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -745,6 +745,7 @@ fn handle_character<W: Write>(
745745
handle.flush().unwrap();
746746
Ok(())
747747
}
748+
748749
/// Handles user input from stdin, sending it over a TCP stream.
749750
///
750751
/// # Arguments
@@ -762,18 +763,24 @@ fn handle_stdin_input(
762763
top_line: Arc<Mutex<u16>>,
763764
output_buffer: &mut String,
764765
) -> Result<(), io::Error> {
765-
let mut buffer: [u8; 1] = [0; 1]; // Buffer for raw input
766+
// Buffer for raw input
767+
let mut buffer: [u8; 1] = [0; 1];
766768
let mut line_buffer = String::new();
767769
loop {
768770
// Read one byte from stdin
769771
let result =
770772
unsafe { libc::read(STDIN_FILENO, buffer.as_mut_ptr() as *mut libc::c_void, 1) };
771-
if result < 0 {
772-
eprintln!("Error reading from stdin: {}", io::Error::last_os_error());
773-
break;
774-
} else if result == 0 {
775-
// EOF reached
776-
break;
773+
774+
match result.cmp(&0) {
775+
std::cmp::Ordering::Less => {
776+
eprintln!("Error reading from stdin: {}", io::Error::last_os_error());
777+
break;
778+
}
779+
std::cmp::Ordering::Equal => {
780+
// EOF reached
781+
break;
782+
}
783+
_ => {}
777784
}
778785

779786
let input_char = char::from(buffer[0]);

0 commit comments

Comments
 (0)