[x] move to a new devtools/ directory

I want to split out the lint engine into its own crate -- `devtools/` is where it will live. Closes: diem#3351 Approved by: rexhoffman
yuan-xy · Apr 9, 2020 · d9a4c03 · d9a4c03
1 parent dac3a34
commit d9a4c03
Show file tree

Hide file tree

Showing 19 changed files with 5 additions and 2 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -34,6 +34,7 @@ members = [
     "consensus/safety-rules",
     "crypto/crypto",
     "crypto/crypto-derive",
+    "devtools/x",
     "execution/executor",
     "execution/executor-benchmark",
     "execution/executor-types",
@@ -105,7 +106,6 @@ members = [
     "testsuite/generate-format",
     "types",
     "vm-validator",
-    "x",
 ]
 
 # NOTE: These members should never include crates that require fuzzing

diff --git a/x/Cargo.toml → devtools/x/Cargo.toml b/x/Cargo.toml → devtools/x/Cargo.toml
diff --git a/x/src/bench.rs → devtools/x/src/bench.rs b/x/src/bench.rs → devtools/x/src/bench.rs
diff --git a/x/src/cargo.rs → devtools/x/src/cargo.rs b/x/src/cargo.rs → devtools/x/src/cargo.rs
diff --git a/x/src/check.rs → devtools/x/src/check.rs b/x/src/check.rs → devtools/x/src/check.rs
diff --git a/x/src/clippy.rs → devtools/x/src/clippy.rs b/x/src/clippy.rs → devtools/x/src/clippy.rs
diff --git a/x/src/config.rs → devtools/x/src/config.rs b/x/src/config.rs → devtools/x/src/config.rs
diff --git a/x/src/fmt.rs → devtools/x/src/fmt.rs b/x/src/fmt.rs → devtools/x/src/fmt.rs
diff --git a/x/src/lint/engine/content.rs → devtools/x/src/lint/engine/content.rs b/x/src/lint/engine/content.rs → devtools/x/src/lint/engine/content.rs
diff --git a/x/src/lint/engine/file.rs → devtools/x/src/lint/engine/file.rs b/x/src/lint/engine/file.rs → devtools/x/src/lint/engine/file.rs
diff --git a/x/src/lint/engine/mod.rs → devtools/x/src/lint/engine/mod.rs b/x/src/lint/engine/mod.rs → devtools/x/src/lint/engine/mod.rs
diff --git a/x/src/lint/engine/project.rs → devtools/x/src/lint/engine/project.rs b/x/src/lint/engine/project.rs → devtools/x/src/lint/engine/project.rs
diff --git a/x/src/lint/engine/runner.rs → devtools/x/src/lint/engine/runner.rs b/x/src/lint/engine/runner.rs → devtools/x/src/lint/engine/runner.rs
diff --git a/x/src/lint/license.rs → devtools/x/src/lint/license.rs b/x/src/lint/license.rs → devtools/x/src/lint/license.rs
diff --git a/x/src/lint/mod.rs → devtools/x/src/lint/mod.rs b/x/src/lint/mod.rs → devtools/x/src/lint/mod.rs
diff --git a/x/src/lint/whitespace.rs → devtools/x/src/lint/whitespace.rs b/x/src/lint/whitespace.rs → devtools/x/src/lint/whitespace.rs
diff --git a/x/src/main.rs → devtools/x/src/main.rs b/x/src/main.rs → devtools/x/src/main.rs
diff --git a/x/src/test.rs → devtools/x/src/test.rs b/x/src/test.rs → devtools/x/src/test.rs
diff --git a/x/src/utils.rs → devtools/x/src/utils.rs b/x/src/utils.rs → devtools/x/src/utils.rs
@@ -5,10 +5,13 @@ use crate::{cargo::Cargo, Result};
 use serde::Deserialize;
 use std::path::{Path, PathBuf};
 
+/// The number of directories between the project root and the root of this crate.
+pub const X_DEPTH: usize = 2;
+
 pub fn project_root() -> &'static Path {
     Path::new(&env!("CARGO_MANIFEST_DIR"))
         .ancestors()
-        .nth(1)
+        .nth(X_DEPTH)
         .unwrap()
 }