1 files changed, 18 insertions, 0 deletions

diff --git a/.emacs.d/lisp/rust-compile.el b/.emacs.d/lisp/rust-compile.el
index 04ac6b6..cbdf43a 100644
--- a/.emacs.d/lisp/rust-compile.el
+++ b/.emacs.d/lisp/rust-compile.el
@@ -28,6 +28,12 @@ See `compilation-error-regexp-alist' for help on their format.")
   "Specifications for matching `:::` hints in rustc invocations.
 See `compilation-error-regexp-alist' for help on their format.")
 
+(defvar rustc-backtrace-compilation-regexps
+  (let ((re (concat "^ +at " rustc-compilation-location)))
+    (cons re '(2 3 4 0 1)))
+  "Specifications for matching stack backtraces in rustc invocations.
+See `compilation-error-regexp-alist' for help on their format.")
+
 (defvar rustc-refs-compilation-regexps
   (let ((re "^\\([0-9]+\\)[[:space:]]*|"))
     (cons re '(nil 1 nil 0 1)))
@@ -48,6 +54,12 @@ See `compilation-error-regexp-alist' for help on their format.")
   "Specifications for matching panics in cargo test invocations.
 See `compilation-error-regexp-alist' for help on their format.")
 
+(defvar rustc-dbg!-compilation-regexps
+  (let ((re (concat "\\[" rustc-compilation-location "\\]")))
+    (cons re '(2 3 4 0 1)))
+  "Specifications for matching dbg! output.
+See `compilation-error-regexp-alist' for help on their format.")
+
 (defun rustc-scroll-down-after-next-error ()
   "In the new style error messages, the regular expression
 matches on the file name (which appears after `-->`), but the
@@ -80,11 +92,17 @@ the compilation window until the top of the error is visible."
                   (cons 'rustc-colon rustc-colon-compilation-regexps))
      (add-to-list 'compilation-error-regexp-alist 'rustc-colon)
      (add-to-list 'compilation-error-regexp-alist-alist
+                  (cons 'rustc-backtrace rustc-backtrace-compilation-regexps))
+     (add-to-list 'compilation-error-regexp-alist 'rustc-backtrace)
+     (add-to-list 'compilation-error-regexp-alist-alist
                   (cons 'cargo cargo-compilation-regexps))
      (add-to-list 'compilation-error-regexp-alist-alist
                   (cons 'rustc-panics rustc-panics-compilation-regexps))
      (add-to-list 'compilation-error-regexp-alist 'rustc-panics)
      (add-to-list 'compilation-error-regexp-alist 'cargo)
+     (add-to-list 'compilation-error-regexp-alist-alist
+                  (cons 'rust-dbg! rustc-dbg!-compilation-regexps))
+     (add-to-list 'compilation-error-regexp-alist 'rust-dbg!)
      (add-hook 'next-error-hook #'rustc-scroll-down-after-next-error)))
 
 ;;; _