Guide new users to add use super::*; to mod test

diff --git a/src/cargo/ops/cargo_new.rs b/src/cargo/ops/cargo_new.rs
index 281eec4aa4b4dd01ece4b651c182002486fe8e1e..48b5e0803949796281f3045ca3c43d2369c60d8f 100644 (file)
--- a/src/cargo/ops/cargo_new.rs
+++ b/src/cargo/ops/cargo_new.rs
@@ -809,13 +809,17 @@ fn main() {
 "
         } else {
             b"\
+pub fn add(left: usize, right: usize) -> usize {
+    left + right
+}
+
 #[cfg(test)]
 mod tests {
-    // Uncomment this to use items from the containing module.
-    // use super::*;
+    use super::*;
+    
     #[test]
     fn it_works() {
-        let result = 2 + 2;
+        let result = add(2, 2);
         assert_eq!(result, 4);
     }
 }

diff --git a/tests/testsuite/init/auto_git/out/src/lib.rs b/tests/testsuite/init/auto_git/out/src/lib.rs
index d4dead2428101388ea6aea5640231f8a6c41fd93..7d12d9af8195bf5e19d10c7b592b359ccd014149 100644 (file)
--- a/tests/testsuite/init/auto_git/out/src/lib.rs
+++ b/tests/testsuite/init/auto_git/out/src/lib.rs
@@ -1,10 +1,14 @@
+pub fn add(left: usize, right: usize) -> usize {
+    left + right
+}
+
 #[cfg(test)]
 mod tests {
-    // Uncomment this to use items from the containing module.
-    // use super::*;
+    use super::*;
+
     #[test]
     fn it_works() {
-        let result = 2 + 2;
+        let result = add(2, 2);
         assert_eq!(result, 4);
     }
 }

diff --git a/tests/testsuite/init/formats_source/out/src/lib.rs b/tests/testsuite/init/formats_source/out/src/lib.rs
index 97f71e00133f35584579ccdf0700b78d2096f747..3b9acffd5adb77abfef965f711aa1357a29719f0 100644 (file)
--- a/tests/testsuite/init/formats_source/out/src/lib.rs
+++ b/tests/testsuite/init/formats_source/out/src/lib.rs
@@ -1,10 +1,14 @@
+pub fn add(left: usize, right: usize) -> usize {
+  left + right
+}
+
 #[cfg(test)]
 mod tests {
-  // Uncomment this to use items from the containing module.
-  // use super::*;
+  use super::*;
+
   #[test]
   fn it_works() {
-    let result = 2 + 2;
+    let result = add(2, 2);
     assert_eq!(result, 4);
   }
 }

diff --git a/tests/testsuite/init/fossil_autodetect/out/src/lib.rs b/tests/testsuite/init/fossil_autodetect/out/src/lib.rs
index d4dead2428101388ea6aea5640231f8a6c41fd93..7d12d9af8195bf5e19d10c7b592b359ccd014149 100644 (file)
--- a/tests/testsuite/init/fossil_autodetect/out/src/lib.rs
+++ b/tests/testsuite/init/fossil_autodetect/out/src/lib.rs
@@ -1,10 +1,14 @@
+pub fn add(left: usize, right: usize) -> usize {
+    left + right
+}
+
 #[cfg(test)]
 mod tests {
-    // Uncomment this to use items from the containing module.
-    // use super::*;
+    use super::*;
+
     #[test]
     fn it_works() {
-        let result = 2 + 2;
+        let result = add(2, 2);
         assert_eq!(result, 4);
     }
 }

diff --git a/tests/testsuite/init/git_autodetect/out/src/lib.rs b/tests/testsuite/init/git_autodetect/out/src/lib.rs
index d4dead2428101388ea6aea5640231f8a6c41fd93..7d12d9af8195bf5e19d10c7b592b359ccd014149 100644 (file)
--- a/tests/testsuite/init/git_autodetect/out/src/lib.rs
+++ b/tests/testsuite/init/git_autodetect/out/src/lib.rs
@@ -1,10 +1,14 @@
+pub fn add(left: usize, right: usize) -> usize {
+    left + right
+}
+
 #[cfg(test)]
 mod tests {
-    // Uncomment this to use items from the containing module.
-    // use super::*;
+    use super::*;
+
     #[test]
     fn it_works() {
-        let result = 2 + 2;
+        let result = add(2, 2);
         assert_eq!(result, 4);
     }
 }

diff --git a/tests/testsuite/init/git_ignore_exists_no_conflicting_entries/out/src/lib.rs b/tests/testsuite/init/git_ignore_exists_no_conflicting_entries/out/src/lib.rs
index d4dead2428101388ea6aea5640231f8a6c41fd93..7d12d9af8195bf5e19d10c7b592b359ccd014149 100644 (file)
--- a/tests/testsuite/init/git_ignore_exists_no_conflicting_entries/out/src/lib.rs
+++ b/tests/testsuite/init/git_ignore_exists_no_conflicting_entries/out/src/lib.rs
@@ -1,10 +1,14 @@
+pub fn add(left: usize, right: usize) -> usize {
+    left + right
+}
+
 #[cfg(test)]
 mod tests {
-    // Uncomment this to use items from the containing module.
-    // use super::*;
+    use super::*;
+
     #[test]
     fn it_works() {
-        let result = 2 + 2;
+        let result = add(2, 2);
         assert_eq!(result, 4);
     }
 }

diff --git a/tests/testsuite/init/ignores_failure_to_format_source/out/src/lib.rs b/tests/testsuite/init/ignores_failure_to_format_source/out/src/lib.rs
index d4dead2428101388ea6aea5640231f8a6c41fd93..7d12d9af8195bf5e19d10c7b592b359ccd014149 100644 (file)
--- a/tests/testsuite/init/ignores_failure_to_format_source/out/src/lib.rs
+++ b/tests/testsuite/init/ignores_failure_to_format_source/out/src/lib.rs
@@ -1,10 +1,14 @@
+pub fn add(left: usize, right: usize) -> usize {
+    left + right
+}
+
 #[cfg(test)]
 mod tests {
-    // Uncomment this to use items from the containing module.
-    // use super::*;
+    use super::*;
+
     #[test]
     fn it_works() {
-        let result = 2 + 2;
+        let result = add(2, 2);
         assert_eq!(result, 4);
     }
 }

diff --git a/tests/testsuite/init/mercurial_autodetect/out/src/lib.rs b/tests/testsuite/init/mercurial_autodetect/out/src/lib.rs
index d4dead2428101388ea6aea5640231f8a6c41fd93..7d12d9af8195bf5e19d10c7b592b359ccd014149 100644 (file)
--- a/tests/testsuite/init/mercurial_autodetect/out/src/lib.rs
+++ b/tests/testsuite/init/mercurial_autodetect/out/src/lib.rs
@@ -1,10 +1,14 @@
+pub fn add(left: usize, right: usize) -> usize {
+    left + right
+}
+
 #[cfg(test)]
 mod tests {
-    // Uncomment this to use items from the containing module.
-    // use super::*;
+    use super::*;
+
     #[test]
     fn it_works() {
-        let result = 2 + 2;
+        let result = add(2, 2);
         assert_eq!(result, 4);
     }
 }

diff --git a/tests/testsuite/init/pijul_autodetect/out/src/lib.rs b/tests/testsuite/init/pijul_autodetect/out/src/lib.rs
index d4dead2428101388ea6aea5640231f8a6c41fd93..7d12d9af8195bf5e19d10c7b592b359ccd014149 100644 (file)
--- a/tests/testsuite/init/pijul_autodetect/out/src/lib.rs
+++ b/tests/testsuite/init/pijul_autodetect/out/src/lib.rs
@@ -1,10 +1,14 @@
+pub fn add(left: usize, right: usize) -> usize {
+    left + right
+}
+
 #[cfg(test)]
 mod tests {
-    // Uncomment this to use items from the containing module.
-    // use super::*;
+    use super::*;
+
     #[test]
     fn it_works() {
-        let result = 2 + 2;
+        let result = add(2, 2);
         assert_eq!(result, 4);
     }
 }

diff --git a/tests/testsuite/init/simple_git/out/src/lib.rs b/tests/testsuite/init/simple_git/out/src/lib.rs
index d4dead2428101388ea6aea5640231f8a6c41fd93..7d12d9af8195bf5e19d10c7b592b359ccd014149 100644 (file)
--- a/tests/testsuite/init/simple_git/out/src/lib.rs
+++ b/tests/testsuite/init/simple_git/out/src/lib.rs
@@ -1,10 +1,14 @@
+pub fn add(left: usize, right: usize) -> usize {
+    left + right
+}
+
 #[cfg(test)]
 mod tests {
-    // Uncomment this to use items from the containing module.
-    // use super::*;
+    use super::*;
+
     #[test]
     fn it_works() {
-        let result = 2 + 2;
+        let result = add(2, 2);
         assert_eq!(result, 4);
     }
 }

diff --git a/tests/testsuite/init/simple_git_ignore_exists/out/src/lib.rs b/tests/testsuite/init/simple_git_ignore_exists/out/src/lib.rs
index d4dead2428101388ea6aea5640231f8a6c41fd93..7d12d9af8195bf5e19d10c7b592b359ccd014149 100644 (file)
--- a/tests/testsuite/init/simple_git_ignore_exists/out/src/lib.rs
+++ b/tests/testsuite/init/simple_git_ignore_exists/out/src/lib.rs
@@ -1,10 +1,14 @@
+pub fn add(left: usize, right: usize) -> usize {
+    left + right
+}
+
 #[cfg(test)]
 mod tests {
-    // Uncomment this to use items from the containing module.
-    // use super::*;
+    use super::*;
+
     #[test]
     fn it_works() {
-        let result = 2 + 2;
+        let result = add(2, 2);
         assert_eq!(result, 4);
     }
 }

diff --git a/tests/testsuite/init/simple_hg/out/src/lib.rs b/tests/testsuite/init/simple_hg/out/src/lib.rs
index d4dead2428101388ea6aea5640231f8a6c41fd93..7d12d9af8195bf5e19d10c7b592b359ccd014149 100644 (file)
--- a/tests/testsuite/init/simple_hg/out/src/lib.rs
+++ b/tests/testsuite/init/simple_hg/out/src/lib.rs
@@ -1,10 +1,14 @@
+pub fn add(left: usize, right: usize) -> usize {
+    left + right
+}
+
 #[cfg(test)]
 mod tests {
-    // Uncomment this to use items from the containing module.
-    // use super::*;
+    use super::*;
+
     #[test]
     fn it_works() {
-        let result = 2 + 2;
+        let result = add(2, 2);
         assert_eq!(result, 4);
     }
 }

diff --git a/tests/testsuite/init/simple_hg_ignore_exists/out/src/lib.rs b/tests/testsuite/init/simple_hg_ignore_exists/out/src/lib.rs
index d4dead2428101388ea6aea5640231f8a6c41fd93..7d12d9af8195bf5e19d10c7b592b359ccd014149 100644 (file)
--- a/tests/testsuite/init/simple_hg_ignore_exists/out/src/lib.rs
+++ b/tests/testsuite/init/simple_hg_ignore_exists/out/src/lib.rs
@@ -1,10 +1,14 @@
+pub fn add(left: usize, right: usize) -> usize {
+    left + right
+}
+
 #[cfg(test)]
 mod tests {
-    // Uncomment this to use items from the containing module.
-    // use super::*;
+    use super::*;
+
     #[test]
     fn it_works() {
-        let result = 2 + 2;
+        let result = add(2, 2);
         assert_eq!(result, 4);
     }
 }

diff --git a/tests/testsuite/init/simple_lib/out/src/lib.rs b/tests/testsuite/init/simple_lib/out/src/lib.rs
index d4dead2428101388ea6aea5640231f8a6c41fd93..7d12d9af8195bf5e19d10c7b592b359ccd014149 100644 (file)
--- a/tests/testsuite/init/simple_lib/out/src/lib.rs
+++ b/tests/testsuite/init/simple_lib/out/src/lib.rs
@@ -1,10 +1,14 @@
+pub fn add(left: usize, right: usize) -> usize {
+    left + right
+}
+
 #[cfg(test)]
 mod tests {
-    // Uncomment this to use items from the containing module.
-    // use super::*;
+    use super::*;
+
     #[test]
     fn it_works() {
-        let result = 2 + 2;
+        let result = add(2, 2);
         assert_eq!(result, 4);
     }
 }

diff --git a/tests/testsuite/new.rs b/tests/testsuite/new.rs
index 1c7abc1b25f9b38577649ed55860937dc4494692..92a5ed4655521b5fb26c706dbcdd8452af0072ca 100644 (file)
--- a/tests/testsuite/new.rs
+++ b/tests/testsuite/new.rs
@@ -39,13 +39,17 @@ fn simple_lib() {
     let contents = fs::read_to_string(&lib).unwrap();
     assert_eq!(
         contents,
-        r#"#[cfg(test)]
+        r#"pub fn add(left: usize, right: usize) -> usize {
+    left + right
+}
+
+#[cfg(test)]
 mod tests {
-    // Uncomment this to use items from the containing module.
-    // use super::*;
+    use super::*;
+
     #[test]
     fn it_works() {
-        let result = 2 + 2;
+        let result = add(2, 2);
         assert_eq!(result, 4);
     }
 }