compiles if i mess with the macro use

Author: hjr3

src/lib.rs

@@ -227,7 +227,7 @@ pub fn test(config: &Config) -> Result<()> {
     let docs: Documentation = serde_json::from_reader(doc_json)?;
 
     let location = config.output_path().join("tests");
-    let tests = test::find_tests(&config, &docs);
+    let tests = test::find_tests(&docs);
     test::save_tests(&config, &tests, &location)?;
     let binary = test::compile_tests(&config, &location)?;
     test::execute_tests(&binary)?;

src/test.rs

@@ -27,13 +27,12 @@ struct Extern {
     location: PathBuf,
 }
 
-pub fn find_tests<'a>(config: &Config, docs: &'a Documentation) -> Vec<(&'a String, Vec<String>)> {
-    let externs = find_externs_for_crate(config).unwrap();
+pub fn find_tests<'a>(docs: &'a Documentation) -> Vec<(&'a String, Vec<String>)> {
     let krate = docs.data.as_ref().unwrap();
 
     iter::once(krate)
         .chain(docs.included.iter().flat_map(|data| data))
-        .map(|data| (&data.id, gather_tests(&data, &externs)))
+        .map(|data| (&data.id, gather_tests(&data)))
         .collect()
 }
 
@@ -87,13 +86,13 @@ fn find_externs_for_crate(config: &Config) -> Result <Vec<Extern>> {
 }
 
 /// Find and prepare tests in the given document.
-fn gather_tests(document: &Document, externs: &[Extern]) -> Vec<String> {
+fn gather_tests(document: &Document) -> Vec<String> {
     if let Some(docs) = document.attributes.get("docs") {
         find_test_blocks(docs)
             .into_iter()
             .map(|block| {
                 let crate_name = document.id.split("::").next().unwrap();
-                preprocess(&block, crate_name, externs)
+                preprocess(&block, crate_name)
             })
             .collect()
     } else {
@@ -149,7 +148,7 @@ fn find_test_blocks(docs: &str) -> Vec<String> {
 /// 2. Wrap the code in `fn main() {}` if there is no `main` function.
 ///
 /// Any crate attributes are preserved at the top level.
-fn preprocess(test: &str, crate_name: &str, externs: &[Extern]) -> String {
+fn preprocess(test: &str, crate_name: &str) -> String {
     if let Ok(mut ast) = syn::parse_crate(test) {
         let has_extern_crate = ast.items.iter().any(|item| match item.node {
             ItemKind::ExternCrate(..) => true,
@@ -187,6 +186,19 @@ fn preprocess(test: &str, crate_name: &str, externs: &[Extern]) -> String {
             stmts.push(main_fn_call);
         }
 
+        // TODO: Handle `#![doc(test(no_crate_inject))]`?
+        if !has_extern_crate && crate_name != "std" {
+            stmts.insert(
+                0,
+                Stmt::Item(Box::new(Item {
+                    ident: Ident::new(crate_name),
+                    vis: Visibility::Inherited,
+                    attrs: vec![],
+                    node: ItemKind::ExternCrate(None),
+                })),
+            )
+        }
+
         let a_doc_test = ItemKind::Fn(
             Box::new(FnDecl {
                 inputs: vec![],
@@ -217,31 +229,6 @@ fn preprocess(test: &str, crate_name: &str, externs: &[Extern]) -> String {
             node: a_doc_test,
         });
 
-        // TODO: Handle `#![doc(test(no_crate_inject))]`?
-        if !has_extern_crate && crate_name != "std" {
-            ast.items.insert(
-                0,
-                Item {
-                    ident: Ident::new(crate_name),
-                    vis: Visibility::Inherited,
-                    attrs: vec![],
-                    node: ItemKind::ExternCrate(None),
-                },
-            )
-        }
-
-        //for e in externs {
-        //    ast.items.insert(
-        //        0,
-        //        Item {
-        //            ident: Ident::new(e.name.clone()),
-        //            vis: Visibility::Inherited,
-        //            attrs: vec![],
-        //            node: ItemKind::ExternCrate(None),
-        //        },
-        //    )
-        //}
-
         let mut tokens = Tokens::new();
         ast.to_tokens(&mut tokens);
         let program = tokens.to_string();
@@ -280,13 +267,14 @@ pub fn save_tests(config: &Config, tests: &Vec<(&String, Vec<String>)>, save_pat
     // TODO use syn here as well?
     let mut main = String::new();
 
-    let externs = find_externs_for_crate(config)?;
-    for e in externs {
-        let name = e.name.replace("\"", "");
-        let name = name.replace("-", "_");
-        main.push_str(&format!("extern crate {};\n", name));
-    }
+    //let externs = find_externs_for_crate(config)?;
+    //for e in externs {
+    //    let name = e.name.replace("\"", "");
+    //    let name = name.replace("-", "_");
+    //    main.push_str(&format!("extern crate {};\n", name));
+    //}
 
+    main.push_str("#[macro_use] extern crate hyper;");
     for m in mods {
         main.push_str(&format!("mod {};\n", m));
     }
@@ -343,6 +331,11 @@ pub fn compile_tests(config: &Config, save_path: &Path) -> Result<PathBuf> {
         }
     }
 
+    let crate_externs = find_externs_for_crate(config)?;
+    let search_path = crate_externs.first().map(|e| {
+        e.location.parent().unwrap().to_path_buf()
+    }).unwrap();
+
     let extern_args: Vec<_> = externs
         .into_iter()
         .flat_map(|arg| vec![String::from("--extern"), arg])
@@ -353,6 +346,8 @@ pub fn compile_tests(config: &Config, save_path: &Path) -> Result<PathBuf> {
         .arg("--test")
         .args(&["-o", TEST_NAME])
         .args(&["--cap-lints", "allow"])
+        .arg("-L")
+        .arg(search_path.to_str().unwrap())
         .args(extern_args)
         .current_dir(&save_path)
         .output()?;