84d598b Merge remote-tracking branch 'origin/qualified-ref-import' — radicle-git

rad:z6cFWeWpnZNHh9rUW8phgA3b5yGt

Git libraries for Radicle

Merge remote-tracking branch 'origin/qualified-ref-import'

Fintan Halpenny committed 3 years ago

commit 84d598b4dbf08e7b373838ff494766993803ce6b
parent d7fb4ab

2 files changed +5 -4

modified git-ref-format/core/src/name/iter.rs

@@ -9,7 +9,7 @@ use std::{

     ops::Deref,
 };
 use super::{RefStr, RefString};
 use super::RefStr;
 use crate::lit;
 pub type Iter<'a> = std::str::Split<'a, char>;

@@ -52,9 +52,10 @@ pub struct Component<'a>(Cow<'a, RefStr>);

 impl<'a> Component<'a> {
     #[inline]
     pub fn from_refstring(r: RefString) -> Option<Self> {
     pub fn from_refstr(r: impl Into<Cow<'a, RefStr>>) -> Option<Self> {
         let r = r.into();
         if !r.contains('/') {
             Some(Self(Cow::Owned(r)))
             Some(Self(r))
         } else {
             None
         }

modified git-ref-format/macro/src/lib.rs

@@ -66,7 +66,7 @@ pub fn qualified(input: TokenStream) -> TokenStream {

                     let expand = quote! {
                         unsafe {
                             use ::std::{borrow::Cow, mem::transmute};
                             use ::git_ref_format::{Component, RefStr, RefString};
                             use ::git_ref_format::{Component, RefStr, RefString, Qualified};
                             let inner: RefString = transmute(#safe.to_owned());
                             let cow: Cow<'static, RefStr> = Cow::Owned(inner);