diff --git a/components/constellation/constellation.rs b/components/constellation/constellation.rs
index 9f147cfba66..b9719c64f19 100644
--- a/components/constellation/constellation.rs
+++ b/components/constellation/constellation.rs
@@ -2037,7 +2037,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
             let visibility_msg = ConstellationControlMsg::NotifyVisibilityChange(parent_pipeline_id,
                                                                                  browsing_context_id,
                                                                                  visibility);
-            let  result = match self.pipelines.get(&parent_pipeline_id) {
+            let result = match self.pipelines.get(&parent_pipeline_id) {
                 None => return warn!("Parent pipeline {:?} closed", parent_pipeline_id),
                 Some(parent_pipeline) => parent_pipeline.event_loop.send(visibility_msg),
             };
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index 8390b5371fd..dd708529f88 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -960,7 +960,7 @@ impl Document {
             let line = click_pos - last_pos;
             let dist = (line.dot(line) as f64).sqrt();
 
-            if  now.duration_since(last_time) < DBL_CLICK_TIMEOUT &&
+            if now.duration_since(last_time) < DBL_CLICK_TIMEOUT &&
                 dist < DBL_CLICK_DIST_THRESHOLD as f64 {
                 // A double click has occurred if this click is within a certain time and dist. of previous click.
                 let click_count = 2;
diff --git a/components/script/serviceworker_manager.rs b/components/script/serviceworker_manager.rs
index 793d7ccf370..2bf19aa25a5 100644
--- a/components/script/serviceworker_manager.rs
+++ b/components/script/serviceworker_manager.rs
@@ -176,7 +176,7 @@ impl ServiceWorkerManager {
                     }
                 }
             } else {
-                let  _ = mediator.response_chan.send(None);
+                let _ = mediator.response_chan.send(None);
             }
         } else {
             let _ = mediator.response_chan.send(None);
diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py
index 989b83aa505..3bf6176de44 100644
--- a/python/tidy/servo_tidy/tidy.py
+++ b/python/tidy/servo_tidy/tidy.py
@@ -584,6 +584,12 @@ def check_rust(file_name, lines):
             # -> () is unnecessary
             (r"-> \(\)", "encountered function signature with -> ()", no_filter),
         ]
+        keywords = ["if", "let", "mut", "extern", "as", "impl", "fn", "struct", "enum", "pub", "mod",
+                    "use", "in", "ref", "type", "where", "trait"]
+        extra_space_after = lambda key: (r"(?<![A-Za-z0-9\-_]){key}  ".format(key=key),
+                                         "extra space after {key}".format(key=key),
+                                         lambda match, line: not is_attribute)
+        regex_rules.extend(map(extra_space_after, keywords))
 
         for pattern, message, filter_func in regex_rules:
             for match in re.finditer(pattern, line):
diff --git a/python/tidy/servo_tidy_tests/rust_tidy.rs b/python/tidy/servo_tidy_tests/rust_tidy.rs
index f50cbaa5ef7..bed4664a279 100644
--- a/python/tidy/servo_tidy_tests/rust_tidy.rs
+++ b/python/tidy/servo_tidy_tests/rust_tidy.rs
@@ -72,4 +72,10 @@ impl test {
       } else { // Should not trigger
           "false"
       } // Should not trigger
+
+    if  true { // Double space after keyword
+        42
+    } else {
+        let xif = 42 in {  xif  } // Should not trigger
+    }
 }
diff --git a/python/tidy/servo_tidy_tests/test_tidy.py b/python/tidy/servo_tidy_tests/test_tidy.py
index e02e065bd10..df8bf316cd0 100644
--- a/python/tidy/servo_tidy_tests/test_tidy.py
+++ b/python/tidy/servo_tidy_tests/test_tidy.py
@@ -95,6 +95,7 @@ class CheckTidiness(unittest.TestCase):
 
     def test_rust(self):
         errors = tidy.collect_errors_for_files(iterFile('rust_tidy.rs'), [], [tidy.check_rust], print_text=False)
+        self.assertEqual('extra space after use', errors.next()[2])
         self.assertEqual('extra space after {', errors.next()[2])
         self.assertEqual('extra space before }', errors.next()[2])
         self.assertEqual('use statement spans multiple lines', errors.next()[2])
@@ -133,6 +134,7 @@ class CheckTidiness(unittest.TestCase):
         self.assertEqual('no = in the beginning of line', errors.next()[2])
         self.assertEqual('space before { is not a multiple of 4', errors.next()[2])
         self.assertEqual('space before } is not a multiple of 4', errors.next()[2])
+        self.assertEqual('extra space after if', errors.next()[2])
         self.assertNoMoreErrors(errors)
 
         feature_errors = tidy.collect_errors_for_files(iterFile('lib.rs'), [], [tidy.check_rust], print_text=False)
diff --git a/tests/unit/net/http_loader.rs b/tests/unit/net/http_loader.rs
index 4260e39e76f..bff34263a52 100644
--- a/tests/unit/net/http_loader.rs
+++ b/tests/unit/net/http_loader.rs
@@ -943,7 +943,7 @@ fn test_load_follows_a_redirect() {
 }
 
 #[test]
-fn  test_redirect_from_x_to_y_provides_y_cookies_from_y() {
+fn test_redirect_from_x_to_y_provides_y_cookies_from_y() {
     let shared_url_y = Arc::new(Mutex::new(None::<ServoUrl>));
     let shared_url_y_clone = shared_url_y.clone();
     let handler = move |request: HyperRequest, mut response: HyperResponse| {