6 files changed, 7 insertions, 8 deletions

diff --git a/crates/ra_cli/Cargo.toml b/crates/ra_cli/Cargo.toml
index 328b2436f..3117f4fda 100644
--- a/crates/ra_cli/Cargo.toml
+++ b/crates/ra_cli/Cargo.toml
@@ -14,7 +14,6 @@ indicatif = "0.11.0"
 
 ra_syntax = { path = "../ra_syntax" }
 ra_ide_api = { path = "../ra_ide_api" }
-tools = { path = "../tools" }
 ra_batch = { path = "../ra_batch" }
 ra_hir = { path = "../ra_hir" }
 ra_db = { path = "../ra_db" }
diff --git a/crates/tools/Cargo.toml b/crates/ra_tools/Cargo.toml
index f03256a74..35ea3231b 100644
--- a/crates/tools/Cargo.toml
+++ b/crates/ra_tools/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 edition = "2018"
-name = "tools"
+name = "ra_tools"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
 publish = false
diff --git a/crates/tools/src/bin/pre-commit.rs b/crates/ra_tools/src/bin/pre-commit.rs
index ea18c0863..c514e992b 100644
--- a/crates/tools/src/bin/pre-commit.rs
+++ b/crates/ra_tools/src/bin/pre-commit.rs
@@ -2,10 +2,10 @@ use std::process::Command;
 
 use failure::bail;
 
-use tools::{Result, run_rustfmt, run, project_root};
+use ra_tools::{Result, run_rustfmt, run, project_root, Overwrite};
 
-fn main() -> tools::Result<()> {
-    run_rustfmt(tools::Overwrite)?;
+fn main() -> Result<()> {
+    run_rustfmt(Overwrite)?;
     update_staged()
 }
 
diff --git a/crates/tools/src/lib.rs b/crates/ra_tools/src/lib.rs
index 2446fdf28..61f6b08cd 100644
--- a/crates/tools/src/lib.rs
+++ b/crates/ra_tools/src/lib.rs
@@ -121,7 +121,7 @@ pub fn install_format_hook() -> Result<()> {
         "./.git/hooks/pre-commit"
     });
     if !result_path.exists() {
-        run("cargo build --package tools --bin pre-commit", ".")?;
+        run("cargo build --package ra_tools --bin pre-commit", ".")?;
         if cfg!(windows) {
             fs::copy("./target/debug/pre-commit.exe", result_path)?;
         } else {
diff --git a/crates/tools/src/main.rs b/crates/ra_tools/src/main.rs
index 8027ff833..285071ea5 100644
--- a/crates/tools/src/main.rs
+++ b/crates/ra_tools/src/main.rs
@@ -1,7 +1,7 @@
 use clap::{App, SubCommand};
 use core::str;
 use failure::bail;
-use tools::{
+use ra_tools::{
     generate, gen_tests, install_format_hook, run, run_with_output, run_rustfmt,
     Overwrite, Result, run_fuzzer, run_clippy,
 };
diff --git a/crates/tools/tests/cli.rs b/crates/ra_tools/tests/cli.rs
index 6f82ae61d..83640218f 100644
--- a/crates/tools/tests/cli.rs
+++ b/crates/ra_tools/tests/cli.rs
@@ -1,6 +1,6 @@
 use walkdir::WalkDir;
 
-use tools::{generate, gen_tests, run_rustfmt, Verify, project_root};
+use ra_tools::{generate, gen_tests, run_rustfmt, Verify, project_root};
 
 #[test]
 fn generated_grammar_is_fresh() {