Skip to content

Commit

Permalink
adjust to changes in gix-url
Browse files Browse the repository at this point in the history
  • Loading branch information
Byron committed Mar 10, 2023
1 parent c6897d9 commit 66602bb
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion gix-transport/src/client/blocking_io/file.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ impl SpawnProcessOnDemand {
}
fn new_local(path: BString, version: Protocol) -> SpawnProcessOnDemand {
SpawnProcessOnDemand {
url: gix_url::Url::from_parts_as_alternative_form(gix_url::Scheme::File, None, None, None, path.clone())
url: gix_url::Url::from_parts(gix_url::Scheme::File, None, None, None, None, path.clone(), true)
.expect("valid url"),
path,
ssh_cmd: None,
Expand Down
1 change: 1 addition & 0 deletions gix-transport/src/client/blocking_io/ssh/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ pub mod connect {
///
/// The `desired_version` is the preferred protocol version when establishing the connection, but note that it can be
/// downgraded by servers not supporting it.
#[allow(clippy::result_large_err)]
pub fn connect(
url: gix_url::Url,
desired_version: Protocol,
Expand Down
2 changes: 1 addition & 1 deletion gix-transport/src/client/blocking_io/ssh/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ mod program_kind {
}

fn joined(input: &[&str]) -> String {
input.iter().copied().collect::<Vec<_>>().join(" ")
input.to_vec().join(" ")
}
fn try_call(
kind: ProgramKind,
Expand Down
2 changes: 2 additions & 0 deletions gix/src/remote/save.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ impl Remote<'_> {
/// Note that all sections named `remote "<name>"` will be cleared of all values we are about to write,
/// and the last `remote "<name>"` section will be containing all relevant values so that reloading the remote
/// from `config` would yield the same in-memory state.
#[allow(clippy::result_large_err)]
pub fn save_to(&self, config: &mut gix_config::File<'static>) -> Result<(), Error> {
fn as_key(name: &str) -> gix_config::parse::section::Key<'_> {
name.try_into().expect("valid")
Expand Down Expand Up @@ -109,6 +110,7 @@ impl Remote<'_> {
/// Note that this sets a name for anonymous remotes, but overwrites the name for those who were named before.
/// If this name is different from the current one, the git configuration will still contain the previous name,
/// and the caller should account for that.
#[allow(clippy::result_large_err)]
pub fn save_as_to(
&mut self,
name: impl Into<BString>,
Expand Down

0 comments on commit 66602bb

Please sign in to comment.