---

yaml
---
r: 77260
b: refs/heads/snap-stage3
c: d9b0d4b
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: f1132496dddbdd88f321a7919eec3d65136b3f75
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 1f13eab3c02ee05b96f0f4bbf6fb808332d6f908
+refs/heads/snap-stage3: d9b0d4b60366e463ef14c757485c1849cba7d1cc
 refs/heads/try: ebfe63cd1c0b5d23f7ea60c69b4fde2e30cfd42a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/etc/emacs/rust-mode.el

@@ -229,7 +229,7 @@ The initializer is `DEFAULT-TAB-WIDTH'.")
 ;; regexp (which is broken on a few edge cases), add our own 'rust
 ;; compilation error regexp and use it instead.
 (defvar rustc-compilation-regexps
-  (let ((file "\\([^\n]+\\)")
+  (let ((file "^\\([^\n]+\\)")
         (start-line "\\([0-9]+\\)")
         (start-col  "\\([0-9]+\\)")
         (end-line   "\\([0-9]+\\)")

branches/snap-stage3/src/etc/x86.supp

@@ -512,6 +512,5 @@
    fun:uv__platform_loop_init
    fun:uv__loop_init
    fun:uv_loop_new
-   fun:rust_uv_loop_new__c_stack_shim
    ...
 }

branches/snap-stage3/src/librustpkg/rustpkg.rs

@@ -475,7 +475,8 @@ pub fn main() {
 pub fn main_args(args: &[~str]) {
     let opts = ~[getopts::optflag("h"), getopts::optflag("help"),
                  getopts::optflag("j"), getopts::optflag("json"),
-                 getopts::optmulti("c"), getopts::optmulti("cfg")];
+                 getopts::optmulti("c"), getopts::optmulti("cfg"),
+                 getopts::optflag("v"), getopts::optflag("version")];
     let matches = &match getopts::getopts(args, opts) {
         result::Ok(m) => m,
         result::Err(f) => {
@@ -488,6 +489,13 @@ pub fn main_args(args: &[~str]) {
                getopts::opt_present(matches, "help");
     let json = getopts::opt_present(matches, "j") ||
                getopts::opt_present(matches, "json");
+
+    if getopts::opt_present(matches, "v") ||
+       getopts::opt_present(matches, "version") {
+        rustc::version(args[0]);
+        return;
+    }
+
     let mut args = matches.free.clone();
 
     args.shift();