Use Cow to avoid clone() of static ref

dandavison · Nov 22, 2021 · e108629 · e108629
1 parent b90346b
commit e108629
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/handlers/git_show_file.rs b/src/handlers/git_show_file.rs
@@ -9,7 +9,9 @@ impl<'a> StateMachine<'a> {
         self.painter.emit()?;
         let mut handled_line = false;
         if matches!(self.state, State::Unknown) {
-            if let Some(process::CallingProcess::GitShow(extension)) = process::calling_process() {
+            if let Some(process::CallingProcess::GitShow(extension)) =
+                process::calling_process().as_deref()
+            {
                 self.state = State::GitShowFile;
                 self.painter.set_syntax(Some(extension));
                 self.painter.set_highlighter();

diff --git a/src/handlers/grep.rs b/src/handlers/grep.rs
@@ -243,7 +243,7 @@ fn get_code_style_sections<'b>(
 }
 
 fn make_output_config() -> GrepOutputConfig {
-    match process::calling_process() {
+    match process::calling_process().as_deref() {
         Some(process::CallingProcess::GitGrep((longs, shorts)))
             if shorts.contains("-W") || longs.contains("--function-context") =>
         {
@@ -375,7 +375,7 @@ pub fn parse_grep_line(line: &str) -> Option<GrepLine> {
     if line.starts_with('{') {
         ripgrep_json::parse_line(line)
     } else {
-        match process::calling_process() {
+        match process::calling_process().as_deref() {
             Some(process::CallingProcess::GitGrep(_))
             | Some(process::CallingProcess::OtherGrep) => [
                 &*GREP_LINE_REGEX_ASSUMING_FILE_EXTENSION,

diff --git a/src/utils/process.rs b/src/utils/process.rs
@@ -1,3 +1,4 @@
+use std::borrow::Cow;
 use std::collections::{HashMap, HashSet};
 use std::path::Path;
 use sysinfo::{Pid, Process, ProcessExt, SystemExt};
@@ -11,14 +12,16 @@ pub enum CallingProcess {
     OtherGrep,                                   // rg, grep, ag, ack, etc
 }
 
-pub fn calling_process() -> Option<CallingProcess> {
+pub fn calling_process() -> Option<Cow<'static, CallingProcess>> {
     #[cfg(not(test))]
     {
-        CACHED_CALLING_PROCESS.clone()
+        CACHED_CALLING_PROCESS
+            .as_ref()
+            .map(|proc| Cow::Borrowed(proc))
     }
     #[cfg(test)]
     {
-        determine_calling_process()
+        determine_calling_process().map(|proc| Cow::Owned(proc))
     }
 }