From 99aca09c5263aaef5ccb73970599d0bc1291f150 Mon Sep 17 00:00:00 2001
From: Richard Pringle <richard.pringle@avalabs.org>
Date: Thu, 20 Jul 2023 16:30:13 -0400
Subject: [PATCH] Remove directory stutter naming

---
 Cargo.toml                                                | 6 +++---
 firewood/Cargo.toml                                       | 6 +++---
 {firewood-growth-ring => growth-ring}/Cargo.toml          | 0
 {firewood-growth-ring => growth-ring}/README.rst          | 0
 {firewood-growth-ring => growth-ring}/examples/.gitignore | 0
 {firewood-growth-ring => growth-ring}/examples/demo1.rs   | 0
 {firewood-growth-ring => growth-ring}/src/lib.rs          | 0
 {firewood-growth-ring => growth-ring}/src/wal.rs          | 0
 {firewood-growth-ring => growth-ring}/src/walerror.rs     | 0
 {firewood-growth-ring => growth-ring}/tests/common/mod.rs | 0
 {firewood-growth-ring => growth-ring}/tests/rand_fail.rs  | 0
 {firewood-libaio => libaio}/Cargo.toml                    | 0
 {firewood-libaio => libaio}/build.rs                      | 0
 {firewood-libaio => libaio}/libaio/.gitignore             | 0
 {firewood-libaio => libaio}/libaio/COPYING                | 0
 {firewood-libaio => libaio}/libaio/Makefile               | 0
 {firewood-libaio => libaio}/libaio/aio_ring.h             | 0
 {firewood-libaio => libaio}/libaio/compat-0_1.c           | 0
 {firewood-libaio => libaio}/libaio/io_cancel.c            | 0
 {firewood-libaio => libaio}/libaio/io_destroy.c           | 0
 {firewood-libaio => libaio}/libaio/io_getevents.c         | 0
 {firewood-libaio => libaio}/libaio/io_pgetevents.c        | 0
 {firewood-libaio => libaio}/libaio/io_queue_init.c        | 0
 {firewood-libaio => libaio}/libaio/io_queue_release.c     | 0
 {firewood-libaio => libaio}/libaio/io_queue_run.c         | 0
 {firewood-libaio => libaio}/libaio/io_queue_wait.c        | 0
 {firewood-libaio => libaio}/libaio/io_setup.c             | 0
 {firewood-libaio => libaio}/libaio/io_submit.c            | 0
 {firewood-libaio => libaio}/libaio/libaio.h               | 0
 {firewood-libaio => libaio}/libaio/libaio.map             | 0
 {firewood-libaio => libaio}/libaio/raw_syscall.c          | 0
 {firewood-libaio => libaio}/libaio/syscall-alpha.h        | 0
 {firewood-libaio => libaio}/libaio/syscall-arm.h          | 0
 {firewood-libaio => libaio}/libaio/syscall-generic.h      | 0
 {firewood-libaio => libaio}/libaio/syscall-i386.h         | 0
 {firewood-libaio => libaio}/libaio/syscall-ia64.h         | 0
 {firewood-libaio => libaio}/libaio/syscall-ppc.h          | 0
 {firewood-libaio => libaio}/libaio/syscall-s390.h         | 0
 {firewood-libaio => libaio}/libaio/syscall-sparc.h        | 0
 {firewood-libaio => libaio}/libaio/syscall-x86_64.h       | 0
 {firewood-libaio => libaio}/libaio/syscall.h              | 0
 {firewood-libaio => libaio}/libaio/vsys_def.h             | 0
 {firewood-libaio => libaio}/src/abi.rs                    | 0
 {firewood-libaio => libaio}/src/lib.rs                    | 0
 {firewood-libaio => libaio}/tests/simple_test.rs          | 0
 {firewood-shale => shale}/Cargo.toml                      | 0
 {firewood-shale => shale}/LICENSE                         | 0
 {firewood-shale => shale}/benches/shale-bench.rs          | 0
 {firewood-shale => shale}/src/cached.rs                   | 0
 {firewood-shale => shale}/src/compact.rs                  | 0
 {firewood-shale => shale}/src/lib.rs                      | 0
 51 files changed, 6 insertions(+), 6 deletions(-)
 rename {firewood-growth-ring => growth-ring}/Cargo.toml (100%)
 rename {firewood-growth-ring => growth-ring}/README.rst (100%)
 rename {firewood-growth-ring => growth-ring}/examples/.gitignore (100%)
 rename {firewood-growth-ring => growth-ring}/examples/demo1.rs (100%)
 rename {firewood-growth-ring => growth-ring}/src/lib.rs (100%)
 rename {firewood-growth-ring => growth-ring}/src/wal.rs (100%)
 rename {firewood-growth-ring => growth-ring}/src/walerror.rs (100%)
 rename {firewood-growth-ring => growth-ring}/tests/common/mod.rs (100%)
 rename {firewood-growth-ring => growth-ring}/tests/rand_fail.rs (100%)
 rename {firewood-libaio => libaio}/Cargo.toml (100%)
 rename {firewood-libaio => libaio}/build.rs (100%)
 rename {firewood-libaio => libaio}/libaio/.gitignore (100%)
 rename {firewood-libaio => libaio}/libaio/COPYING (100%)
 rename {firewood-libaio => libaio}/libaio/Makefile (100%)
 rename {firewood-libaio => libaio}/libaio/aio_ring.h (100%)
 rename {firewood-libaio => libaio}/libaio/compat-0_1.c (100%)
 rename {firewood-libaio => libaio}/libaio/io_cancel.c (100%)
 rename {firewood-libaio => libaio}/libaio/io_destroy.c (100%)
 rename {firewood-libaio => libaio}/libaio/io_getevents.c (100%)
 rename {firewood-libaio => libaio}/libaio/io_pgetevents.c (100%)
 rename {firewood-libaio => libaio}/libaio/io_queue_init.c (100%)
 rename {firewood-libaio => libaio}/libaio/io_queue_release.c (100%)
 rename {firewood-libaio => libaio}/libaio/io_queue_run.c (100%)
 rename {firewood-libaio => libaio}/libaio/io_queue_wait.c (100%)
 rename {firewood-libaio => libaio}/libaio/io_setup.c (100%)
 rename {firewood-libaio => libaio}/libaio/io_submit.c (100%)
 rename {firewood-libaio => libaio}/libaio/libaio.h (100%)
 rename {firewood-libaio => libaio}/libaio/libaio.map (100%)
 rename {firewood-libaio => libaio}/libaio/raw_syscall.c (100%)
 rename {firewood-libaio => libaio}/libaio/syscall-alpha.h (100%)
 rename {firewood-libaio => libaio}/libaio/syscall-arm.h (100%)
 rename {firewood-libaio => libaio}/libaio/syscall-generic.h (100%)
 rename {firewood-libaio => libaio}/libaio/syscall-i386.h (100%)
 rename {firewood-libaio => libaio}/libaio/syscall-ia64.h (100%)
 rename {firewood-libaio => libaio}/libaio/syscall-ppc.h (100%)
 rename {firewood-libaio => libaio}/libaio/syscall-s390.h (100%)
 rename {firewood-libaio => libaio}/libaio/syscall-sparc.h (100%)
 rename {firewood-libaio => libaio}/libaio/syscall-x86_64.h (100%)
 rename {firewood-libaio => libaio}/libaio/syscall.h (100%)
 rename {firewood-libaio => libaio}/libaio/vsys_def.h (100%)
 rename {firewood-libaio => libaio}/src/abi.rs (100%)
 rename {firewood-libaio => libaio}/src/lib.rs (100%)
 rename {firewood-libaio => libaio}/tests/simple_test.rs (100%)
 rename {firewood-shale => shale}/Cargo.toml (100%)
 rename {firewood-shale => shale}/LICENSE (100%)
 rename {firewood-shale => shale}/benches/shale-bench.rs (100%)
 rename {firewood-shale => shale}/src/cached.rs (100%)
 rename {firewood-shale => shale}/src/compact.rs (100%)
 rename {firewood-shale => shale}/src/lib.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 0742fcfcb..a1d8190ae 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,8 +1,8 @@
 [workspace]
 members = [
-  "firewood-growth-ring",
-  "firewood-libaio",
-  "firewood-shale",
+  "growth-ring",
+  "libaio",
+  "shale",
   "firewood",
   "fwdctl",
 ]
diff --git a/firewood/Cargo.toml b/firewood/Cargo.toml
index e47fcd18b..079643b8f 100644
--- a/firewood/Cargo.toml
+++ b/firewood/Cargo.toml
@@ -20,9 +20,9 @@ aquamarine = "0.3.1"
 async-trait = "0.1.57"
 bytemuck = { version = "1.13.1", features = ["derive"] }
 enum-as-inner = "0.6.0"
-firewood-growth-ring = { version = "0.0.3", path = "../firewood-growth-ring" }
-firewood-libaio = {version = "0.0.3", path = "../firewood-libaio" }
-firewood-shale = { version = "0.0.3", path = "../firewood-shale" }
+firewood-growth-ring = { version = "0.0.3", path = "../growth-ring" }
+firewood-libaio = {version = "0.0.3", path = "../libaio" }
+firewood-shale = { version = "0.0.3", path = "../shale" }
 futures = "0.3.24"
 hex = "0.4.3"
 lru = "0.11.0"
diff --git a/firewood-growth-ring/Cargo.toml b/growth-ring/Cargo.toml
similarity index 100%
rename from firewood-growth-ring/Cargo.toml
rename to growth-ring/Cargo.toml
diff --git a/firewood-growth-ring/README.rst b/growth-ring/README.rst
similarity index 100%
rename from firewood-growth-ring/README.rst
rename to growth-ring/README.rst
diff --git a/firewood-growth-ring/examples/.gitignore b/growth-ring/examples/.gitignore
similarity index 100%
rename from firewood-growth-ring/examples/.gitignore
rename to growth-ring/examples/.gitignore
diff --git a/firewood-growth-ring/examples/demo1.rs b/growth-ring/examples/demo1.rs
similarity index 100%
rename from firewood-growth-ring/examples/demo1.rs
rename to growth-ring/examples/demo1.rs
diff --git a/firewood-growth-ring/src/lib.rs b/growth-ring/src/lib.rs
similarity index 100%
rename from firewood-growth-ring/src/lib.rs
rename to growth-ring/src/lib.rs
diff --git a/firewood-growth-ring/src/wal.rs b/growth-ring/src/wal.rs
similarity index 100%
rename from firewood-growth-ring/src/wal.rs
rename to growth-ring/src/wal.rs
diff --git a/firewood-growth-ring/src/walerror.rs b/growth-ring/src/walerror.rs
similarity index 100%
rename from firewood-growth-ring/src/walerror.rs
rename to growth-ring/src/walerror.rs
diff --git a/firewood-growth-ring/tests/common/mod.rs b/growth-ring/tests/common/mod.rs
similarity index 100%
rename from firewood-growth-ring/tests/common/mod.rs
rename to growth-ring/tests/common/mod.rs
diff --git a/firewood-growth-ring/tests/rand_fail.rs b/growth-ring/tests/rand_fail.rs
similarity index 100%
rename from firewood-growth-ring/tests/rand_fail.rs
rename to growth-ring/tests/rand_fail.rs
diff --git a/firewood-libaio/Cargo.toml b/libaio/Cargo.toml
similarity index 100%
rename from firewood-libaio/Cargo.toml
rename to libaio/Cargo.toml
diff --git a/firewood-libaio/build.rs b/libaio/build.rs
similarity index 100%
rename from firewood-libaio/build.rs
rename to libaio/build.rs
diff --git a/firewood-libaio/libaio/.gitignore b/libaio/libaio/.gitignore
similarity index 100%
rename from firewood-libaio/libaio/.gitignore
rename to libaio/libaio/.gitignore
diff --git a/firewood-libaio/libaio/COPYING b/libaio/libaio/COPYING
similarity index 100%
rename from firewood-libaio/libaio/COPYING
rename to libaio/libaio/COPYING
diff --git a/firewood-libaio/libaio/Makefile b/libaio/libaio/Makefile
similarity index 100%
rename from firewood-libaio/libaio/Makefile
rename to libaio/libaio/Makefile
diff --git a/firewood-libaio/libaio/aio_ring.h b/libaio/libaio/aio_ring.h
similarity index 100%
rename from firewood-libaio/libaio/aio_ring.h
rename to libaio/libaio/aio_ring.h
diff --git a/firewood-libaio/libaio/compat-0_1.c b/libaio/libaio/compat-0_1.c
similarity index 100%
rename from firewood-libaio/libaio/compat-0_1.c
rename to libaio/libaio/compat-0_1.c
diff --git a/firewood-libaio/libaio/io_cancel.c b/libaio/libaio/io_cancel.c
similarity index 100%
rename from firewood-libaio/libaio/io_cancel.c
rename to libaio/libaio/io_cancel.c
diff --git a/firewood-libaio/libaio/io_destroy.c b/libaio/libaio/io_destroy.c
similarity index 100%
rename from firewood-libaio/libaio/io_destroy.c
rename to libaio/libaio/io_destroy.c
diff --git a/firewood-libaio/libaio/io_getevents.c b/libaio/libaio/io_getevents.c
similarity index 100%
rename from firewood-libaio/libaio/io_getevents.c
rename to libaio/libaio/io_getevents.c
diff --git a/firewood-libaio/libaio/io_pgetevents.c b/libaio/libaio/io_pgetevents.c
similarity index 100%
rename from firewood-libaio/libaio/io_pgetevents.c
rename to libaio/libaio/io_pgetevents.c
diff --git a/firewood-libaio/libaio/io_queue_init.c b/libaio/libaio/io_queue_init.c
similarity index 100%
rename from firewood-libaio/libaio/io_queue_init.c
rename to libaio/libaio/io_queue_init.c
diff --git a/firewood-libaio/libaio/io_queue_release.c b/libaio/libaio/io_queue_release.c
similarity index 100%
rename from firewood-libaio/libaio/io_queue_release.c
rename to libaio/libaio/io_queue_release.c
diff --git a/firewood-libaio/libaio/io_queue_run.c b/libaio/libaio/io_queue_run.c
similarity index 100%
rename from firewood-libaio/libaio/io_queue_run.c
rename to libaio/libaio/io_queue_run.c
diff --git a/firewood-libaio/libaio/io_queue_wait.c b/libaio/libaio/io_queue_wait.c
similarity index 100%
rename from firewood-libaio/libaio/io_queue_wait.c
rename to libaio/libaio/io_queue_wait.c
diff --git a/firewood-libaio/libaio/io_setup.c b/libaio/libaio/io_setup.c
similarity index 100%
rename from firewood-libaio/libaio/io_setup.c
rename to libaio/libaio/io_setup.c
diff --git a/firewood-libaio/libaio/io_submit.c b/libaio/libaio/io_submit.c
similarity index 100%
rename from firewood-libaio/libaio/io_submit.c
rename to libaio/libaio/io_submit.c
diff --git a/firewood-libaio/libaio/libaio.h b/libaio/libaio/libaio.h
similarity index 100%
rename from firewood-libaio/libaio/libaio.h
rename to libaio/libaio/libaio.h
diff --git a/firewood-libaio/libaio/libaio.map b/libaio/libaio/libaio.map
similarity index 100%
rename from firewood-libaio/libaio/libaio.map
rename to libaio/libaio/libaio.map
diff --git a/firewood-libaio/libaio/raw_syscall.c b/libaio/libaio/raw_syscall.c
similarity index 100%
rename from firewood-libaio/libaio/raw_syscall.c
rename to libaio/libaio/raw_syscall.c
diff --git a/firewood-libaio/libaio/syscall-alpha.h b/libaio/libaio/syscall-alpha.h
similarity index 100%
rename from firewood-libaio/libaio/syscall-alpha.h
rename to libaio/libaio/syscall-alpha.h
diff --git a/firewood-libaio/libaio/syscall-arm.h b/libaio/libaio/syscall-arm.h
similarity index 100%
rename from firewood-libaio/libaio/syscall-arm.h
rename to libaio/libaio/syscall-arm.h
diff --git a/firewood-libaio/libaio/syscall-generic.h b/libaio/libaio/syscall-generic.h
similarity index 100%
rename from firewood-libaio/libaio/syscall-generic.h
rename to libaio/libaio/syscall-generic.h
diff --git a/firewood-libaio/libaio/syscall-i386.h b/libaio/libaio/syscall-i386.h
similarity index 100%
rename from firewood-libaio/libaio/syscall-i386.h
rename to libaio/libaio/syscall-i386.h
diff --git a/firewood-libaio/libaio/syscall-ia64.h b/libaio/libaio/syscall-ia64.h
similarity index 100%
rename from firewood-libaio/libaio/syscall-ia64.h
rename to libaio/libaio/syscall-ia64.h
diff --git a/firewood-libaio/libaio/syscall-ppc.h b/libaio/libaio/syscall-ppc.h
similarity index 100%
rename from firewood-libaio/libaio/syscall-ppc.h
rename to libaio/libaio/syscall-ppc.h
diff --git a/firewood-libaio/libaio/syscall-s390.h b/libaio/libaio/syscall-s390.h
similarity index 100%
rename from firewood-libaio/libaio/syscall-s390.h
rename to libaio/libaio/syscall-s390.h
diff --git a/firewood-libaio/libaio/syscall-sparc.h b/libaio/libaio/syscall-sparc.h
similarity index 100%
rename from firewood-libaio/libaio/syscall-sparc.h
rename to libaio/libaio/syscall-sparc.h
diff --git a/firewood-libaio/libaio/syscall-x86_64.h b/libaio/libaio/syscall-x86_64.h
similarity index 100%
rename from firewood-libaio/libaio/syscall-x86_64.h
rename to libaio/libaio/syscall-x86_64.h
diff --git a/firewood-libaio/libaio/syscall.h b/libaio/libaio/syscall.h
similarity index 100%
rename from firewood-libaio/libaio/syscall.h
rename to libaio/libaio/syscall.h
diff --git a/firewood-libaio/libaio/vsys_def.h b/libaio/libaio/vsys_def.h
similarity index 100%
rename from firewood-libaio/libaio/vsys_def.h
rename to libaio/libaio/vsys_def.h
diff --git a/firewood-libaio/src/abi.rs b/libaio/src/abi.rs
similarity index 100%
rename from firewood-libaio/src/abi.rs
rename to libaio/src/abi.rs
diff --git a/firewood-libaio/src/lib.rs b/libaio/src/lib.rs
similarity index 100%
rename from firewood-libaio/src/lib.rs
rename to libaio/src/lib.rs
diff --git a/firewood-libaio/tests/simple_test.rs b/libaio/tests/simple_test.rs
similarity index 100%
rename from firewood-libaio/tests/simple_test.rs
rename to libaio/tests/simple_test.rs
diff --git a/firewood-shale/Cargo.toml b/shale/Cargo.toml
similarity index 100%
rename from firewood-shale/Cargo.toml
rename to shale/Cargo.toml
diff --git a/firewood-shale/LICENSE b/shale/LICENSE
similarity index 100%
rename from firewood-shale/LICENSE
rename to shale/LICENSE
diff --git a/firewood-shale/benches/shale-bench.rs b/shale/benches/shale-bench.rs
similarity index 100%
rename from firewood-shale/benches/shale-bench.rs
rename to shale/benches/shale-bench.rs
diff --git a/firewood-shale/src/cached.rs b/shale/src/cached.rs
similarity index 100%
rename from firewood-shale/src/cached.rs
rename to shale/src/cached.rs
diff --git a/firewood-shale/src/compact.rs b/shale/src/compact.rs
similarity index 100%
rename from firewood-shale/src/compact.rs
rename to shale/src/compact.rs
diff --git a/firewood-shale/src/lib.rs b/shale/src/lib.rs
similarity index 100%
rename from firewood-shale/src/lib.rs
rename to shale/src/lib.rs