summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZephyr Shannon <earthlingzephyr@gmail.com>2021-09-09 23:15:15 -0700
committerZephyr Shannon <earthlingzephyr@gmail.com>2021-09-09 23:15:15 -0700
commitaad506dfb2bf5dc1234c6dce5971d75051576490 (patch)
tree7d872c19f4b414e156de87c7939567e4462cd7d4
parent494d59f92cbe12533eb89b202fc4f5342afcd543 (diff)
downloadrust-mode-aad506dfb2bf5dc1234c6dce5971d75051576490.tar.gz
Fix cargo compilation regex starting match
Previously this regex attempted to match the entire cargo output including the name of the thread that panicked and the entire panic message. In addition it was required that there be whitespace before the start of the word "thread" in that output. I don't know if this was the previous format, but in current Rust compilers "thread" comes at the beginning of the first line. However, there were two problems with this approach. One is that making that leading whitespace mandatory caused the regex to not match correctly. The second problem is that multiline regex matching in emacs is a bit iffy, and even matching the start correctly, if the panic message contained enough characters the full multiline regex could not be matched and the same problem would occur. This commit changes and vastly simplifies the regex to search for the guaranteed portion of the cargo output, starting with the ending `', `. This does come with an increased risk of accidentally matching input that is not actually a panic message, but I think in practice this will be fairly rare.
-rw-r--r--rust-compile.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/rust-compile.el b/rust-compile.el
index 6c73901..682fe61 100644
--- a/rust-compile.el
+++ b/rust-compile.el
@@ -37,8 +37,8 @@ See `compilation-error-regexp-alist' for help on their format.")
;; Match test run failures and panics during compilation as
;; compilation warnings
(defvar cargo-compilation-regexps
- '("^\\s-+thread '[^']+' panicked at \\('[^']+', \\([^:]+\\):\\([0-9]+\\)\\)"
- 2 3 nil nil 1)
+ '("', \\([^:]+\\):\\([0-9]+\\)"
+ 1 2 nil nil 0)
"Specifications for matching panics in cargo test invocations.
See `compilation-error-regexp-alist' for help on their format.")