works unless the doctest is using macros

Author: hjr3

src/lib.rs

@@ -226,9 +226,13 @@ pub fn test(config: &Config) -> Result<()> {
         .map_err(|e| failure::Error::from(e.context("could not find generated documentation")))?;
     let docs: Documentation = serde_json::from_reader(doc_json)?;
 
+    // TODO a better way to find crate name?
+    let krate = docs.data.as_ref().unwrap();
+    let crate_name = krate.id.split("::").next().unwrap();
+
     let location = config.output_path().join("tests");
     let tests = test::find_tests(&docs);
-    test::save_tests(&config, &tests, &location)?;
+    test::save_tests(&tests, &location, &crate_name)?;
     let binary = test::compile_tests(&config, &location)?;
     test::execute_tests(&binary)?;
 

src/test.rs

@@ -150,6 +150,8 @@ fn find_test_blocks(docs: &str) -> Vec<String> {
 /// Any crate attributes are preserved at the top level.
 fn preprocess(test: &str, crate_name: &str) -> String {
     if let Ok(mut ast) = syn::parse_crate(test) {
+
+        // TODO if the extern crate has `#[macro_use]` we need to strip it out
         let has_extern_crate = ast.items.iter().any(|item| match item.node {
             ItemKind::ExternCrate(..) => true,
             _ => false,
@@ -241,7 +243,7 @@ fn preprocess(test: &str, crate_name: &str) -> String {
     }
 }
 
-pub fn save_tests(config: &Config, tests: &Vec<(&String, Vec<String>)>, save_path: &Path) -> Result<()> {
+pub fn save_tests(tests: &Vec<(&String, Vec<String>)>, save_path: &Path, crate_name: &str) -> Result<()> {
     DirBuilder::new().recursive(true).create(save_path)?;
 
     let mut mods = vec![];
@@ -267,14 +269,7 @@ 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));
-    //}
-
-    main.push_str("#[macro_use] extern crate hyper;");
+    main.push_str(&format!("extern crate {};", crate_name));
     for m in mods {
         main.push_str(&format!("mod {};\n", m));
     }
@@ -288,50 +283,13 @@ pub fn save_tests(config: &Config, tests: &Vec<(&String, Vec<String>)>, save_pat
 pub fn compile_tests(config: &Config, save_path: &Path) -> Result<PathBuf> {
     static TEST_NAME: &str = "rustdoc-test";
 
-    // First, determine the location of the dependency artifacts so we can pass them to rustc.
-    let output = Command::new("cargo")
-        .arg("build")
-        .arg("--manifest-path")
-        .arg(&config.manifest_path)
-        .args(&["--message-format", "json"])
-        .output()?;
-    if !output.status.success() {
-        return Err(format_err!(
-            "cargo did not exit successfully: {}",
-            output.status
-        ));
-    }
-
-    let output = String::from_utf8(output.stdout).expect("cargo did not output valid utf-8");
+    let crate_externs = find_externs_for_crate(config)?;
 
     let mut externs = vec![];
-
-    for message in output.lines() {
-        let message = serde_json::from_str::<Value>(message)?;
-        let is_compiler_artifact = message
-            .as_object()
-            .unwrap()
-            .get("reason")
-            .and_then(Value::as_str)
-            .map(|reason| reason == "compiler-artifact")
-            .unwrap_or_default();
-
-        if is_compiler_artifact {
-            let name = message
-                .pointer("/target/name")
-                .and_then(Value::as_str)
-                .unwrap();
-            let name = name.replace("-", "_");
-            let rlib = message
-                .pointer("/filenames/0")
-                .and_then(Value::as_str)
-                .unwrap();
-
-            externs.push(format!("{}={}", name, rlib));
-        }
+    for c in crate_externs.iter() {
+        externs.push(format!("{}={}", &c.name, &c.location.to_string_lossy()));
     }
 
-    let crate_externs = find_externs_for_crate(config)?;
     let search_path = crate_externs.first().map(|e| {
         e.location.parent().unwrap().to_path_buf()
     }).unwrap();