diff -Nru elpa-rust-mode-0.3.0/debian/changelog elpa-rust-mode-0.3.0/debian/changelog
--- elpa-rust-mode-0.3.0/debian/changelog	2018-07-23 10:04:05.000000000 +0000
+++ elpa-rust-mode-0.3.0/debian/changelog	2019-01-05 19:42:50.000000000 +0000
@@ -1,3 +1,13 @@
+elpa-rust-mode (0.3.0-2) unstable; urgency=medium
+
+  * Team upload.
+  * Apply patch from Ian Jackson to fix `goto-error' with recent rust
+    (Closes: #918373).
+  * Point Vcs-* at salsa.
+  * Update team name and e-mail in Maintainer: field.
+
+ -- Sean Whitton <spwhitton@spwhitton.name>  Sat, 05 Jan 2019 19:42:50 +0000
+
 elpa-rust-mode (0.3.0-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru elpa-rust-mode-0.3.0/debian/control elpa-rust-mode-0.3.0/debian/control
--- elpa-rust-mode-0.3.0/debian/control	2018-07-23 10:03:30.000000000 +0000
+++ elpa-rust-mode-0.3.0/debian/control	2019-01-05 19:42:50.000000000 +0000
@@ -1,13 +1,13 @@
 Source: elpa-rust-mode
-Maintainer: Debian Emacs addons team <pkg-emacsen-addons@lists.alioth.debian.org>
+Maintainer: Debian Emacsen team <debian-emacsen@lists.debian.org>
 Uploaders: Matt Kraai <kraai@debian.org>
 Section: editors
 Priority: extra
 Build-Depends: debhelper (>= 9), dh-elpa (>= 0.0.17)
 Standards-Version: 3.9.8
 Homepage: https://github.com/rust-lang/rust-mode
-Vcs-Git: https://anonscm.debian.org/git/pkg-emacsen/pkg/rust-mode.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-emacsen/pkg/rust-mode.git/
+Vcs-Git: https://salsa.debian.org/emacsen-team/rust-mode.git
+Vcs-Browser: https://salsa.debian.org/emacsen-team/rust-mode
 
 Package: elpa-rust-mode
 Architecture: all
diff -Nru elpa-rust-mode-0.3.0/debian/patches/compilation-regexps-Match-line-before-too.patch elpa-rust-mode-0.3.0/debian/patches/compilation-regexps-Match-line-before-too.patch
--- elpa-rust-mode-0.3.0/debian/patches/compilation-regexps-Match-line-before-too.patch	1970-01-01 00:00:00.000000000 +0000
+++ elpa-rust-mode-0.3.0/debian/patches/compilation-regexps-Match-line-before-too.patch	2019-01-05 19:42:50.000000000 +0000
@@ -0,0 +1,39 @@
+From: Ian Jackson <ijackson@chiark.greenend.org.uk>
+Date: Fri, 28 Dec 2018 12:13:10 +0000
+Subject: compilation regexps: Match line before, too.
+
+"New format" (since 2016) Rust error messages look like this:
+
+  error[E0308]: mismatched types
+     --> src/bin/e19b.rs:672:47
+      |
+  672 |                 ExprRef::new(0, Nt(NT{ args : others, ..x_nt })),
+      |                                               ^^^^^^ expected struct `ExprRef`, found enum `ExprCore`
+      |
+      = note: expected type `std::vec::Vec<ExprRef>`
+		 found type `std::vec::Vec<ExprCore>`
+
+The regexp matches the line with the `-->'.  But of course next-error
+scrolls the window so the start of the regexp is at the top of the
+buffer.  So we must match the line before, too.  Rust won't ever start
+its messages with a `-->' so we can unconditionally include the
+previous line in the match.
+
+Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
+---
+ rust-mode.el | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rust-mode.el b/rust-mode.el
+index 60a81f1..8abea3b 100644
+--- a/rust-mode.el
++++ b/rust-mode.el
+@@ -1417,7 +1417,7 @@ See `compilation-error-regexp-alist' for help on their format.")
+   (let ((file "\\([^\n]+\\)")
+         (start-line "\\([0-9]+\\)")
+         (start-col  "\\([0-9]+\\)"))
+-    (let ((re (concat "^ *--> " file ":" start-line ":" start-col ; --> 1:2:3
++    (let ((re (concat "^.*\n *--> " file ":" start-line ":" start-col ; --> 1:2:3
+                       )))
+       (cons re '(1 2 3))))
+   "Specifications for matching errors in rustc invocations (new style).
diff -Nru elpa-rust-mode-0.3.0/debian/patches/series elpa-rust-mode-0.3.0/debian/patches/series
--- elpa-rust-mode-0.3.0/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ elpa-rust-mode-0.3.0/debian/patches/series	2019-01-05 19:42:50.000000000 +0000
@@ -0,0 +1 @@
+compilation-regexps-Match-line-before-too.patch