From 8cc42dbe44c695a54789b0ef0fcc1949b12d5507 Mon Sep 17 00:00:00 2001 From: graelo Date: Tue, 23 Mar 2021 07:25:02 +0100 Subject: [PATCH] fix: update tmux shortcuts --- copyrat.tmux | 4 ++-- src/textbuf/mod.rs | 8 ++++---- src/textbuf/regexes.rs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/copyrat.tmux b/copyrat.tmux index 52b5aa1..134ee92 100755 --- a/copyrat.tmux +++ b/copyrat.tmux @@ -94,9 +94,9 @@ setup_pattern_binding "U" "--pattern-name uuid" # prefix + t + v searches for version numbers setup_pattern_binding "v" "--pattern-name version" # prefix + t + d searches for any string of 4+ digits -setup_pattern_binding "d" "--pattern-name digits" +setup_pattern_binding "G" "--pattern-name digits" # prefix + t + m searches for hex numbers: 0xbedead -setup_pattern_binding "m" "--pattern-name mem-address" +setup_pattern_binding "P" "--pattern-name pointer-address" # prefix + t + 4 searches for IPV4 setup_pattern_binding "4" "--pattern-name ipv4" # prefix + t + 6 searches for IPV6 diff --git a/src/textbuf/mod.rs b/src/textbuf/mod.rs index 45642ed..60c9031 100644 --- a/src/textbuf/mod.rs +++ b/src/textbuf/mod.rs @@ -386,7 +386,7 @@ mod tests { } #[test] - fn match_addresses() { + fn match_pointer_addresses() { let buffer = "Lorem 0xfd70b5695 0x5246ddf lorem\n Lorem 0x973113tlorem"; let lines = buffer.split('\n').collect::>(); let use_all_patterns = true; @@ -407,11 +407,11 @@ mod tests { .spans; assert_eq!(spans.len(), 3); - assert_eq!(spans.get(0).unwrap().pattern, "mem-address"); + assert_eq!(spans.get(0).unwrap().pattern, "pointer-address"); assert_eq!(spans.get(0).unwrap().text, "0xfd70b5695"); - assert_eq!(spans.get(1).unwrap().pattern, "mem-address"); + assert_eq!(spans.get(1).unwrap().pattern, "pointer-address"); assert_eq!(spans.get(1).unwrap().text, "0x5246ddf"); - assert_eq!(spans.get(2).unwrap().pattern, "mem-address"); + assert_eq!(spans.get(2).unwrap().pattern, "pointer-address"); assert_eq!(spans.get(2).unwrap().text, "0x973113"); } diff --git a/src/textbuf/regexes.rs b/src/textbuf/regexes.rs index 6b823b5..5f57914 100644 --- a/src/textbuf/regexes.rs +++ b/src/textbuf/regexes.rs @@ -31,7 +31,7 @@ pub(super) const PATTERNS: [(&str, &str); 16] = [ ("sha", r"[0-9a-f]{7,40}"), ("ipv4", r"\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}"), ("ipv6", r"[A-f0-9:]+:+[A-f0-9:]+[%\w\d]+"), - ("mem-address", r"0x[0-9a-fA-F]+"), + ("pointer-address", r"0x[0-9a-fA-F]+"), ("digits", r"[0-9]{4,}"), ];