---

yaml
---
r: 30119
b: refs/heads/incoming
c: 785c524
h: refs/heads/master
i:
  30117: e1c2ac9
  30115: 91623cc
  30111: c833aba
v: v3

Author: nikomatsakis

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: a831726b94154e040479b86b33f891f1e2ecc1d4
+refs/heads/incoming: 785c524d3ecbb44760139c9a2deab8f897ab0426
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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)