From 795a92150e675c5699d39430c539e8c68ce4cd21 Mon Sep 17 00:00:00 2001
From: Ferran Basora <fcsonline@gmail.com>
Date: Sat, 2 Mar 2019 19:01:03 +0000
Subject: [PATCH] Named patterns

---
 src/state.rs | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/state.rs b/src/state.rs
index 3c81a1c..2181d6b 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -1,6 +1,19 @@
 use std::collections::HashMap;
 use regex::Regex;
 
+const PATTERNS: [(&'static str, &'static str); 10] = [
+  ("url", r"((https?://|git@|git://|ssh://|ftp://|file:///)[\w?=%/_.:,;~@!#$&()*+-]*)"),
+  ("diff_a", r"--- a/([^ ]+)"),
+  ("diff_b", r"\+\+\+ b/([^ ]+)"),
+  ("path", r"[^ ]+/[^ ]+"),
+  ("color", r"#[0-9a-fA-F]{6}"),
+  ("uid", r"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"),
+  ("sha", r"[0-9a-f]{7,40}"),
+  ("ip", r"\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}"),
+  ("address", r"0x[0-9a-fA-F]+"),
+  ("number", r"[0-9]{4,}"),
+];
+
 pub struct Match<'a> {
   pub x: i32,
   pub y: i32,
@@ -31,18 +44,10 @@ impl<'a> State<'a> {
 
   pub fn matches(&self, reverse: bool, unique: bool) -> Vec<Match<'a>> {
     let mut matches = Vec::new();
-    let mut patterns = Vec::new();
 
-    patterns.push(Regex::new(r"((https?://|git@|git://|ssh://|ftp://|file:///)[\w?=%/_.:,;~@!#$&()*+-]*)").unwrap()); // Urls
-    patterns.push(Regex::new(r"--- a/([^ ]+)").unwrap()); // Diff
-    patterns.push(Regex::new(r"\+\+\+ b/([^ ]+)").unwrap()); // Diff
-    patterns.push(Regex::new(r"[^ ]+/[^ ]+").unwrap()); // Paths
-    patterns.push(Regex::new(r"#[0-9a-fA-F]{6}").unwrap()); // Hex colors
-    patterns.push(Regex::new(r"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}").unwrap()); // Uid
-    patterns.push(Regex::new(r"[0-9a-f]{7,40}").unwrap()); // Sha id
-    patterns.push(Regex::new(r"\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}").unwrap()); // Ip address
-    patterns.push(Regex::new(r"0x[0-9a-fA-F]+").unwrap()); // Address
-    patterns.push(Regex::new(r"[0-9]{4,}").unwrap()); // Process or ports
+    let patterns = PATTERNS.iter().map(|tuple|
+      Regex::new(tuple.1).unwrap()
+    ).collect::<Vec<_>>();
 
     for (index, line) in self.lines.iter().enumerate() {
       let mut chunk: &str = line;