---

yaml
---
r: 79424
b: refs/heads/snap-stage3
c: 1c527df
h: refs/heads/master
v: v3

Author: MicahChalmer

[refs]

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

branches/snap-stage3/mk/tests.mk

@@ -250,7 +250,6 @@ tidy:
 		| grep '^$(S)src/test' -v \
 		| grep '^$(S)src/libuv' -v \
 		| grep '^$(S)src/llvm' -v \
-		| grep '^$(S)src/gyp' -v \
 		| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
 		$(Q)find $(S)src/etc -name '*.py' \
 		| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py

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

@@ -85,10 +85,10 @@
                         (not (looking-at "[[:space:]]*\\(?://.*\\)?$"))))
                    (+ 1 (current-column)))
                   ;; Check for fields on the same line as the open curly brace:
-                  ((looking-at "{[[:blank:]]*[^}\n]*,[[:space:]]*$")
+                  ((looking-at "{[[:space:]]*[^\n]*,[[:space:]]*$")
                    (progn
                     (forward-char)
-                    (forward-to-word 1)
+                    (when (looking-at "[[:space:]]") (forward-to-word 1))
                     (current-column)))
                   (t (progn
                      (goto-char pt)
@@ -100,7 +100,7 @@
                          (beginning-of-line)
                          (rust-rewind-irrelevant)
                          (end-of-line)
-                         (if (looking-back "[,;{}(][[:space:]]*\\(?://.*\\)?")
+                         (if (looking-back "[[,;{}(][[:space:]]*\\(?://.*\\)?")
                              (* rust-indent-offset level)
                            (back-to-indentation)
                            (if (looking-at "#")

branches/snap-stage3/src/libextra/extra.rs

@@ -85,7 +85,6 @@ pub mod getopts;
 pub mod json;
 pub mod md4;
 pub mod tempfile;
-pub mod glob;
 pub mod term;
 pub mod time;
 pub mod arena;