refactor

Author: Byron

git-packetline/src/provider/mod.rs

@@ -22,12 +22,12 @@ impl<T> Provider<T>
 where
     T: io::Read,
 {
-    pub fn new(inner: T, delimiter: impl Into<Option<PacketLine<'static>>>) -> Self {
+    pub fn new(inner: T, delimiter: PacketLine<'static>) -> Self {
         Provider {
             inner,
             buf: vec![0; MAX_LINE_LEN],
             peek_buf: Vec::new(),
-            delimiter: delimiter.into().unwrap_or(PacketLine::Flush),
+            delimiter,
             fail_on_err_lines: false,
             is_done: false,
         }

git-packetline/tests/packet_line/reader/mod.rs

@@ -17,7 +17,7 @@ fn first_line() -> PacketLine<'static> {
 }
 #[test]
 fn peek_non_data() -> crate::Result {
-    let mut rd = git_packetline::Provider::new(&b"000000010002"[..], Some(PacketLine::ResponseEnd));
+    let mut rd = git_packetline::Provider::new(&b"000000010002"[..], PacketLine::ResponseEnd);
     assert_eq!(rd.read_line().expect("line")??, PacketLine::Flush);
     assert_eq!(rd.read_line().expect("line")??, PacketLine::Delimiter);
     rd.reset_with(PacketLine::Flush);
@@ -35,15 +35,15 @@ fn peek_non_data() -> crate::Result {
 #[test]
 fn fail_on_err_lines() -> crate::Result {
     let input = b"00010009ERR e0002";
-    let mut rd = git_packetline::Provider::new(&input[..], None);
+    let mut rd = git_packetline::Provider::new(&input[..], PacketLine::Flush);
     assert_eq!(rd.read_line().expect("line")??, PacketLine::Delimiter);
     assert_eq!(
         rd.read_line().expect("line")??.as_bstr(),
         Some(b"ERR e".as_bstr()),
         "by default no special handling"
     );
 
-    let mut rd = git_packetline::Provider::new(&input[..], None);
+    let mut rd = git_packetline::Provider::new(&input[..], PacketLine::Flush);
     rd.fail_on_err_lines(true);
     assert_eq!(rd.read_line().expect("line")??, PacketLine::Delimiter);
     assert_eq!(
@@ -67,7 +67,7 @@ fn fail_on_err_lines() -> crate::Result {
 #[test]
 fn peek() -> crate::Result {
     let bytes = fixture_bytes("v1/fetch/01-many-refs.response");
-    let mut rd = git_packetline::Provider::new(&bytes[..], None);
+    let mut rd = git_packetline::Provider::new(&bytes[..], PacketLine::Flush);
     assert_eq!(rd.peek_line().expect("line")??, first_line(), "peek returns first line");
     assert_eq!(
         rd.peek_line().expect("line")??,
@@ -97,7 +97,7 @@ fn peek() -> crate::Result {
 fn read_from_file_and_reader_advancement() -> crate::Result {
     let mut bytes = fixture_bytes("v1/fetch/01-many-refs.response");
     bytes.extend(fixture_bytes("v1/fetch/01-many-refs.response").into_iter());
-    let mut rd = git_packetline::Provider::new(&bytes[..], None);
+    let mut rd = git_packetline::Provider::new(&bytes[..], PacketLine::Flush);
     assert_eq!(rd.read_line().expect("line")??, first_line());
     assert_eq!(exhaust(&mut rd) + 1, 1561, "it stops after seeing the flush byte");
     rd.reset();

git-packetline/tests/packet_line/reader/read.rs

@@ -1,12 +1,13 @@
 use crate::packet_line::reader::fixture_bytes;
 use bstr::{BString, ByteSlice};
 use git_odb::pack;
+use git_packetline::PacketLine;
 use std::io::{BufRead, Read};
 
 #[test]
 fn read_line_trait_method_reads_one_packet_line_at_a_time() -> crate::Result {
     let buf = fixture_bytes("v1/01-clone.combined-output-no-binary");
-    let mut rd = git_packetline::Provider::new(&buf[..], None);
+    let mut rd = git_packetline::Provider::new(&buf[..], PacketLine::Flush);
 
     let mut out = String::new();
     let mut r = rd.as_read();
@@ -45,7 +46,7 @@ fn read_line_trait_method_reads_one_packet_line_at_a_time() -> crate::Result {
 #[test]
 fn read_pack_with_progress_extraction() -> crate::Result {
     let buf = fixture_bytes("v1/01-clone.combined-output");
-    let mut rd = git_packetline::Provider::new(&buf[..], None);
+    let mut rd = git_packetline::Provider::new(&buf[..], PacketLine::Flush);
 
     // Read without sideband decoding
     let mut out = Vec::new();

git-transport/src/client/git/mod.rs

@@ -1,5 +1,6 @@
 use crate::{client, client::SetServiceResponse, client::WritePacketOnDrop, Protocol, Service};
 use bstr::BString;
+use git_packetline::PacketLine;
 use std::{io, io::Write, net::TcpStream};
 
 pub mod message;
@@ -78,7 +79,7 @@ where
     ) -> Self {
         Connection {
             line_writer: git_packetline::Writer::new(write),
-            line_reader: git_packetline::Provider::new(read, None),
+            line_reader: git_packetline::Provider::new(read, PacketLine::Flush),
             path: repository_path.into(),
             virtual_host: virtual_host.map(|(h, p)| (h.into(), p)),
             version: desired_version,

git-transport/src/client/http/mod.rs

@@ -9,6 +9,7 @@ use std::{
 pub(crate) mod curl;
 
 mod traits;
+use git_packetline::PacketLine;
 pub use traits::{Error, GetResponse, Http, PostResponse};
 
 #[cfg(feature = "http-client-curl")]
@@ -70,7 +71,7 @@ impl<H: Http> client::TransportSketch for Transport<H> {
 
         let line_reader = self
             .line_reader
-            .get_or_insert_with(|| git_packetline::Provider::new(body, None));
+            .get_or_insert_with(|| git_packetline::Provider::new(body, PacketLine::Flush));
 
         let mut announced_service = String::new();
         line_reader.as_read().read_to_string(&mut announced_service)?;