adjust git_date::parsea(str) to use a str

It will never not be UTF-8, so no bstr is required.
Byron · Aug 13, 2022 · 0f8680a · 0f8680a
1 parent 11a5fa2
commit 0f8680a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/git-date/src/parse.rs b/git-date/src/parse.rs
@@ -1,8 +1,7 @@
 use crate::Time;
-use bstr::BStr;
 
 #[allow(missing_docs)]
-pub fn parse(input: &BStr) -> Option<Time> {
+pub fn parse(input: &str) -> Option<Time> {
     // TODO: actual implementation, this is just to not constantly fail
     if input == "1979-02-26 18:30:00" {
         Some(Time::new(42, 1800))

diff --git a/git-date/tests/time/mod.rs b/git-date/tests/time/mod.rs
@@ -80,7 +80,7 @@ mod parse {
     #[test]
     fn special_time_is_ok_for_now() {
         assert_eq!(
-            git_date::parse("1979-02-26 18:30:00".into()).unwrap(),
+            git_date::parse("1979-02-26 18:30:00").unwrap(),
             Time {
                 seconds_since_unix_epoch: 42,
                 offset_in_seconds: 1800,

diff --git a/git-repository/src/repository/identity.rs b/git-repository/src/repository/identity.rs
@@ -126,11 +126,15 @@ impl Personas {
         if git_env.eq(&git_sec::Permission::Allow) {
             committer_name = committer_name.or_else(|| env_var("GIT_COMMITTER_NAME"));
             committer_email = committer_email.or_else(|| env_var("GIT_COMMITTER_EMAIL"));
-            committer_date = env_var("GIT_COMMITTER_DATE").and_then(|date| git_date::parse(date.as_ref()));
+            committer_date = std::env::var("GIT_COMMITTER_DATE")
+                .ok()
+                .and_then(|date| git_date::parse(&date));
 
             author_name = author_name.or_else(|| env_var("GIT_AUTHOR_NAME"));
             author_email = author_email.or_else(|| env_var("GIT_AUTHOR_EMAIL"));
-            author_date = env_var("GIT_AUTHOR_DATE").and_then(|date| git_date::parse(date.as_ref()));
+            author_date = std::env::var("GIT_AUTHOR_DATE")
+                .ok()
+                .and_then(|date| git_date::parse(&date));
 
             user_email = user_email.or_else(|| env_var("EMAIL")); // NOTE: we don't have permission for this specific one…
         }

diff --git a/git-revision/src/spec/parse/function.rs b/git-revision/src/spec/parse/function.rs
@@ -432,7 +432,11 @@ where
                     Err(Error::SiblingBranchNeedsBranchName { name: (*name).into() })
                 }?
             } else if has_ref_or_implied_name {
-                let time = git_date::parse(nav).ok_or_else(|| Error::Time { input: nav.into() })?;
+                let time = nav
+                    .to_str()
+                    .ok()
+                    .and_then(git_date::parse)
+                    .ok_or_else(|| Error::Time { input: nav.into() })?;
                 delegate
                     .reflog(delegate::ReflogLookup::Date(time))
                     .ok_or(Error::Delegate)?;