From d718e8d8838197522af5e9aec8ea383e01bf432d Mon Sep 17 00:00:00 2001 From: Titouan Rigoudy Date: Fri, 9 Jul 2021 15:37:15 +0000 Subject: [PATCH] Define workspace and client crate. --- Cargo.lock | 2 +- Cargo.toml | 31 +++---------------- client/Cargo.toml | 28 +++++++++++++++++ TODO.md => client/TODO.md | 0 rustfmt.toml => client/rustfmt.toml | 0 {src => client/src}/client.rs | 0 {src => client/src}/config.rs | 0 {src => client/src}/context.rs | 0 {src => client/src}/control/mod.rs | 0 {src => client/src}/control/request.rs | 0 {src => client/src}/control/response.rs | 0 {src => client/src}/control/ws.rs | 0 {src => client/src}/dispatcher.rs | 0 {src => client/src}/executor.rs | 0 {src => client/src}/handlers/login_handler.rs | 0 {src => client/src}/handlers/mod.rs | 0 .../handlers/set_privileged_users_handler.rs | 0 {src => client/src}/lib.rs | 0 {src => client/src}/login.rs | 0 {src => client/src}/main.rs | 0 {src => client/src}/message_handler.rs | 0 {src => client/src}/proto/core/constants.rs | 0 {src => client/src}/proto/core/frame.rs | 0 {src => client/src}/proto/core/mod.rs | 0 {src => client/src}/proto/core/prefix.rs | 0 {src => client/src}/proto/core/u32.rs | 0 {src => client/src}/proto/core/user.rs | 0 {src => client/src}/proto/core/value.rs | 0 {src => client/src}/proto/handler.rs | 0 {src => client/src}/proto/mod.rs | 0 {src => client/src}/proto/packet.rs | 0 {src => client/src}/proto/peer/constants.rs | 0 {src => client/src}/proto/peer/message.rs | 0 {src => client/src}/proto/peer/mod.rs | 0 {src => client/src}/proto/server/client.rs | 0 {src => client/src}/proto/server/constants.rs | 0 .../src}/proto/server/credentials.rs | 0 {src => client/src}/proto/server/mod.rs | 0 {src => client/src}/proto/server/request.rs | 0 {src => client/src}/proto/server/response.rs | 0 {src => client/src}/proto/server/testing.rs | 0 {src => client/src}/proto/server/version.rs | 0 {src => client/src}/proto/stream.rs | 0 {src => client/src}/room.rs | 0 {src => client/src}/user.rs | 0 {tests => client/tests}/connect.rs | 2 +- 46 files changed, 34 insertions(+), 29 deletions(-) create mode 100644 client/Cargo.toml rename TODO.md => client/TODO.md (100%) rename rustfmt.toml => client/rustfmt.toml (100%) rename {src => client/src}/client.rs (100%) rename {src => client/src}/config.rs (100%) rename {src => client/src}/context.rs (100%) rename {src => client/src}/control/mod.rs (100%) rename {src => client/src}/control/request.rs (100%) rename {src => client/src}/control/response.rs (100%) rename {src => client/src}/control/ws.rs (100%) rename {src => client/src}/dispatcher.rs (100%) rename {src => client/src}/executor.rs (100%) rename {src => client/src}/handlers/login_handler.rs (100%) rename {src => client/src}/handlers/mod.rs (100%) rename {src => client/src}/handlers/set_privileged_users_handler.rs (100%) rename {src => client/src}/lib.rs (100%) rename {src => client/src}/login.rs (100%) rename {src => client/src}/main.rs (100%) rename {src => client/src}/message_handler.rs (100%) rename {src => client/src}/proto/core/constants.rs (100%) rename {src => client/src}/proto/core/frame.rs (100%) rename {src => client/src}/proto/core/mod.rs (100%) rename {src => client/src}/proto/core/prefix.rs (100%) rename {src => client/src}/proto/core/u32.rs (100%) rename {src => client/src}/proto/core/user.rs (100%) rename {src => client/src}/proto/core/value.rs (100%) rename {src => client/src}/proto/handler.rs (100%) rename {src => client/src}/proto/mod.rs (100%) rename {src => client/src}/proto/packet.rs (100%) rename {src => client/src}/proto/peer/constants.rs (100%) rename {src => client/src}/proto/peer/message.rs (100%) rename {src => client/src}/proto/peer/mod.rs (100%) rename {src => client/src}/proto/server/client.rs (100%) rename {src => client/src}/proto/server/constants.rs (100%) rename {src => client/src}/proto/server/credentials.rs (100%) rename {src => client/src}/proto/server/mod.rs (100%) rename {src => client/src}/proto/server/request.rs (100%) rename {src => client/src}/proto/server/response.rs (100%) rename {src => client/src}/proto/server/testing.rs (100%) rename {src => client/src}/proto/server/version.rs (100%) rename {src => client/src}/proto/stream.rs (100%) rename {src => client/src}/room.rs (100%) rename {src => client/src}/user.rs (100%) rename {tests => client/tests}/connect.rs (98%) diff --git a/Cargo.lock b/Cargo.lock index ebab0b3..0506758 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1098,7 +1098,7 @@ dependencies = [ ] [[package]] -name = "solstice" +name = "solstice-client" version = "0.1.0" dependencies = [ "async-stream", diff --git a/Cargo.toml b/Cargo.toml index c599e00..2596cea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,28 +1,5 @@ -[package] -name = "solstice" -version = "0.1.0" -authors = ["letitz"] -edition = "2018" +[workspace] -[dependencies] -async-stream = "^0.3" -byteorder = "^0.5.1" -bytes = "^1.0" -crossbeam-channel = "^0.3" -encoding = "^0.2" -encoding_rs = "^0.8" -env_logger = "^0.8" -futures = "^0.3" -log = "^0.4" -mio = "^0.6" -parking_lot = "^0.8" -rust-crypto = "^0.2.34" -rustc-serialize = "^0.3.17" -slab = "^0.2" -thiserror = "^1.0" -threadpool = "^1.0" -tokio = { version = "1", features = ["full"] } -tokio-core = "^0.1" -tokio-io = "^0.1" -tokio-codec = "^0.1" -ws = "^0.4" +members = [ + "client", +] diff --git a/client/Cargo.toml b/client/Cargo.toml new file mode 100644 index 0000000..7279edf --- /dev/null +++ b/client/Cargo.toml @@ -0,0 +1,28 @@ +[package] +name = "solstice-client" +version = "0.1.0" +authors = ["letitz"] +edition = "2018" + +[dependencies] +async-stream = "^0.3" +byteorder = "^0.5.1" +bytes = "^1.0" +crossbeam-channel = "^0.3" +encoding = "^0.2" +encoding_rs = "^0.8" +env_logger = "^0.8" +futures = "^0.3" +log = "^0.4" +mio = "^0.6" +parking_lot = "^0.8" +rust-crypto = "^0.2.34" +rustc-serialize = "^0.3.17" +slab = "^0.2" +thiserror = "^1.0" +threadpool = "^1.0" +tokio = { version = "1", features = ["full"] } +tokio-core = "^0.1" +tokio-io = "^0.1" +tokio-codec = "^0.1" +ws = "^0.4" diff --git a/TODO.md b/client/TODO.md similarity index 100% rename from TODO.md rename to client/TODO.md diff --git a/rustfmt.toml b/client/rustfmt.toml similarity index 100% rename from rustfmt.toml rename to client/rustfmt.toml diff --git a/src/client.rs b/client/src/client.rs similarity index 100% rename from src/client.rs rename to client/src/client.rs diff --git a/src/config.rs b/client/src/config.rs similarity index 100% rename from src/config.rs rename to client/src/config.rs diff --git a/src/context.rs b/client/src/context.rs similarity index 100% rename from src/context.rs rename to client/src/context.rs diff --git a/src/control/mod.rs b/client/src/control/mod.rs similarity index 100% rename from src/control/mod.rs rename to client/src/control/mod.rs diff --git a/src/control/request.rs b/client/src/control/request.rs similarity index 100% rename from src/control/request.rs rename to client/src/control/request.rs diff --git a/src/control/response.rs b/client/src/control/response.rs similarity index 100% rename from src/control/response.rs rename to client/src/control/response.rs diff --git a/src/control/ws.rs b/client/src/control/ws.rs similarity index 100% rename from src/control/ws.rs rename to client/src/control/ws.rs diff --git a/src/dispatcher.rs b/client/src/dispatcher.rs similarity index 100% rename from src/dispatcher.rs rename to client/src/dispatcher.rs diff --git a/src/executor.rs b/client/src/executor.rs similarity index 100% rename from src/executor.rs rename to client/src/executor.rs diff --git a/src/handlers/login_handler.rs b/client/src/handlers/login_handler.rs similarity index 100% rename from src/handlers/login_handler.rs rename to client/src/handlers/login_handler.rs diff --git a/src/handlers/mod.rs b/client/src/handlers/mod.rs similarity index 100% rename from src/handlers/mod.rs rename to client/src/handlers/mod.rs diff --git a/src/handlers/set_privileged_users_handler.rs b/client/src/handlers/set_privileged_users_handler.rs similarity index 100% rename from src/handlers/set_privileged_users_handler.rs rename to client/src/handlers/set_privileged_users_handler.rs diff --git a/src/lib.rs b/client/src/lib.rs similarity index 100% rename from src/lib.rs rename to client/src/lib.rs diff --git a/src/login.rs b/client/src/login.rs similarity index 100% rename from src/login.rs rename to client/src/login.rs diff --git a/src/main.rs b/client/src/main.rs similarity index 100% rename from src/main.rs rename to client/src/main.rs diff --git a/src/message_handler.rs b/client/src/message_handler.rs similarity index 100% rename from src/message_handler.rs rename to client/src/message_handler.rs diff --git a/src/proto/core/constants.rs b/client/src/proto/core/constants.rs similarity index 100% rename from src/proto/core/constants.rs rename to client/src/proto/core/constants.rs diff --git a/src/proto/core/frame.rs b/client/src/proto/core/frame.rs similarity index 100% rename from src/proto/core/frame.rs rename to client/src/proto/core/frame.rs diff --git a/src/proto/core/mod.rs b/client/src/proto/core/mod.rs similarity index 100% rename from src/proto/core/mod.rs rename to client/src/proto/core/mod.rs diff --git a/src/proto/core/prefix.rs b/client/src/proto/core/prefix.rs similarity index 100% rename from src/proto/core/prefix.rs rename to client/src/proto/core/prefix.rs diff --git a/src/proto/core/u32.rs b/client/src/proto/core/u32.rs similarity index 100% rename from src/proto/core/u32.rs rename to client/src/proto/core/u32.rs diff --git a/src/proto/core/user.rs b/client/src/proto/core/user.rs similarity index 100% rename from src/proto/core/user.rs rename to client/src/proto/core/user.rs diff --git a/src/proto/core/value.rs b/client/src/proto/core/value.rs similarity index 100% rename from src/proto/core/value.rs rename to client/src/proto/core/value.rs diff --git a/src/proto/handler.rs b/client/src/proto/handler.rs similarity index 100% rename from src/proto/handler.rs rename to client/src/proto/handler.rs diff --git a/src/proto/mod.rs b/client/src/proto/mod.rs similarity index 100% rename from src/proto/mod.rs rename to client/src/proto/mod.rs diff --git a/src/proto/packet.rs b/client/src/proto/packet.rs similarity index 100% rename from src/proto/packet.rs rename to client/src/proto/packet.rs diff --git a/src/proto/peer/constants.rs b/client/src/proto/peer/constants.rs similarity index 100% rename from src/proto/peer/constants.rs rename to client/src/proto/peer/constants.rs diff --git a/src/proto/peer/message.rs b/client/src/proto/peer/message.rs similarity index 100% rename from src/proto/peer/message.rs rename to client/src/proto/peer/message.rs diff --git a/src/proto/peer/mod.rs b/client/src/proto/peer/mod.rs similarity index 100% rename from src/proto/peer/mod.rs rename to client/src/proto/peer/mod.rs diff --git a/src/proto/server/client.rs b/client/src/proto/server/client.rs similarity index 100% rename from src/proto/server/client.rs rename to client/src/proto/server/client.rs diff --git a/src/proto/server/constants.rs b/client/src/proto/server/constants.rs similarity index 100% rename from src/proto/server/constants.rs rename to client/src/proto/server/constants.rs diff --git a/src/proto/server/credentials.rs b/client/src/proto/server/credentials.rs similarity index 100% rename from src/proto/server/credentials.rs rename to client/src/proto/server/credentials.rs diff --git a/src/proto/server/mod.rs b/client/src/proto/server/mod.rs similarity index 100% rename from src/proto/server/mod.rs rename to client/src/proto/server/mod.rs diff --git a/src/proto/server/request.rs b/client/src/proto/server/request.rs similarity index 100% rename from src/proto/server/request.rs rename to client/src/proto/server/request.rs diff --git a/src/proto/server/response.rs b/client/src/proto/server/response.rs similarity index 100% rename from src/proto/server/response.rs rename to client/src/proto/server/response.rs diff --git a/src/proto/server/testing.rs b/client/src/proto/server/testing.rs similarity index 100% rename from src/proto/server/testing.rs rename to client/src/proto/server/testing.rs diff --git a/src/proto/server/version.rs b/client/src/proto/server/version.rs similarity index 100% rename from src/proto/server/version.rs rename to client/src/proto/server/version.rs diff --git a/src/proto/stream.rs b/client/src/proto/stream.rs similarity index 100% rename from src/proto/stream.rs rename to client/src/proto/stream.rs diff --git a/src/room.rs b/client/src/room.rs similarity index 100% rename from src/room.rs rename to client/src/room.rs diff --git a/src/user.rs b/client/src/user.rs similarity index 100% rename from src/user.rs rename to client/src/user.rs diff --git a/tests/connect.rs b/client/tests/connect.rs similarity index 98% rename from tests/connect.rs rename to client/tests/connect.rs index 59913e7..d7b3fbf 100644 --- a/tests/connect.rs +++ b/client/tests/connect.rs @@ -3,7 +3,7 @@ use tokio::io; use tokio::net; use tokio::sync::mpsc; -use solstice::proto::server::{ +use solstice_client::proto::server::{ Client, ClientOptions, Credentials, ServerRequest, ServerResponse, UserStatusRequest, Version, };