branch: elpa/rust-mode
commit 4e938b13b944ce14ca287eb05bde013f7dde1b9d
Merge: 78e8b08 f17e11a
Author: Felix S Klock II <[email protected]>
Commit: Felix S Klock II <[email protected]>
Merge pull request #63 from krig/panic-compilation-warning
Match panics during build as compilation warnings
---
rust-mode.el | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/rust-mode.el b/rust-mode.el
index 948cc0e..d15dee4 100644
--- a/rust-mode.el
+++ b/rust-mode.el
@@ -752,11 +752,21 @@ This is written mainly to be used as
`end-of-defun-function' for Rust."
"Specifications for matching errors in rustc invocations.
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)
+ "Specifications for matching panics in cargo test invocations.
+See `compilation-error-regexp-alist for help on their format.")
+
(eval-after-load 'compile
'(progn
(add-to-list 'compilation-error-regexp-alist-alist
(cons 'rustc rustc-compilation-regexps))
- (add-to-list 'compilation-error-regexp-alist 'rustc)))
+ (add-to-list 'compilation-error-regexp-alist 'rustc)
+ (add-to-list 'compilation-error-regexp-alist-alist
+ (cons 'cargo cargo-compilation-regexps))
+ (add-to-list 'compilation-error-regexp-alist 'cargo)))
;;; Functions to submit (parts of) buffers to the rust playpen, for
;;; sharing.
