diff --git a/.vscode/settings.json b/.vscode/settings.json index b458b995..94d7924a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,4 @@ { - "rust-analyzer.diagnostics.disabled": [ - "unresolved-macro-call" - ] + "editor.formatOnSave": true, + "rust-analyzer.checkOnSave.command": "clippy" } \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 755a823d..1a0af828 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -360,6 +360,15 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "383d29d513d8764dcdc42ea295d979eb99c3c9f00607b3692cf68a431f7dca72" +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + [[package]] name = "bitfield" version = "0.13.2" @@ -2378,6 +2387,16 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" +[[package]] +name = "pretty_env_logger" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d" +dependencies = [ + "env_logger", + "log", +] + [[package]] name = "proc-macro-crate" version = "1.1.0" @@ -2797,6 +2816,22 @@ dependencies = [ "url", ] +[[package]] +name = "redis-kiss" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14427aa42349c94ed30548390a0946773dbfd757a66cf76394fb02e5406f18f6" +dependencies = [ + "bincode", + "lazy_static", + "mobc", + "mobc-redis", + "redis 0.21.2", + "rmp-serde 1.0.0", + "serde", + "serde_json", +] + [[package]] name = "redox_syscall" version = "0.2.10" @@ -2931,7 +2966,7 @@ dependencies = [ "regex", "reqwest", "revolt-quark", - "rmp-serde", + "rmp-serde 0.15.5", "rocket", "rocket_cors", "serde", @@ -2950,6 +2985,7 @@ dependencies = [ "async-trait", "bitfield", "bson 2.1.0", + "dotenv", "futures", "impl_ops", "lazy_static", @@ -2959,7 +2995,9 @@ dependencies = [ "num_enum", "ops", "optional_struct", + "pretty_env_logger", "rauth", + "redis-kiss", "rocket", "serde", "serde_json", @@ -2982,6 +3020,16 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "rmp" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f55e5fa1446c4d5dd1f5daeed2a4fe193071771a2636274d0d7a3b082aa7ad6" +dependencies = [ + "byteorder", + "num-traits", +] + [[package]] name = "rmp" version = "0.8.10" @@ -2997,7 +3045,18 @@ version = "0.15.5" source = "git+https://github.com/insertish/msgpack-rust?rev=5bf2c24203ad422233cf35b7b7bfad9f7e811814#5bf2c24203ad422233cf35b7b7bfad9f7e811814" dependencies = [ "byteorder", - "rmp", + "rmp 0.8.10 (git+https://github.com/insertish/msgpack-rust?rev=5bf2c24203ad422233cf35b7b7bfad9f7e811814)", + "serde", +] + +[[package]] +name = "rmp-serde" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3eedffbfcc6a428f230c04baf8f59bd73c1781361e4286111fe900849aaddaf" +dependencies = [ + "byteorder", + "rmp 0.8.10 (registry+https://github.com/rust-lang/crates.io-index)", "serde", ] @@ -3260,9 +3319,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.130" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" +checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" dependencies = [ "serde_derive", ] @@ -3278,9 +3337,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.130" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" +checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" dependencies = [ "proc-macro2", "quote 1.0.9", diff --git a/Cargo.toml b/Cargo.toml index 9951fda7..c67a56dd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -65,4 +65,4 @@ mongodb = { version = "1.2.2", features = ["async-std-runtime"], default-feature rocket_cors = { git = "https://github.com/lawliet89/rocket_cors", rev = "5843861a88958c16bfaa0b40f0d8910772bcd2f6" } # quark -revolt-quark = { path = "/run/media/mink/2b4927e2-fad4-4b12-b6ea-cdf7e0ab0339/revolt/quark/" } +revolt-quark = { path = "/run/media/mink/oldssd/revolt/quark/" }