---

yaml
---
r: 79425
b: refs/heads/snap-stage3
c: 9ef0b9c
h: refs/heads/master
i:
  79423: ab19176
v: v3

Author: MicahChalmer

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 124eb2119c78651cfaaa7a046a101fa2e20f83ca
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 1c527dfcd466d9b5ea75fe199c364837298a4278
+refs/heads/snap-stage3: 9ef0b9c0d6180f0e5023b29ac57835e6e75517d0
 refs/heads/try: ac820906c0e53eab79a98ee64f7231f57c3887b4
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

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

@@ -45,6 +45,16 @@
     (if (/= starting (point))
         (rust-rewind-irrelevant))))
 
+(defun rust-first-indent-after-brace ()
+  (save-excursion
+    (forward-char)
+    (if (looking-at "[[:blank:]]*\\(?://.*\\)?$")
+        ;; We don't want to indent out to the open bracket if the
+        ;; open bracket ends the line
+        (* rust-indent-offset (rust-paren-level))
+      (when (looking-at "[[:space:]]") (forward-to-word 1))
+      (current-column))))
+
 (defun rust-mode-indent-line ()
   (interactive)
   (let ((indent
@@ -58,7 +68,7 @@
               ;; A closing brace is 1 level unindended
               ((looking-at "}") (* rust-indent-offset (- level 1)))
 
-              ; Doc comments in /** style with leading * indent to line up the *s
+              ;; Doc comments in /** style with leading * indent to line up the *s
               ((and (nth 4 (syntax-ppss)) (looking-at "*"))
                (+ 1 (* rust-indent-offset level)))
 
@@ -75,22 +85,9 @@
                (let ((pt (point)))
                  (rust-rewind-irrelevant)
                  (backward-up-list)
-                 (cond 
-                  ((and
-                      (looking-at "[[(]")
-                      ; We don't want to indent out to the open bracket if the
-                      ; open bracket ends the line
-                      (save-excursion 
-                        (forward-char)
-                        (not (looking-at "[[:space:]]*\\(?://.*\\)?$"))))
-                   (+ 1 (current-column)))
-                  ;; Check for fields on the same line as the open curly brace:
-                  ((looking-at "{[[:space:]]*[^\n]*,[[:space:]]*$")
+                 (if (looking-at "[[({]")
+                     (rust-first-indent-after-brace)
                    (progn
-                    (forward-char)
-                    (when (looking-at "[[:space:]]") (forward-to-word 1))
-                    (current-column)))
-                  (t (progn
                      (goto-char pt)
                      (back-to-indentation)
                      (if (looking-at "\\<else\\>")
@@ -105,7 +102,7 @@
                            (back-to-indentation)
                            (if (looking-at "#")
                                (* rust-indent-offset level)
-                             (* rust-indent-offset (+ 1 level)))))))))))
+                             (* rust-indent-offset (+ 1 level))))))))))
 
               ;; Otherwise we're in a column-zero definition
               (t 0))))))