refactor

Byron · May 12, 2021 · 84d1509 · 84d1509
1 parent 1412282
commit 84d1509
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/git-transport/src/client/blocking/request.rs b/git-transport/src/client/blocking/request.rs
@@ -10,7 +10,7 @@ use std::{
 /// A function `f(is_error, text)` receiving progress or error information.
 pub type HandleProgress = Box<dyn FnMut(bool, &[u8])>;
 
-/// A [`Write`] implementation optimized for writing packet lines.
+/// A [`Write`][io::Write] implementation optimized for writing packet lines.
 /// A type implementing `Write` for packet lines, which when done can be transformed into a `Read` for
 /// obtaining the response.
 pub struct RequestWriter<'a> {

diff --git a/git-transport/src/client/mod.rs b/git-transport/src/client/mod.rs
@@ -5,14 +5,16 @@ use bstr::BString;
 use crate::{Protocol, Service};
 
 ///
-pub mod blocking;
+mod blocking;
+pub use blocking::capabilities;
 #[doc(inline)]
 pub use blocking::capabilities::Capabilities;
 #[doc(inline)]
 pub use blocking::connect::connect;
-pub use blocking::git;
+#[cfg(feature = "http-client-curl")]
+pub use blocking::http;
 pub use blocking::request::{ExtendedBufRead, HandleProgress, RequestWriter};
-pub use blocking::{capabilities, http};
+pub use blocking::{file, git, ssh};
 
 #[cfg(feature = "http-client-curl")]
 type HttpError = http::Error;

diff --git a/git-transport/tests/client_blocking/git.rs b/git-transport/tests/client_blocking/git.rs
@@ -7,8 +7,8 @@ use std::{
 
 use bstr::ByteSlice;
 
-use git_transport::client::blocking::git;
 use git_transport::{
+    client::git,
     client::{self, Transport, TransportV2Ext},
     Protocol, Service,
 };
@@ -98,6 +98,7 @@ fn handshake_v1_and_request() -> crate::Result {
                 .push(std::str::from_utf8(data).expect("valid utf8").to_owned())
         }
     })));
+
     let mut pack = Vec::new();
     reader.read_to_end(&mut pack)?;
     assert_eq!(pack.len(), 876, "we receive the whole pack…");

diff --git a/git-transport/tests/client_blocking_http/http/mock.rs b/git-transport/tests/client_blocking_http/http/mock.rs
@@ -6,7 +6,7 @@ use std::{
 
 use bstr::ByteVec;
 
-use git_transport::client::blocking::http;
+use git_transport::client::http;
 use git_transport::client::Transport;
 use git_transport::Protocol;
 

diff --git a/git-transport/tests/client_blocking_http/http/mod.rs b/git-transport/tests/client_blocking_http/http/mod.rs
@@ -8,7 +8,7 @@ use std::{
 
 use bstr::ByteSlice;
 
-use git_transport::client::blocking::http;
+use git_transport::client::http;
 use git_transport::client::Identity;
 use git_transport::{
     client::{self, SetServiceResponse, Transport, TransportV2Ext},