adjust to changes in `git-credentials` (#450)

Sebastian Thiel committed 4 years ago

Commit 40cc1dc1 parent 71f65193 files · +5 −5Browse files

Unified · Split

3 files

@@ -21,7 +21,7 @@ mod error { · 20 unmodified lines
21	21	#[allow(missing_docs)]
22	22	pub enum Error {
23	23	#[error(transparent)]
24		− Credentials(#[from] credentials::helper::Error),
	24	+ Credentials(#[from] credentials::helper::invoke::Error),
25	25	#[error(transparent)]
26	26	Transport(#[from] client::Error),
27	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	54	progress: &mut impl Progress,
55	55	) -> Result<Outcome, Error>
56	56	where
57		− AuthFn: FnMut(credentials::helper::Action<'_>) -> credentials::helper::Result,
	57	+ AuthFn: FnMut(credentials::helper::Action<'_>) -> credentials::helper::invoke::Result,
58	58	T: client::Transport,
59	59	{
60	60	let (server_protocol_version, refs, capabilities) = {
@@ -79,7 +79,7 @@ pub(crate) mod function { · 18 unmodified lines
79	79	drop(result); // needed to workaround this: https://github.com/rust-lang/rust/issues/76149
80	80	let url = transport.to_url();
81	81	progress.set_name("authentication");
82		− let credentials::helper::Outcome { identity, next } =
	82	+ let credentials::helper::invoke::Outcome { identity, next } =
83	83	authenticate(credentials::helper::Action::Fill(url.as_str().into()))?
84	84	.expect("FILL provides an identity");
85	85	transport.set_identity(identity)?;

@@ -53,7 +53,7 @@ pub async fn fetch<F, D, T>( · 52 unmodified lines
53	53	fetch_mode: FetchConnection,
54	54	) -> Result<(), Error>
55	55	where
56		− F: FnMut(credentials::helper::Action<'_>) -> credentials::helper::Result,
	56	+ F: FnMut(credentials::helper::Action<'_>) -> credentials::helper::invoke::Result,
57	57	D: Delegate,
58	58	T: client::Transport,
59	59	{

@@ -11,7 +11,7 @@ type Cursor = std::io::Cursor<Vec<u8>>; · 10 unmodified lines
11	11	#[cfg(feature = "async-client")]
12	12	type Cursor = futures_lite::io::Cursor<Vec<u8>>;
13	13
14		−fn helper_unused(_action: git_credentials::helper::Action<'_>) -> git_credentials::helper::Result {
	14	+fn helper_unused(_action: git_credentials::helper::Action<'_>) -> git_credentials::helper::invoke::Result {
15	15	panic!("Call to credentials helper is unexpected")
16	16	}
17	17