Showing the changes to git-protocol/src (2 of 3 files). Show all
Unified · Split
| @@ -21,7 +21,7 @@ mod error { · 20 unmodified lines | |||
| 21 | #[allow(missing_docs)] | 21 | #[allow(missing_docs)] |
| 22 | pub enum Error { | 22 | pub enum Error { |
| 23 | #[error(transparent)] | 23 | #[error(transparent)] |
| 24 | Credentials(#[from] credentials::helper::Error), | 24 | Credentials(#[from] credentials::helper::invoke::Error), |
| 25 | #[error(transparent)] | 25 | #[error(transparent)] |
| 26 | Transport(#[from] client::Error), | 26 | Transport(#[from] client::Error), |
| 27 | #[error("The transport didn't accept the advertised server version {actual_version:?} and closed the connection client side")] | 27 | #[error("The transport didn't accept the advertised server version {actual_version:?} and closed the connection client side")] |
| @@ -54,7 +54,7 @@ pub(crate) mod function { · 26 unmodified lines | |||
| 54 | progress: &mut impl Progress, | 54 | progress: &mut impl Progress, |
| 55 | ) -> Result<Outcome, Error> | 55 | ) -> Result<Outcome, Error> |
| 56 | where | 56 | where |
| 57 | AuthFn: FnMut(credentials::helper::Action<'_>) -> credentials::helper::Result, | 57 | AuthFn: FnMut(credentials::helper::Action<'_>) -> credentials::helper::invoke::Result, |
| 58 | T: client::Transport, | 58 | T: client::Transport, |
| 59 | { | 59 | { |
| 60 | let (server_protocol_version, refs, capabilities) = { | 60 | let (server_protocol_version, refs, capabilities) = { |
| @@ -79,7 +79,7 @@ pub(crate) mod function { · 18 unmodified lines | |||
| 79 | drop(result); // needed to workaround this: https://github.com/rust-lang/rust/issues/76149 | 79 | drop(result); // needed to workaround this: https://github.com/rust-lang/rust/issues/76149 |
| 80 | let url = transport.to_url(); | 80 | let url = transport.to_url(); |
| 81 | progress.set_name("authentication"); | 81 | progress.set_name("authentication"); |
| 82 | let credentials::helper::Outcome { identity, next } = | 82 | let credentials::helper::invoke::Outcome { identity, next } = |
| 83 | authenticate(credentials::helper::Action::Fill(url.as_str().into()))? | 83 | authenticate(credentials::helper::Action::Fill(url.as_str().into()))? |
| 84 | .expect("FILL provides an identity"); | 84 | .expect("FILL provides an identity"); |
| 85 | transport.set_identity(identity)?; | 85 | transport.set_identity(identity)?; |
| @@ -53,7 +53,7 @@ pub async fn fetch<F, D, T>( · 52 unmodified lines | |||
| 53 | fetch_mode: FetchConnection, | 53 | fetch_mode: FetchConnection, |
| 54 | ) -> Result<(), Error> | 54 | ) -> Result<(), Error> |
| 55 | where | 55 | where |
| 56 | F: FnMut(credentials::helper::Action<'_>) -> credentials::helper::Result, | 56 | F: FnMut(credentials::helper::Action<'_>) -> credentials::helper::invoke::Result, |
| 57 | D: Delegate, | 57 | D: Delegate, |
| 58 | T: client::Transport, | 58 | T: client::Transport, |
| 59 | { | 59 | { |