Radish alpha
r
Git libraries for Radicle
Radicle
Git (anonymous pull)
Log in to clone via SSH
radicle-git-ext: remove link-git dependency
Fintan Halpenny committed 3 years ago
commit 1d41bf0447aabdfd2c10662fb31a59596faaebcd
parent 4f6284caf589fd7bda312fa1452a0976d5adb8a2
2 files changed +0 -37
modified radicle-git-ext/Cargo.toml
@@ -23,10 +23,6 @@ features = ["vendored-libgit2"]
[dependencies.git-ref-format]
path = "../git-ref-format"

-
[dependencies.link-git]
-
path = "../link-git"
-
optional = true
-

[dependencies.minicbor]
version = "0.13"
features = ["std"]
modified radicle-git-ext/src/oid.rs
@@ -13,9 +13,6 @@ use std::{
use multihash::{Multihash, MultihashRef};
use thiserror::Error;

-
#[cfg(feature = "link-git")]
-
use link_git::hash as git_hash;
-

/// Serializable [`git2::Oid`]
#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
pub struct Oid(git2::Oid);
@@ -116,14 +113,6 @@ impl AsRef<[u8]> for Oid {
    }
}

-
#[cfg(feature = "link-git")]
-
impl AsRef<git_hash::oid> for Oid {
-
    fn as_ref(&self) -> &git_hash::oid {
-
        // SAFETY: checks the length of the slice, which we know is correct
-
        git_hash::oid::try_from(self.as_bytes()).unwrap()
-
    }
-
}
-

impl From<git2::Oid> for Oid {
    fn from(oid: git2::Oid) -> Self {
        Self(oid)
@@ -136,28 +125,6 @@ impl From<Oid> for git2::Oid {
    }
}

-
#[cfg(feature = "link-git")]
-
impl From<git_hash::ObjectId> for Oid {
-
    fn from(git_hash::ObjectId::Sha1(bs): git_hash::ObjectId) -> Self {
-
        // SAFETY: checks the length of the slice, which we statically know
-
        Self(git2::Oid::from_bytes(&bs).unwrap())
-
    }
-
}
-

-
#[cfg(feature = "link-git")]
-
impl From<Oid> for git_hash::ObjectId {
-
    fn from(oid: Oid) -> Self {
-
        Self::from_20_bytes(oid.as_ref())
-
    }
-
}
-

-
#[cfg(feature = "link-git")]
-
impl<'a> From<&'a Oid> for &'a git_hash::oid {
-
    fn from(oid: &'a Oid) -> Self {
-
        oid.as_ref()
-
    }
-
}
-

impl Display for Oid {
    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
        self.0.fmt(f)