diff --git a/radicle-cob/src/backend/git/change.rs b/radicle-cob/src/backend/git/change.rs index f8526b57..127f11c9 100644 --- a/radicle-cob/src/backend/git/change.rs +++ b/radicle-cob/src/backend/git/change.rs @@ -3,7 +3,6 @@ use std::collections::BTreeMap; use std::convert::TryFrom; -use git_ext::author; use git_ext::author::Author; use git_ext::commit::{headers::Headers, Commit}; use git_ext::Oid; @@ -286,7 +285,7 @@ where let (author, timestamp) = if let Ok(s) = std::env::var(crate::git::RAD_COMMIT_TIME) { let timestamp = s.trim().parse::().unwrap(); let author = Author { - time: author::Time::new(timestamp, 0), + time: git_ext::author::Time::new(timestamp, 0), ..author }; (author, timestamp) diff --git a/radicle-cob/src/object/collaboration.rs b/radicle-cob/src/object/collaboration.rs index 4f30e816..8795f6d6 100644 --- a/radicle-cob/src/object/collaboration.rs +++ b/radicle-cob/src/object/collaboration.rs @@ -63,11 +63,11 @@ impl CollaborativeObject { /// [`TypeName`] and [`ObjectId`] from it. /// /// This assumes that the `refname` is in a -/// [`git_ref_format::Qualified`] format. If it has any +/// [`git_ext::ref_format::Qualified`] format. If it has any /// `refs/namespaces`, they will be stripped to access the underlying -/// [`git_ref_format::Qualified`] format. +/// [`git_ext::ref_format::Qualified`] format. /// -/// In the [`git_ref_format::Qualified`] format it assumes that the +/// In the [`git_ext::ref_format::Qualified`] format it assumes that the /// reference name is of the form: /// /// `refs///[/*]` @@ -77,7 +77,7 @@ impl CollaborativeObject { /// /// Also note that this will return `None` if: /// -/// * The `refname` is not [`git_ref_format::Qualified`] +/// * The `refname` is not [`git_ext::ref_format::Qualified`] /// * The parsing of the [`ObjectId`] fails /// * The parsing of the [`TypeName`] fails pub fn parse_refstr(name: &R) -> Option<(TypeName, ObjectId)>