3 files changed, 18 insertions, 8 deletions

diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
index cc69463a9..bae4c4650 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -3,6 +3,7 @@
 pub mod codegen;
 
 use std::{
+    env,
     error::Error,
     fs,
     io::{Error as IoError, ErrorKind},
@@ -17,7 +18,13 @@ pub type Result<T> = std::result::Result<T, Box<dyn Error>>;
 const TOOLCHAIN: &str = "stable";
 
 pub fn project_root() -> PathBuf {
-    Path::new(&env!("CARGO_MANIFEST_DIR")).ancestors().nth(1).unwrap().to_path_buf()
+    Path::new(
+        &env::var("CARGO_MANIFEST_DIR").unwrap_or_else(|_| env!("CARGO_MANIFEST_DIR").to_owned()),
+    )
+    .ancestors()
+    .nth(1)
+    .unwrap()
+    .to_path_buf()
 }
 
 pub struct Cmd<'a> {
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index abcbf7129..e04e45f15 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -2,7 +2,7 @@
 //!
 //! This binary defines various auxiliary build commands, which are not
 //! expressible with just `cargo`. Notably, it provides `cargo xtask codegen`
-//! for code genetaiont and `cargo xtask install` for installation of
+//! for code generation and `cargo xtask install` for installation of
 //! rust-analyzer server and client.
 //!
 //! This binary is integrated into the `cargo` command line by using an alias in
diff --git a/xtask/tests/tidy-tests/docs.rs b/xtask/tests/tidy-tests/docs.rs
index 6a629ce63..227937f46 100644
--- a/xtask/tests/tidy-tests/docs.rs
+++ b/xtask/tests/tidy-tests/docs.rs
@@ -36,6 +36,7 @@ fn is_hidden(entry: &DirEntry) -> bool {
 fn no_docs_comments() {
     let crates = project_root().join("crates");
     let iter = WalkDir::new(crates);
+    let mut missing_docs = Vec::new();
     for f in iter.into_iter().filter_entry(|e| !is_hidden(e)) {
         let f = f.unwrap();
         if f.file_type().is_dir() {
@@ -54,12 +55,14 @@ fn no_docs_comments() {
         let mut line = String::new();
         reader.read_line(&mut line).unwrap();
         if !line.starts_with("//!") {
-            panic!(
-                "\nMissing docs strings\n\
-                 module: {}\n\
-                 Need add doc for module\n",
-                f.path().display()
-            )
+            missing_docs.push(f.path().display().to_string());
         }
     }
+    if !missing_docs.is_empty() {
+        panic!(
+            "\nMissing docs strings\n\n\
+             modules:\n{}\n\n",
+            missing_docs.join("\n")
+        )
+    }
 }