From f8742476444c4d58904c3ff7f1f4f17b8b7ab39b Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Sat, 1 Aug 2020 16:06:51 +0200 Subject: OwnerRepo: Move `identifier_for_remote` to `OwnerRepo::from_remote` Since this function returns an `OwnerRepo`, make it a method on the struct. --- src/owner_repo.rs | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/owner_repo.rs b/src/owner_repo.rs index c0d97a2..67572ef 100644 --- a/src/owner_repo.rs +++ b/src/owner_repo.rs @@ -57,19 +57,21 @@ impl FromStr for OwnerRepo { } } -pub fn identifier_for_remote( - remote_name: Option<&str>, -) -> Result { - let repo = Repository::open(".")?; - - let remote_name = match remote_name { - Some(r) => r, - None => "origin", - }; - - let remote = repo.find_remote(remote_name)?; - let url = remote.url() - .ok_or_else(|| Error::NoRemote(remote_name.to_owned()))?; - - Ok(url.parse()?) +impl OwnerRepo { + pub fn from_remote( + remote_name: Option<&str>, + ) -> Result { + let repo = Repository::open(".")?; + + let remote_name = match remote_name { + Some(r) => r, + None => "origin", + }; + + let remote = repo.find_remote(remote_name)?; + let url = remote.url() + .ok_or_else(|| Error::NoRemote(remote_name.to_owned()))?; + + Ok(url.parse()?) + } } -- cgit v1.2.3