From 77503b15451a1680868f64c9f8a1644bbdad7211 Mon Sep 17 00:00:00 2001
From: Michael Aaron Murphy <mmstick@pm.me>
Date: Thu, 26 Aug 2021 18:42:54 +0200
Subject: [PATCH] chore: Remove dependency on futures-codec

We were only using it for splitting lines, which is already possible
without it.
---
 Cargo.lock         | 30 ++++++++++++++----------------
 Cargo.toml         |  1 -
 plugins/Cargo.toml |  1 -
 src/codec.rs       |  6 +++---
 4 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f2a5a8b..d5d167b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -323,9 +323,9 @@ dependencies = [
 
 [[package]]
 name = "const_format"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49aad96768495418a04c9349327f32f2cd7e9bf8ac6b142534466048721c8ff5"
+checksum = "59c7d3aa11be45d56befebb10f4a8785fcb62aabddf5f33638efef922e505ec9"
 dependencies = [
  "const_format_proc_macros",
 ]
@@ -821,9 +821,9 @@ dependencies = [
 
 [[package]]
 name = "gtk"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10ae864e5eab8bc8b6b8544ed259eb02dd61b25323b20e777a77aa289c05fd0c"
+checksum = "6603bb79ded6ac6f3bac203794383afa8b1d6a8656d34a93a88f0b22826cd46c"
 dependencies = [
  "atk",
  "bitflags",
@@ -931,9 +931,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
+checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
 
 [[package]]
 name = "lazy_static"
@@ -943,9 +943,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.99"
+version = "0.2.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765"
+checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21"
 
 [[package]]
 name = "locale_config"
@@ -1229,7 +1229,6 @@ dependencies = [
  "blocking",
  "const_format",
  "futures-lite",
- "futures_codec",
  "serde",
  "serde_json",
  "serde_with",
@@ -1254,7 +1253,6 @@ dependencies = [
  "fork",
  "freedesktop-desktop-entry",
  "futures-lite",
- "futures_codec",
  "gtk",
  "human-sort",
  "human_format",
@@ -1496,18 +1494,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.127"
+version = "1.0.129"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8"
+checksum = "d1f72836d2aa753853178eda473a3b9d8e4eefdaf20523b919677e6de489f8f1"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.127"
+version = "1.0.129"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc"
+checksum = "e57ae87ad533d9a56427558b516d0adac283614e347abf85b0dc0cbbf0a249f3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1659,9 +1657,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.74"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c"
+checksum = "b7f58f7e8eaa0009c5fec437aabf511bd9933e4b2d7407bd05273c01a8906ea7"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index 06149c8..801de26 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,6 @@ members = ["bin", "plugins", "service"]
 [dependencies]
 blocking = "1"
 const_format = "0.2"
-futures_codec = "0.4"
 futures-lite = "1"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
diff --git a/plugins/Cargo.toml b/plugins/Cargo.toml
index 2a0ee9c..2c4442c 100644
--- a/plugins/Cargo.toml
+++ b/plugins/Cargo.toml
@@ -9,7 +9,6 @@ publish = false
 async-pidfd = "0.1"
 fork = "0.1"
 freedesktop-desktop-entry = "0.4"
-futures_codec = "0.4"
 futures-lite = "1"
 gtk = "0.14"
 human_format = "1.0"
diff --git a/src/codec.rs b/src/codec.rs
index 2273f86..aca018d 100644
--- a/src/codec.rs
+++ b/src/codec.rs
@@ -1,6 +1,5 @@
 use blocking::Unblock;
-use futures_codec::{FramedRead, LinesCodec};
-use futures_lite::{AsyncRead, Stream, StreamExt};
+use futures_lite::{AsyncBufReadExt, AsyncRead, Stream, StreamExt};
 use serde::Deserialize;
 use std::io;
 
@@ -20,7 +19,8 @@ where
     I: AsyncRead + Unpin + Send,
     S: for<'a> Deserialize<'a>,
 {
-    FramedRead::new(input, LinesCodec)
+    futures_lite::io::BufReader::new(input)
+        .lines()
         .take_while(Result::is_ok)
         .map(Result::unwrap)
         .map(|line| serde_json::from_str::<S>(&line))