Rename stuff

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-members = ["xtask", "crates/bin", "crates/libs/*", "crates/commands/*"]
+members = ["xtask", "crates/bin", "crates/lib/*", "crates/command/*"]
 
 [workspace.package]
 version = "0.4.0"

crates/bin/Cargo.toml

@@ -13,4 +13,4 @@ edition.workspace = true
 
 [dependencies]
 anyhow.workspace = true
-rew_app = { path = "../libs/app" }
+rew_app = { path = "../lib/app" }

crates/commands/ascii/Cargo.toml → crates/command/ascii/Cargo.toml

@@ -7,10 +7,10 @@ edition.workspace = true
 anyhow.workspace = true
 bstr.workspace = true
 clap.workspace = true
-rew_adapters = { path = "../../libs/adapters" }
-rew_core = { path = "../../libs/core" }
-rew_command = { path = "../../libs/command" }
-rew_exec = { path = "../../libs/exec" }
+rew_adapters = { path = "../../lib/adapter" }
+rew_core = { path = "../../lib/core" }
+rew_command = { path = "../../lib/command" }
+rew_exec = { path = "../../lib/exec" }
 unidecode.workspace = true
 
 [dev-dependencies]

crates/commands/x/Cargo.toml → crates/command/x/Cargo.toml

@@ -8,11 +8,11 @@ anyhow.workspace = true
 bstr.workspace = true
 clap.workspace = true
 owo-colors.workspace = true
-rew_adapters = { path = "../../libs/adapters" }
-rew_core = { path = "../../libs/core" }
-rew_command = { path = "../../libs/command" }
-rew_exec = { path = "../../libs/exec" }
-rew_io = { path = "../../libs/io" }
+rew_adapters = { path = "../../lib/adapter" }
+rew_core = { path = "../../lib/core" }
+rew_command = { path = "../../lib/command" }
+rew_exec = { path = "../../lib/exec" }
+rew_io = { path = "../../lib/io" }
 thiserror.workspace = true
 
 [dev-dependencies]

crates/libs/adapters/Cargo.toml → crates/lib/adapter/Cargo.toml

@@ -7,8 +7,8 @@ edition.workspace = true
 anyhow.workspace = true
 bstr.workspace = true
 rew_core = { path = "../core" }
-rew_fixtures = { path = "../fixtures" }
+rew_fixture = { path = "../fixture" }
 
 [dev-dependencies]
 claims.workspace = true
-rew_components = { path = "../components" }
+rew_components = { path = "../component" }

crates/libs/adapters/src/bridge.rs → crates/lib/adapter/src/bridge.rs

@@ -123,10 +123,10 @@ mod tests {
     use claims::assert_ok;
     use claims::assert_ok_eq;
     use rew_core::bstr;
-    use rew_fixtures::Bytes;
-    use rew_fixtures::Concat;
-    use rew_fixtures::MaskedBytes;
-    use rew_fixtures::SkipOdd;
+    use rew_fixture::Bytes;
+    use rew_fixture::Concat;
+    use rew_fixture::MaskedBytes;
+    use rew_fixture::SkipOdd;
     use std::io::BufWriter;
 
     #[test]

crates/libs/adapters/src/buffer.rs → crates/lib/adapter/src/buffer.rs

@@ -98,9 +98,9 @@ mod tests {
     use bstr::B;
     use claims::assert_ok_eq;
     use rew_core::bstr;
-    use rew_fixtures::Bytes;
-    use rew_fixtures::Countdown;
-    use rew_fixtures::Duplicate;
+    use rew_fixture::Bytes;
+    use rew_fixture::Countdown;
+    use rew_fixture::Duplicate;
 
     #[test]
     fn produce_from_to_buffer() {

crates/libs/adapters/src/lib.rs → crates/lib/adapter/src/lib.rs

@@ -1,10 +1,10 @@
-pub use adapters::*;
+pub use adapter::*;
 pub use bridge::*;
 pub use buffer::*;
 pub use transfer::*;
 pub use transform::*;
 
-mod adapters;
+mod adapter;
 mod bridge;
 mod buffer;
 mod transfer;

crates/libs/adapters/src/transform.rs → crates/lib/adapter/src/transform.rs

@@ -52,8 +52,8 @@ mod tests {
     use claims::assert_ok_eq;
     use rew_components::IterProduce;
     use rew_core::bstr;
-    use rew_fixtures::FirstByte;
-    use rew_fixtures::IsLowerCase;
+    use rew_fixture::FirstByte;
+    use rew_fixture::IsLowerCase;
 
     #[test]
     fn map_transform() {

crates/libs/app/Cargo.toml → crates/lib/app/Cargo.toml

@@ -9,7 +9,7 @@ anstream.workspace = true
 clap.workspace = true
 owo-colors.workspace = true
 rew_command = { path = "../command" }
-rew_command_ascii = { path = "../../commands/ascii" }
+rew_command_ascii = { path = "../../command/ascii" }
 rew_exec = { path = "../exec" }
 
 [dev-dependencies]

crates/libs/components/Cargo.toml → crates/lib/component/Cargo.toml

@@ -9,7 +9,7 @@ bstr.workspace = true
 num-traits.workspace = true
 owo-colors.workspace = true
 rew_core = { path = "../core" }
-rew_fixtures = { path = "../fixtures" }
+rew_fixture = { path = "../fixture" }
 thiserror.workspace = true
 
 [dev-dependencies]

crates/libs/exec/Cargo.toml → crates/lib/exec/Cargo.toml

@@ -8,12 +8,12 @@ anyhow.workspace = true
 bstr.workspace = true
 byte-unit.workspace = true
 clap.workspace = true
-rew_adapters = { path = "../adapters" }
+rew_adapters = { path = "../adapter" }
 rew_core = { path = "../core" }
 rew_io = { path = "../io" }
 
 [dev-dependencies]
 claims.workspace = true
 rstest.workspace = true
-rew_components = { path = "../components" }
-rew_fixtures = { path = "../fixtures" }
+rew_components = { path = "../component" }
+rew_fixture = { path = "../fixture" }

crates/libs/exec/src/lib.rs → crates/lib/exec/src/lib.rs

@@ -6,6 +6,6 @@ pub use run::*;
 mod args;
 mod context;
 #[cfg(test)]
-pub mod fixtures;
+pub mod fixture;
 mod init;
 mod run;

crates/libs/exec/src/run.rs → crates/lib/exec/src/run.rs

@@ -127,17 +127,17 @@ impl<P: Channel, X: Context + Send + Sync + 'static> Run<X> for AdaptChannel<P>
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::fixtures::TestContext;
+    use crate::fixture::TestContext;
     use claims::assert_ok;
-    use rew_fixtures::Bytes;
-    use rew_fixtures::Concat;
-    use rew_fixtures::Countdown;
-    use rew_fixtures::DirectChannel;
-    use rew_fixtures::Duplicate;
-    use rew_fixtures::FirstByte;
-    use rew_fixtures::IsLowerCase;
-    use rew_fixtures::MaskedBytes;
-    use rew_fixtures::SkipOdd;
+    use rew_fixture::Bytes;
+    use rew_fixture::Concat;
+    use rew_fixture::Countdown;
+    use rew_fixture::DirectChannel;
+    use rew_fixture::Duplicate;
+    use rew_fixture::FirstByte;
+    use rew_fixture::IsLowerCase;
+    use rew_fixture::MaskedBytes;
+    use rew_fixture::SkipOdd;
 
     #[test]
     fn produce() {

crates/libs/fixtures/Cargo.toml → crates/lib/fixture/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "rew_fixtures"
+name = "rew_fixture"
 version.workspace = true
 edition.workspace = true
 

crates/libs/fixtures/src/produce.rs → crates/lib/fixture/src/produce.rs

@@ -31,13 +31,14 @@ impl ProduceTo for Countdown {
     }
 }
 
+#[derive(Default)]
 pub struct MaskedBytes {
     last: bool,
 }
 
 impl MaskedBytes {
     pub fn new() -> Self {
-        Self { last: false }
+        Self::default()
     }
 }
 

crates/libs/io/Cargo.toml → crates/lib/io/Cargo.toml

@@ -9,7 +9,7 @@ bstr.workspace = true
 byte-unit.workspace = true
 owo-colors.workspace = true
 rew_core = { path = "../core" }
-rew_fixtures = { path = "../fixtures" }
+rew_fixture = { path = "../fixture" }
 thiserror.workspace = true
 
 [dev-dependencies]

fuzz/Cargo.toml

@@ -9,7 +9,7 @@ cargo-fuzz = true
 
 [dependencies]
 libfuzzer-sys = "0.4"
-rew_command_x = { path = "../crates/commands/x" }
+rew_command_x = { path = "../crates/command/x" }
 
 [workspace]
 members = ["."] # Prevent this from interfering with workspaces

xtask/Cargo.toml

@@ -8,4 +8,4 @@ publish = false
 anyhow.workspace = true
 clap = { workspace = true, features = ["derive"] }
 clap_mangen.workspace = true
-rew_app = { path = "../crates/libs/app" }
+rew_app = { path = "../crates/lib/app" }