diff --git a/src/etc/tidy.py b/src/etc/tidy.py
index 03aeff1363093..fd3309dce12cb 100644
--- a/src/etc/tidy.py
+++ b/src/etc/tidy.py
@@ -91,6 +91,7 @@ def update_counts(current_name):
             'src/llvm',
             'src/gyp',
             'src/libbacktrace',
+            'src/libuv',
             'src/compiler-rt',
             'src/rt/hoedown',
             'src/rustllvm',
diff --git a/src/rt/rust_builtin.c b/src/rt/rust_builtin.c
index 382cbf0d5d129..6bf86f527390f 100644
--- a/src/rt/rust_builtin.c
+++ b/src/rt/rust_builtin.c
@@ -47,7 +47,8 @@ extern char **environ;
 #endif
 #endif
 
-#if defined(__FreeBSD__) || defined(__linux__) || defined(__ANDROID__) || defined(__DragonFly__) || defined(__OpenBSD__)
+#if defined(__FreeBSD__) || defined(__linux__) || defined(__ANDROID__) \
+  || defined(__DragonFly__) || defined(__OpenBSD__)
 extern char **environ;
 #endif
 
@@ -235,7 +236,7 @@ const char * rust_load_self() {
 
         /* get realpath if possible */
         if ((argv[0] != NULL) && ((*argv[0] == '.') || (*argv[0] == '/')
-				|| (strstr(argv[0], "/") != NULL)))
+                                || (strstr(argv[0], "/") != NULL)))
 
             self = realpath(argv[0], NULL);
         else