ref(vcs): Make extract_pr_base_sha_from_event like extract_pr_head_sha_from_event

Author: chromy

src/utils/vcs.rs

@@ -575,7 +575,7 @@ pub fn find_base_sha() -> Result<Option<String>> {
         .and_then(|event_path| std::fs::read_to_string(event_path).map_err(Error::from))
         .context("Failed to read GitHub event path")?;
 
-    extract_pr_base_sha_from_event(&github_event)
+    Ok(extract_pr_base_sha_from_event(&github_event))
 }
 
 /// Extracts the PR head SHA from GitHub Actions event payload JSON.
@@ -595,9 +595,8 @@ fn extract_pr_head_sha_from_event(json_content: &str) -> Option<String> {
 }
 
 /// Extracts the PR base SHA from GitHub Actions event payload JSON.
-/// Returns Ok(None) if not a PR event or if SHA cannot be extracted.
-/// Returns an error if we cannot parse the JSON.
-fn extract_pr_base_sha_from_event(json_content: &str) -> Result<Option<String>> {
+/// Returns None if not a PR event or if SHA cannot be extracted.
+fn extract_pr_base_sha_from_event(json_content: &str) -><Option<String> {
     let v: Value = serde_json::from_str(json_content)
         .context("Failed to parse GitHub event payload as JSON")?;
 
@@ -1734,7 +1733,7 @@ mod tests {
 }"#;
 
         assert_eq!(
-            extract_pr_base_sha_from_event(incomplete_json).unwrap(),
+            extract_pr_base_sha_from_event(incomplete_json),
             None
         );
     }