c0a1bbe Merge branch 'improve-line' — radicle-git

rad:z6cFWeWpnZNHh9rUW8phgA3b5yGt

Git libraries for Radicle

Merge branch 'improve-line'

Fintan Halpenny committed 2 years ago

commit c0a1bbe8a724bb53dd3c697a28aeb75d4958a4fa
parent a8ce427

3 files changed +18 -4

modified radicle-git-ext/Cargo.toml

@@ -1,6 +1,6 @@

 [package]
 name = "radicle-git-ext"
 version = "0.3.0"
 version = "0.4.0"
 authors = [
   "Alexis Sellier <alexis@radicle.xyz>",
   "Kim Altintop <kim@eagain.st>",

modified radicle-surf/Cargo.toml

@@ -2,7 +2,7 @@

 name = "radicle-surf"
 description = "A code surfing library for Git repositories"
 readme = "README.md"
 version = "0.9.0"
 version = "0.10.0"
 authors = ["The Radicle Team <dev@radicle.xyz>"]
 edition = "2021"
 homepage = "https://github.com/radicle-dev/radicle-surf"

@@ -38,7 +38,7 @@ default-features = false

 features = ["vendored-libgit2"]
 [dependencies.radicle-git-ext]
 version = "0.3.0"
 version = "0.4.0"
 path = "../radicle-git-ext"
 features = ["serde"]

modified radicle-surf/src/diff.rs

@@ -17,7 +17,7 @@

 //! Types that represent diff(s) in a Git repo.
 use std::path::PathBuf;
 use std::{borrow::Cow, path::PathBuf, string::FromUtf8Error};
 #[cfg(feature = "serde")]
 use serde::{ser, ser::SerializeStruct, Serialize, Serializer};

@@ -338,6 +338,20 @@ impl<T> From<Vec<Hunk<T>>> for Hunks<T> {

 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct Line(pub(crate) Vec<u8>);
 impl Line {
     pub fn as_bytes(&self) -> &[u8] {
         self.0.as_slice()
     }
     pub fn from_utf8(self) -> Result<String, FromUtf8Error> {
         String::from_utf8(self.0)
     }
     pub fn from_utf8_lossy(&self) -> Cow<str> {
         String::from_utf8_lossy(&self.0)
     }
 }
 impl From<Vec<u8>> for Line {
     fn from(v: Vec<u8>) -> Self {
         Self(v)