Expand git2 version range to include 0.21.x (#236)

Author: rtimush

Cargo.lock

@@ -38,7 +38,7 @@ env_logger = { version = "0.11.8", default-features = false, features = [
 	"auto-color",
 ], optional = true }
 fs4 = "0.13.1"
-git2 = { version = ">=0.18.0, <0.21.0" }
+git2 = { version = ">=0.18.0, <0.22.0", features = ["ssh", "https"] }
 # Upgrading home to 0.5.11 will bring MSRV to 1.81.0
 home = "0.5.9"
 log = "0.4.27"

Cargo.toml

@@ -83,7 +83,7 @@ impl GitRepository for Libgit2Repository {
         match result {
             Ok(remote) => {
                 let url = remote.url().map(|s| s.to_string());
-                Ok(url)
+                Ok(url.into_option())
             }
             Err(e) if e.code() == git2::ErrorCode::NotFound => Ok(None),
             Err(e) => Err(e.into()),
@@ -305,3 +305,21 @@ impl From<git2::Error> for GitBackendError {
         }
     }
 }
+
+// Starting from git2 0.21, some methods return Result<T, git2::Error> that previously used to return Option<T>.
+// This is a compatibility layer to be able to keep a broad git2 dependency range.
+trait Git2ResultCompat<T> {
+    fn into_option(self) -> Option<T>;
+}
+
+impl<T> Git2ResultCompat<T> for Result<T, git2::Error> {
+    fn into_option(self) -> Option<T> {
+        self.ok()
+    }
+}
+
+impl<T> Git2ResultCompat<T> for Option<T> {
+    fn into_option(self) -> Option<T> {
+        self
+    }
+}