use git-quote crate in git-odb alternate parsing (#301)

Byron · Mar 24, 2022 · 8e49aa6 · 8e49aa6
1 parent 1be8f14
commit 8e49aa6
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 139 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/git-odb/Cargo.toml b/git-odb/Cargo.toml
@@ -32,11 +32,11 @@ all-features = true
 [dependencies]
 git-features = { version = "^0.19.1", path = "../git-features", features = ["rustsha1", "walkdir", "zlib", "crc32", "bstr"] }
 git-hash = { version = "^0.9.2", path = "../git-hash" }
+git-quote = { version = "^0.1.0", path = "../git-quote" }
 git-object = { version = "^0.17.1", path = "../git-object" }
 git-pack = { version = "^0.17.0", path = "../git-pack" }
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
 
-btoi = "0.4.2"
 tempfile = "3.1.0"
 thiserror = "1.0.26"
 parking_lot = { version = "0.12.0" }

diff --git a/git-odb/src/alternate/mod.rs b/git-odb/src/alternate/mod.rs
@@ -20,8 +20,6 @@ use std::{fs, io, path::PathBuf};
 
 ///
 pub mod parse;
-///
-pub mod unquote;
 
 /// Returned by [`resolve()`]
 #[derive(thiserror::Error, Debug)]

diff --git a/git-odb/src/alternate/parse.rs b/git-odb/src/alternate/parse.rs
@@ -2,16 +2,14 @@ use std::{borrow::Cow, path::PathBuf};
 
 use git_object::bstr::ByteSlice;
 
-use crate::alternate::unquote;
-
 /// Returned as part of [`crate::alternate::Error::Parse`]
 #[derive(thiserror::Error, Debug)]
 #[allow(missing_docs)]
 pub enum Error {
     #[error("Could not obtain an object path for the alternate directory '{}'", String::from_utf8_lossy(.0))]
     PathConversion(Vec<u8>),
     #[error("Could not unquote alternate path")]
-    Unquote(#[from] unquote::Error),
+    Unquote(#[from] git_quote::ansi_c::undo::Error),
 }
 
 pub(crate) fn content(input: &[u8]) -> Result<Vec<PathBuf>, Error> {
@@ -23,7 +21,7 @@ pub(crate) fn content(input: &[u8]) -> Result<Vec<PathBuf>, Error> {
         }
         out.push(
             git_features::path::from_bstr(if line.starts_with(b"\"") {
-                unquote::ansi_c(line)?
+                git_quote::ansi_c::undo(line)?
             } else {
                 Cow::Borrowed(line)
             })

diff --git a/git-odb/src/alternate/unquote.rs b/git-odb/src/alternate/unquote.rs
diff --git a/git-quote/Cargo.toml b/git-quote/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "git-quote"
-version = "0.0.0"
+version = "0.1.0"
 repository = "https://github.com/Byron/gitoxide"
 license = "MIT/Apache-2.0"
 description = "A WIP crate of the gitoxide project dealing with various quotations used by git"