Skip to content

Commit 67162ba

Browse files
committed
refactor (#427)
1 parent 7136c9e commit 67162ba

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

Diff for: Cargo.lock

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: git-revision/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ serde1 = [ "serde", "git-hash/serde1", "git-object/serde1" ]
2020
git-hash = { version = "^0.9.4", path = "../git-hash" }
2121
git-object = { version = "^0.19.0", path = "../git-object" }
2222

23+
bstr = { version = "0.2.13", default-features = false, features = ["std"]}
2324
hash_hasher = "2.0.3"
2425
thiserror = "1.0.26"
2526
serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }

Diff for: git-revision/src/describe.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::{
33
fmt::{Display, Formatter},
44
};
55

6-
use git_object::bstr::BStr;
6+
use bstr::BStr;
77

88
/// The positive result produced by [describe()][function::describe()].
99
#[derive(Debug, Clone)]
@@ -150,8 +150,9 @@ pub(crate) mod function {
150150
iter::FromIterator,
151151
};
152152

153+
use bstr::BStr;
153154
use git_hash::oid;
154-
use git_object::{bstr::BStr, CommitRefIter};
155+
use git_object::CommitRefIter;
155156
use hash_hasher::HashBuildHasher;
156157

157158
use super::{Error, Outcome};

Diff for: git-revision/src/spec.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ impl Default for Kind {
1818

1919
pub mod parse {
2020
#![allow(missing_docs)]
21-
use git_object::bstr::BStr;
21+
use bstr::BStr;
2222

2323
#[derive(Debug, thiserror::Error)]
2424
pub enum Error {
@@ -49,11 +49,9 @@ pub mod parse {
4949

5050
pub(crate) mod function {
5151
use crate::spec::parse::{Delegate, Error};
52-
use git_object::bstr::BStr;
52+
use bstr::BStr;
5353

5454
pub fn parse(input: &BStr, delegate: &mut impl Delegate) -> Result<(), Error> {
55-
// TODO: don't hardcode these cases, see how git does it. This remains
56-
// just an example.
5755
if input == "@" || input == "HEAD" {
5856
return delegate.resolve_ref("HEAD".into()).ok_or(Error::Delegate);
5957
}

0 commit comments

Comments
 (0)