From 221a740c96d05adc580f1f869d0a82422ca56380 Mon Sep 17 00:00:00 2001 From: Victor Mignot Date: Mon, 6 Jan 2025 22:16:14 +0100 Subject: [PATCH] Make this repo a Rust workspace This is done on prevision of the Database management system from MongoDB to PostgreSQL. The new codebase to handle PostgreSQL will be introduced in its own lib crate within the workspace. --- Cargo.lock | 48 +++++++++---------- Cargo.toml | 27 ++--------- yorokobot/Cargo.toml | 24 ++++++++++ LICENSE => yorokobot/LICENSE | 0 {src => yorokobot/src}/client.rs | 0 {src => yorokobot/src}/database.rs | 0 {src => yorokobot/src}/database/client.rs | 0 {src => yorokobot/src}/database/models.rs | 0 {src => yorokobot/src}/discord.rs | 0 {src => yorokobot/src}/discord/commands.rs | 0 .../src}/discord/commands/commons.rs | 0 .../src}/discord/commands/create_tag.rs | 0 .../src}/discord/commands/delete_tag.rs | 0 .../src}/discord/commands/list_tags.rs | 0 .../src}/discord/commands/source_code.rs | 0 .../src}/discord/commands/subscribe.rs | 0 .../src}/discord/commands/tag_notify.rs | 0 .../src}/discord/event_handler.rs | 0 .../src}/discord/message_builders.rs | 0 .../discord/message_builders/embed_builder.rs | 0 .../message_builders/selector_builder.rs | 0 {src => yorokobot/src}/environment.rs | 0 {src => yorokobot/src}/main.rs | 0 23 files changed, 53 insertions(+), 46 deletions(-) create mode 100644 yorokobot/Cargo.toml rename LICENSE => yorokobot/LICENSE (100%) rename {src => yorokobot/src}/client.rs (100%) rename {src => yorokobot/src}/database.rs (100%) rename {src => yorokobot/src}/database/client.rs (100%) rename {src => yorokobot/src}/database/models.rs (100%) rename {src => yorokobot/src}/discord.rs (100%) rename {src => yorokobot/src}/discord/commands.rs (100%) rename {src => yorokobot/src}/discord/commands/commons.rs (100%) rename {src => yorokobot/src}/discord/commands/create_tag.rs (100%) rename {src => yorokobot/src}/discord/commands/delete_tag.rs (100%) rename {src => yorokobot/src}/discord/commands/list_tags.rs (100%) rename {src => yorokobot/src}/discord/commands/source_code.rs (100%) rename {src => yorokobot/src}/discord/commands/subscribe.rs (100%) rename {src => yorokobot/src}/discord/commands/tag_notify.rs (100%) rename {src => yorokobot/src}/discord/event_handler.rs (100%) rename {src => yorokobot/src}/discord/message_builders.rs (100%) rename {src => yorokobot/src}/discord/message_builders/embed_builder.rs (100%) rename {src => yorokobot/src}/discord/message_builders/selector_builder.rs (100%) rename {src => yorokobot/src}/environment.rs (100%) rename {src => yorokobot/src}/main.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index f3642d8..52910ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -105,13 +105,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.83" +version = "0.1.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" dependencies = [ "proc-macro2", "quote", - "syn 2.0.93", + "syn 2.0.95", ] [[package]] @@ -237,9 +237,9 @@ checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "cc" -version = "1.2.6" +version = "1.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d6dbb628b8f8555f86d0323c2eb39e3ec81901f4b83e091db8a6a76d316a333" +checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7" dependencies = [ "shlex", ] @@ -390,7 +390,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version 0.4.1", - "syn 2.0.93", + "syn 2.0.95", ] [[package]] @@ -412,7 +412,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.93", + "syn 2.0.95", ] [[package]] @@ -552,7 +552,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.93", + "syn 2.0.95", ] [[package]] @@ -885,7 +885,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.93", + "syn 2.0.95", ] [[package]] @@ -1215,9 +1215,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project-lite" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -1584,7 +1584,7 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.93", + "syn 2.0.95", ] [[package]] @@ -1789,9 +1789,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.93" +version = "2.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c786062daee0d6db1132800e623df74274a0a87322d8e183338e01b3d98d058" +checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" dependencies = [ "proc-macro2", "quote", @@ -1812,7 +1812,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.93", + "syn 2.0.95", ] [[package]] @@ -1865,7 +1865,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.93", + "syn 2.0.95", ] [[package]] @@ -1949,7 +1949,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.93", + "syn 2.0.95", ] [[package]] @@ -2013,7 +2013,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.93", + "syn 2.0.95", ] [[package]] @@ -2253,7 +2253,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.93", + "syn 2.0.95", "wasm-bindgen-shared", ] @@ -2288,7 +2288,7 @@ checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.93", + "syn 2.0.95", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2583,7 +2583,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.93", + "syn 2.0.95", "synstructure", ] @@ -2618,7 +2618,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.93", + "syn 2.0.95", ] [[package]] @@ -2638,7 +2638,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.93", + "syn 2.0.95", "synstructure", ] @@ -2661,5 +2661,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.93", + "syn 2.0.95", ] diff --git a/Cargo.toml b/Cargo.toml index b083ddf..c59101e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,24 +1,7 @@ -[package] -name = "yorokobot" -description = "Discord bot implementing a topic management system" -version = "0.2.1" -authors = [ "Victor Mignot " ] -license = "EUPL-1.2" -readme = "README.md" -repository = "https://git.dalaran.fr/dala/yorokobot" -edition = "2021" +[workspace] -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +resolver = "2" -[dependencies] -serenity = { version="0.11", default-features = false, features = ["client", "gateway", "rustls_backend", "model", "collector" ] } -tokio = { version = "1", features = ["macros", "rt-multi-thread"] } -mongodb = { version = "2.3.0", default-features = false, features = ["tokio-runtime"] } -serde = { version = "1.0", features = [ "derive" ] } -log = "0.4.17" -futures = "0.3.25" -env_logger = "0.11.6" - -[lints.rust] -unsafe_code= "forbid" -missing_docs = "forbid" +members = [ + "yorokobot", +] diff --git a/yorokobot/Cargo.toml b/yorokobot/Cargo.toml new file mode 100644 index 0000000..b083ddf --- /dev/null +++ b/yorokobot/Cargo.toml @@ -0,0 +1,24 @@ +[package] +name = "yorokobot" +description = "Discord bot implementing a topic management system" +version = "0.2.1" +authors = [ "Victor Mignot " ] +license = "EUPL-1.2" +readme = "README.md" +repository = "https://git.dalaran.fr/dala/yorokobot" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +serenity = { version="0.11", default-features = false, features = ["client", "gateway", "rustls_backend", "model", "collector" ] } +tokio = { version = "1", features = ["macros", "rt-multi-thread"] } +mongodb = { version = "2.3.0", default-features = false, features = ["tokio-runtime"] } +serde = { version = "1.0", features = [ "derive" ] } +log = "0.4.17" +futures = "0.3.25" +env_logger = "0.11.6" + +[lints.rust] +unsafe_code= "forbid" +missing_docs = "forbid" diff --git a/LICENSE b/yorokobot/LICENSE similarity index 100% rename from LICENSE rename to yorokobot/LICENSE diff --git a/src/client.rs b/yorokobot/src/client.rs similarity index 100% rename from src/client.rs rename to yorokobot/src/client.rs diff --git a/src/database.rs b/yorokobot/src/database.rs similarity index 100% rename from src/database.rs rename to yorokobot/src/database.rs diff --git a/src/database/client.rs b/yorokobot/src/database/client.rs similarity index 100% rename from src/database/client.rs rename to yorokobot/src/database/client.rs diff --git a/src/database/models.rs b/yorokobot/src/database/models.rs similarity index 100% rename from src/database/models.rs rename to yorokobot/src/database/models.rs diff --git a/src/discord.rs b/yorokobot/src/discord.rs similarity index 100% rename from src/discord.rs rename to yorokobot/src/discord.rs diff --git a/src/discord/commands.rs b/yorokobot/src/discord/commands.rs similarity index 100% rename from src/discord/commands.rs rename to yorokobot/src/discord/commands.rs diff --git a/src/discord/commands/commons.rs b/yorokobot/src/discord/commands/commons.rs similarity index 100% rename from src/discord/commands/commons.rs rename to yorokobot/src/discord/commands/commons.rs diff --git a/src/discord/commands/create_tag.rs b/yorokobot/src/discord/commands/create_tag.rs similarity index 100% rename from src/discord/commands/create_tag.rs rename to yorokobot/src/discord/commands/create_tag.rs diff --git a/src/discord/commands/delete_tag.rs b/yorokobot/src/discord/commands/delete_tag.rs similarity index 100% rename from src/discord/commands/delete_tag.rs rename to yorokobot/src/discord/commands/delete_tag.rs diff --git a/src/discord/commands/list_tags.rs b/yorokobot/src/discord/commands/list_tags.rs similarity index 100% rename from src/discord/commands/list_tags.rs rename to yorokobot/src/discord/commands/list_tags.rs diff --git a/src/discord/commands/source_code.rs b/yorokobot/src/discord/commands/source_code.rs similarity index 100% rename from src/discord/commands/source_code.rs rename to yorokobot/src/discord/commands/source_code.rs diff --git a/src/discord/commands/subscribe.rs b/yorokobot/src/discord/commands/subscribe.rs similarity index 100% rename from src/discord/commands/subscribe.rs rename to yorokobot/src/discord/commands/subscribe.rs diff --git a/src/discord/commands/tag_notify.rs b/yorokobot/src/discord/commands/tag_notify.rs similarity index 100% rename from src/discord/commands/tag_notify.rs rename to yorokobot/src/discord/commands/tag_notify.rs diff --git a/src/discord/event_handler.rs b/yorokobot/src/discord/event_handler.rs similarity index 100% rename from src/discord/event_handler.rs rename to yorokobot/src/discord/event_handler.rs diff --git a/src/discord/message_builders.rs b/yorokobot/src/discord/message_builders.rs similarity index 100% rename from src/discord/message_builders.rs rename to yorokobot/src/discord/message_builders.rs diff --git a/src/discord/message_builders/embed_builder.rs b/yorokobot/src/discord/message_builders/embed_builder.rs similarity index 100% rename from src/discord/message_builders/embed_builder.rs rename to yorokobot/src/discord/message_builders/embed_builder.rs diff --git a/src/discord/message_builders/selector_builder.rs b/yorokobot/src/discord/message_builders/selector_builder.rs similarity index 100% rename from src/discord/message_builders/selector_builder.rs rename to yorokobot/src/discord/message_builders/selector_builder.rs diff --git a/src/environment.rs b/yorokobot/src/environment.rs similarity index 100% rename from src/environment.rs rename to yorokobot/src/environment.rs diff --git a/src/main.rs b/yorokobot/src/main.rs similarity index 100% rename from src/main.rs rename to yorokobot/src/main.rs