3 files changed, 19 insertions, 20 deletions

diff --git a/crates/tools/src/lib.rs b/crates/tools/src/lib.rs
index ba7d10caa..548b157dd 100644
--- a/crates/tools/src/lib.rs
+++ b/crates/tools/src/lib.rs
@@ -8,13 +8,19 @@ extern crate heck;
 use std::{
     collections::HashMap,
     fs,
-    path::Path,
+    path::{Path, PathBuf},
 };
 use itertools::Itertools;
 use heck::{CamelCase, ShoutySnakeCase, SnakeCase};
 
 pub type Result<T> = ::std::result::Result<T, failure::Error>;
 
+const GRAMMAR: &str = "ra_syntax/src/grammar.ron";
+pub const SYNTAX_KINDS: &str = "ra_syntax/src/syntax_kinds/generated.rs";
+pub const SYNTAX_KINDS_TEMPLATE: &str = "ra_syntax/src/syntax_kinds/generated.rs.tera";
+pub const AST: &str = "ra_syntax/src/ast/generated.rs";
+pub const AST_TEMPLATE: &str = "ra_syntax/src/ast/generated.rs.tera";
+
 #[derive(Debug)]
 pub struct Test {
     pub name: String,
@@ -71,9 +77,9 @@ pub fn update(path: &Path, contents: &str, verify: bool) -> Result<()> {
     Ok(())
 }
 
-pub fn render_template(template: &str) -> Result<String> {
+pub fn render_template(template: PathBuf) -> Result<String> {
     let grammar: ron::value::Value = {
-        let text = fs::read_to_string(format!("{}{}", Path::new(&std::env::var("CARGO_MANIFEST_DIR").unwrap()).parent().unwrap().to_str().unwrap(), "/ra_syntax/src/grammar.ron"))?;
+        let text = fs::read_to_string(project_root().join(GRAMMAR))?;
         ron::de::from_str(&text)?
     };
     let template = fs::read_to_string(template)?;
@@ -108,3 +114,7 @@ pub fn render_template(template: &str) -> Result<String> {
         Ok(tera::Value::Array(elements))
     }
 }
+
+pub fn project_root() -> PathBuf {
+    Path::new(&std::env::var("CARGO_MANIFEST_DIR").unwrap()).parent().unwrap().to_path_buf()
+}
diff --git a/crates/tools/src/main.rs b/crates/tools/src/main.rs
index aa6d964e6..549892bc6 100644
--- a/crates/tools/src/main.rs
+++ b/crates/tools/src/main.rs
@@ -11,15 +11,10 @@ use std::{
     path::{Path, PathBuf},
     process::Command,
 };
-use tools::{Test, collect_tests, render_template, update, Result};
+use tools::{AST, AST_TEMPLATE, Result, SYNTAX_KINDS, SYNTAX_KINDS_TEMPLATE, Test, collect_tests, render_template, update, project_root};
 
 const GRAMMAR_DIR: &str = "./crates/ra_syntax/src/grammar";
 const INLINE_TESTS_DIR: &str = "./crates/ra_syntax/tests/data/parser/inline";
-const GRAMMAR: &str = "./crates/ra_syntax/src/grammar.ron";
-const SYNTAX_KINDS: &str = "./crates/ra_syntax/src/syntax_kinds/generated.rs";
-const SYNTAX_KINDS_TEMPLATE: &str = "./crates/ra_syntax/src/syntax_kinds/generated.rs.tera";
-const AST: &str = "./crates/ra_syntax/src/ast/generated.rs";
-const AST_TEMPLATE: &str = "./crates/ra_syntax/src/ast/generated.rs.tera";
 
 fn main() -> Result<()> {
     let matches = App::new("tasks")
@@ -45,8 +40,8 @@ fn main() -> Result<()> {
 fn run_gen_command(name: &str, verify: bool) -> Result<()> {
     match name {
         "gen-kinds" => {
-            update(Path::new(SYNTAX_KINDS), &render_template(SYNTAX_KINDS_TEMPLATE)?, verify)?;
-            update(Path::new(AST), &render_template(AST_TEMPLATE)?, verify)?;
+            update(&project_root().join(SYNTAX_KINDS), &render_template(project_root().join(SYNTAX_KINDS_TEMPLATE))?, verify)?;
+            update(&project_root().join(AST), &render_template(project_root().join(AST_TEMPLATE))?, verify)?;
         },
         "gen-tests" => {
             gen_tests(verify)?
diff --git a/crates/tools/tests/cli.rs b/crates/tools/tests/cli.rs
index 9ff1eecd9..d0ed60f7a 100644
--- a/crates/tools/tests/cli.rs
+++ b/crates/tools/tests/cli.rs
@@ -1,19 +1,13 @@
 extern crate tools;
 
-use std::path::Path;
-use tools::{render_template, update};
-
-const SYNTAX_KINDS: &str = "../ra_syntax/src/syntax_kinds/generated.rs";
-const SYNTAX_KINDS_TEMPLATE: &str = "../ra_syntax/src/syntax_kinds/generated.rs.tera";
-const AST: &str = "../ra_syntax/src/ast/generated.rs";
-const AST_TEMPLATE: &str = "../ra_syntax/src/ast/generated.rs.tera";
+use tools::{AST, AST_TEMPLATE, SYNTAX_KINDS, SYNTAX_KINDS_TEMPLATE, render_template, update, project_root};
 
 #[test]
 fn verify_template_generation() {
-    if let Err(error) = update(Path::new(SYNTAX_KINDS), &render_template(SYNTAX_KINDS_TEMPLATE).unwrap(), true) {
+    if let Err(error) = update(&project_root().join(SYNTAX_KINDS), &render_template(project_root().join(SYNTAX_KINDS_TEMPLATE)).unwrap(), true) {
         panic!("{}. Please update it by running `cargo gen-kinds`", error);
     }
-    if let Err(error) = update(Path::new(AST), &render_template(AST_TEMPLATE).unwrap(), true) {
+    if let Err(error) = update(&project_root().join(AST), &render_template(project_root().join(AST_TEMPLATE)).unwrap(), true) {
         panic!("{}. Please update it by running `cargo gen-kinds`", error);
     }
 }