---

yaml
---
r: 21411
b: refs/heads/snap-stage3
c: 785c524
h: refs/heads/master
i:
  21409: 837033d
  21407: 39d325d
v: v3

Author: nikomatsakis

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: a831726b94154e040479b86b33f891f1e2ecc1d4
+refs/heads/snap-stage3: 785c524d3ecbb44760139c9a2deab8f897ab0426
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

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

@@ -271,8 +271,7 @@
       (setf cx parent parent (caddr (rust-state-context st))))
     (let* ((tp (rust-context-type cx))
            (closing (eq tp (char-after)))
-           (unit (if (member (rust-context-info cx) '(alt-inner alt-outer))
-                     (/ rust-indent-unit 2) rust-indent-unit))
+           (unit rust-indent-unit)
            (base (if (and (eq tp 'statement) parent (rust-context-align parent))
                      (rust-context-column parent) (rust-context-indent cx))))
       (cond ((eq tp 'comment) base)