Refactor {send,read}_message()

src/browser.rs

@@ -1,7 +1,6 @@
+use std::io::{self, Read, Write};
+
 use serde::Deserialize;
-use std::io;
-use std::io::BufReader;
-use std::io::{Read, Write};
 
 use crate::error::FF2MpvError;
 
@@ -22,23 +21,22 @@ pub fn get_mpv_message() -> Result<FF2MpvMessage, FF2MpvError> {
 }
 
 fn read_message() -> Result<String, io::Error> {
-    let mut stdin = io::stdin();
+    let mut stdin = io::stdin().lock();
-    let mut buf: [u8; 4] = [0; 4];
-    stdin.read_exact(&mut buf)?;
 
-    let length = u32::from_ne_bytes(buf);
+    let mut len = 0_u32.to_ne_bytes();
-    let mut reader = BufReader::new(stdin.take(length as u64));
+    stdin.read_exact(&mut len)?;
+    let len = u32::from_ne_bytes(len);
 
-    let mut string = String::with_capacity(length as usize);
+    let mut msg = String::with_capacity(len as usize);
-    reader.read_to_string(&mut string)?;
+    stdin.take(len as u64).read_to_string(&mut msg)?;
-    Ok(string)
+    Ok(msg)
 }
 
 fn send_message(message: &str) -> Result<(), io::Error> {
     let length = (message.len() as u32).to_ne_bytes();
     let message = message.as_bytes();
 
-    let mut stdout = io::stdout();
+    let mut stdout = io::stdout().lock();
     stdout.write_all(&length)?;
     stdout.write_all(message)?;
     Ok(())