tests: add tests to cover cfg_if mods

Author: calebcartwright

src/modules/visitor.rs

@@ -54,11 +54,16 @@ impl<'a, 'ast: 'a> CfgIfVisitor<'a> {
         // extern crate cfg_if;
         // cfg_if! {..}
         // ```
-        if let Some(first_segment) = mac.node.path.segments.first() {
-            if first_segment.ident.name != Symbol::intern("cfg_if") {
+        match mac.node.path.segments.first() {
+            Some(first_segment) => {
+                if first_segment.ident.name != Symbol::intern("cfg_if") {
+                    return Err("Expected cfg_if");
+                }
+            }
+            None => {
                 return Err("Expected cfg_if");
             }
-        }
+        };
 
         let mut parser = stream_to_parser_with_base_dir(
             self.parse_sess,

src/test/mod.rs

@@ -30,6 +30,9 @@ const SKIP_FILE_WHITE_LIST: &[&str] = &[
     // These files and directory are a part of modules defined inside `cfg_if!`.
     "cfg_if/mod.rs",
     "cfg_if/detect",
+    "issue-3253/foo.rs",
+    "issue-3253/bar.rs",
+    "issue-3253/paths",
     // These files and directory are a part of modules defined inside `cfg_attr(..)`.
     "cfg_mod/dir",
     "cfg_mod/bar.rs",

tests/source/issue-3253/bar.rs

@@ -0,0 +1,4 @@
+// Empty
+   fn empty()     {
+
+}

tests/source/issue-3253/foo.rs

@@ -0,0 +1,6 @@
+pub    fn hello(  )
+    {
+println!("Hello World!");
+
+            }
+

tests/source/issue-3253/lib.rs

@@ -0,0 +1,14 @@
+#[macro_use]
+extern crate cfg_if;
+
+cfg_if! {
+    if #[cfg(target_family = "unix")] {
+        mod foo;
+        #[path = "paths/bar_foo.rs"]
+        mod bar_foo;
+    } else {
+        mod bar;
+        #[path = "paths/foo_bar.rs"]
+        mod foo_bar;
+    }
+}

tests/source/issue-3253/paths/bar_foo.rs

@@ -0,0 +1,3 @@
+fn    foo_decl_item(x: &mut i32) {
+    x = 3;
+}

tests/source/issue-3253/paths/excluded.rs

@@ -0,0 +1,6 @@
+// This module is not imported in the cfg_if macro in lib.rs so it is ignored
+// while the foo and bar mods are formatted.
+// Check the corresponding file in tests/target/issue-3253/paths/excluded.rs
+trait CoolerTypes { fn dummy(&self) {
+}
+}

tests/source/issue-3253/paths/foo_bar.rs

@@ -0,0 +1,4 @@
+
+
+fn Foo<T>() where T: Bar {
+}

tests/target/issue-3253/bar.rs

@@ -0,0 +1,2 @@
+// Empty
+fn empty() {}

tests/target/issue-3253/foo.rs

@@ -0,0 +1,3 @@
+pub fn hello() {
+    println!("Hello World!");
+}

tests/target/issue-3253/lib.rs

@@ -0,0 +1,14 @@
+#[macro_use]
+extern crate cfg_if;
+
+cfg_if! {
+    if #[cfg(target_family = "unix")] {
+        mod foo;
+        #[path = "paths/bar_foo.rs"]
+        mod bar_foo;
+    } else {
+        mod bar;
+        #[path = "paths/foo_bar.rs"]
+        mod foo_bar;
+    }
+}

tests/target/issue-3253/paths/bar_foo.rs

@@ -0,0 +1,3 @@
+fn foo_decl_item(x: &mut i32) {
+    x = 3;
+}

tests/target/issue-3253/paths/excluded.rs

@@ -0,0 +1,17 @@
+// This module is not imported in the cfg_if macro in lib.rs so it is ignored
+// while the foo and bar mods are formatted.
+// Check the corresponding file in tests/source/issue-3253/paths/excluded.rs
+
+
+
+
+    fn Foo<T>() where T: Bar {
+}
+
+
+
+trait CoolerTypes { fn dummy(&self) {
+}
+}
+
+

tests/target/issue-3253/paths/foo_bar.rs

@@ -0,0 +1,5 @@
+fn Foo<T>()
+where
+    T: Bar,
+{
+}