diff options
130 files changed, 2505 insertions, 720 deletions
@@ -126,9 +126,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.7.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" +checksum = "d9df67f7bf9ef8498769f994239c45613ef0c5899415fb58e9add412d2c1a538" [[package]] name = "byteorder" @@ -162,9 +162,9 @@ checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" [[package]] name = "cc" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0" +checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd" [[package]] name = "cfg-if" @@ -205,6 +205,7 @@ name = "common" version = "0.1.0" dependencies = [ "config", + "enumflags2", "hyper", "log", "nats", @@ -212,6 +213,7 @@ dependencies = [ "prometheus", "redis", "serde 1.0.130", + "serde_repr", "testcontainers", "tokio", ] @@ -243,9 +245,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" +checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3" dependencies = [ "core-foundation-sys", "libc", @@ -253,9 +255,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "cpufeatures" @@ -312,6 +314,16 @@ dependencies = [ ] [[package]] +name = "ctor" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa" +dependencies = [ + "quote", + "syn", +] + +[[package]] name = "curve25519-dalek" version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -622,9 +634,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7f3675cfef6a30c8031cf9e6493ebdc3bb3272a3fea3923c4210d1830e6a472" +checksum = "6c06815895acec637cd6ed6e9662c935b866d20a106f8361892893a7d9234964" dependencies = [ "bytes", "fnv", @@ -672,9 +684,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" +checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" dependencies = [ "bytes", "fnv", @@ -715,9 +727,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.12" +version = "0.14.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13f67199e765030fa08fe0bd581af683f0d5bc04ea09c2b1102012c5fb90e7fd" +checksum = "15d1cfb9e4f68655fa04c01f59edb405b6074a0f7118ea881e5026e4a1cd8593" dependencies = [ "bytes", "futures-channel", @@ -773,9 +785,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.10" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ "cfg-if", ] @@ -788,9 +800,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "js-sys" -version = "0.3.53" +version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4bf49d50e2961077d9c99f4b7997d770a1114f087c3c2e0069b36c13fc2979d" +checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" dependencies = [ "wasm-bindgen", ] @@ -822,9 +834,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.101" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21" +checksum = "7b2f96d100e1cf1929e7719b7edb3b90ab5298072638fccd77be9ce942ecdfce" [[package]] name = "linked-hash-map" @@ -874,9 +886,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" +checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" dependencies = [ "libc", "log", @@ -1215,15 +1227,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" +checksum = "7c9b1041b4387893b91ee6746cddfc28516aff326a3519fb2adf820932c5e6cb" [[package]] name = "ppv-lite86" -version = "0.2.10" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" +checksum = "c3ca011bd0129ff4ae15cd04c4eef202cadf6c51c21e47aba319b4e0501db741" [[package]] name = "pretty_env_logger" @@ -1249,9 +1261,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" [[package]] name = "proc-macro2" -version = "1.0.29" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d" +checksum = "edc3358ebc67bc8b7fa0c007f945b0b18226f78437d61bec735a9eb96b61ee70" dependencies = [ "unicode-xid", ] @@ -1301,9 +1313,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" dependencies = [ "proc-macro2", ] @@ -1391,9 +1403,9 @@ dependencies = [ [[package]] name = "redis" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "202c5bf92cad3d57605c366e644a7fbf305a83f19754fc66678c6265dcc9b8b4" +checksum = "dd71bdb3d0d6e9183e675c977f652fbf8abc3b63fcb722e9abb42f82ef839b65" dependencies = [ "arc-swap", "async-trait", @@ -1603,9 +1615,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.67" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f9e390c27c3c0ce8bc5d725f6e4d30a29d26659494aa4b17535f7522c5c950" +checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8" dependencies = [ "itoa", "ryu", @@ -1644,9 +1656,9 @@ checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" [[package]] name = "sha2" -version = "0.9.6" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9204c41a1597a8c5af23c82d1c921cb01ec0a4c59e07a9c7306062829a3903f3" +checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" dependencies = [ "block-buffer", "cfg-if", @@ -1684,21 +1696,21 @@ checksum = "c19772be3c4dd2ceaacf03cb41d5885f2a02c4d8804884918e3a258480803335" [[package]] name = "slab" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" +checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" [[package]] name = "smallvec" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" [[package]] name = "socket2" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad" +checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516" dependencies = [ "libc", "winapi", @@ -1733,9 +1745,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.76" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84" +checksum = "d010a1623fbd906d51d650a9916aaefc05ffa0e4053ff7fe601167f3e715d194" dependencies = [ "proc-macro2", "quote", @@ -1744,9 +1756,9 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", @@ -1794,18 +1806,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.29" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88" +checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.29" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c" +checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" dependencies = [ "proc-macro2", "quote", @@ -1825,9 +1837,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.3.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338" +checksum = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7" dependencies = [ "tinyvec_macros", ] @@ -1840,9 +1852,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4efe6fc2395938c8155973d7be49fe8d03a843726e285e100a8a383cc0154ce" +checksum = "c2c2416fdedca8443ae44b4527de1ea633af61d8f7169ffa6e72c5b53d24efcc" dependencies = [ "autocfg", "bytes", @@ -1860,9 +1872,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.3.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110" +checksum = "b2dd85aeaba7b68df939bd357c6afb36c87951be9e80bf9c859f2fc3e9fca0fd" dependencies = [ "proc-macro2", "quote", @@ -1938,9 +1950,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.26" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d" +checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" dependencies = [ "cfg-if", "pin-project-lite", @@ -1949,9 +1961,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.19" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ca517f43f0fb96e0c3072ed5c275fe5eece87e8cb52f4a77b69226d3b1c9df8" +checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" dependencies = [ "lazy_static", ] @@ -1992,9 +2004,9 @@ checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" [[package]] name = "unicode-bidi" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085" +checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" [[package]] name = "unicode-normalization" @@ -2077,9 +2089,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" -version = "0.2.76" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce9b1b516211d33767048e5d47fa2a381ed8b76fc48d2ce4aa39877f9f183e0" +checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2087,9 +2099,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.76" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe8dc78e2326ba5f845f4b5bf548401604fa20b1dd1d365fb73b6c1d6364041" +checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" dependencies = [ "bumpalo", "lazy_static", @@ -2102,9 +2114,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.76" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44468aa53335841d9d6b6c023eaab07c0cd4bddbcfdee3e2bb1e8d2cb8069fef" +checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2112,9 +2124,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.76" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0195807922713af1e67dc66132c7328206ed9766af3858164fb583eedc25fbad" +checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" dependencies = [ "proc-macro2", "quote", @@ -2125,15 +2137,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.76" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdb075a845574a1fa5f09fd77e43f7747599301ea3417a9fbffdeedfc1f4a29" +checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" [[package]] name = "web-sys" -version = "0.3.53" +version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224b2f6b67919060055ef1a67807367c2066ed520c3862cc013d26cf893a783c" +checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" dependencies = [ "js-sys", "wasm-bindgen", @@ -2144,6 +2156,7 @@ name = "webhook" version = "0.1.0" dependencies = [ "common", + "ctor", "ed25519-dalek", "hex", "hyper", @@ -2222,18 +2235,18 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "377db0846015f7ae377174787dd452e1c5f5a9050bc6f954911d01f116daa0cd" +checksum = "bf68b08513768deaa790264a7fac27a58cbf2705cfcdc9448362229217d7e970" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2c1e130bebaeab2f23886bf9acbaca14b092408c452543c857f66399cd6dab1" +checksum = "bdff2024a851a322b08f179173ae2ba620445aef1e838f0c196820eade4ae0c7" dependencies = [ "proc-macro2", "quote", @@ -28,8 +28,8 @@ package_aliases_dir = "cargo" experimental_api = true
[package.metadata.raze.crates.cpufeatures.'*']
-skipped_deps = ["libc-0.2.101"]
-additional_deps = ["@raze__libc__0_2_101//:libc"]
+skipped_deps = ["libc-0.2.104"]
+additional_deps = ["@raze__libc__0_2_104//:libc"]
[package.metadata.raze.crates.ring.'*']
compile_data_attr = "glob([\"*/**\"])"
@@ -41,6 +41,5 @@ compile_data_attr = "glob([\"*/**\"])" skipped_deps = ["miniz_oxide-0.4.4"]
additional_deps = ["@raze__miniz_oxide__0_4_4//:miniz_oxide"]
-
[package.metadata.raze.crates.webpki.'*']
compile_data_attr = "glob([\"*/**\"])"
diff --git a/cache/cargo/BUILD.bazel b/cache/cargo/BUILD.bazel index 1543954..2f73d4d 100644 --- a/cache/cargo/BUILD.bazel +++ b/cache/cargo/BUILD.bazel @@ -32,7 +32,7 @@ alias( alias( name = "redis", - actual = "@raze__redis__0_21_2//:redis", + actual = "@raze__redis__0_21_3//:redis", tags = [ "cargo-raze", "manual", @@ -50,7 +50,7 @@ alias( alias( name = "serde_json", - actual = "@raze__serde_json__1_0_67//:serde_json", + actual = "@raze__serde_json__1_0_68//:serde_json", tags = [ "cargo-raze", "manual", diff --git a/cargo/BUILD.bazel b/cargo/BUILD.bazel index 27b7961..16a5667 100644 --- a/cargo/BUILD.bazel +++ b/cargo/BUILD.bazel @@ -14,7 +14,7 @@ licenses([ # Aliased targets alias( name = "libc", - actual = "@raze__libc__0_2_101//:libc", + actual = "@raze__libc__0_2_104//:libc", tags = [ "cargo-raze", "manual", diff --git a/cargo/crates.bzl b/cargo/crates.bzl index 4d1ef9c..5d2dd87 100644 --- a/cargo/crates.bzl +++ b/cargo/crates.bzl @@ -14,25 +14,26 @@ _DEPENDENCIES = { "webhook": { "ed25519-dalek": "@raze__ed25519_dalek__1_0_1//:ed25519_dalek", "hex": "@raze__hex__0_4_3//:hex", - "hyper": "@raze__hyper__0_14_12//:hyper", + "hyper": "@raze__hyper__0_14_13//:hyper", "lazy_static": "@raze__lazy_static__1_4_0//:lazy_static", - "libc": "@raze__libc__0_2_101//:libc", + "libc": "@raze__libc__0_2_104//:libc", "rand": "@raze__rand__0_7_3//:rand", "serde": "@raze__serde__1_0_130//:serde", - "serde_json": "@raze__serde_json__1_0_67//:serde_json", - "tokio": "@raze__tokio__1_11_0//:tokio", + "serde_json": "@raze__serde_json__1_0_68//:serde_json", + "tokio": "@raze__tokio__1_12_0//:tokio", }, "common/rust": { "config": "@raze__config__0_11_0//:config", - "hyper": "@raze__hyper__0_14_12//:hyper", + "enumflags2": "@raze__enumflags2__0_7_1//:enumflags2", + "hyper": "@raze__hyper__0_14_13//:hyper", "log": "@raze__log__0_4_14//:log", "nats": "@raze__nats__0_15_2//:nats", "pretty_env_logger": "@raze__pretty_env_logger__0_4_0//:pretty_env_logger", "prometheus": "@raze__prometheus__0_12_0//:prometheus", - "redis": "@raze__redis__0_21_2//:redis", + "redis": "@raze__redis__0_21_3//:redis", "serde": "@raze__serde__1_0_130//:serde", "testcontainers": "@raze__testcontainers__0_12_0//:testcontainers", - "tokio": "@raze__tokio__1_11_0//:tokio", + "tokio": "@raze__tokio__1_12_0//:tokio", }, "gateway": { "enumflags2": "@raze__enumflags2__0_7_1//:enumflags2", @@ -41,37 +42,39 @@ _DEPENDENCIES = { "num": "@raze__num__0_4_0//:num", "num-traits": "@raze__num_traits__0_2_14//:num_traits", "serde": "@raze__serde__1_0_130//:serde", - "serde_json": "@raze__serde_json__1_0_67//:serde_json", - "tokio": "@raze__tokio__1_11_0//:tokio", + "serde_json": "@raze__serde_json__1_0_68//:serde_json", + "tokio": "@raze__tokio__1_12_0//:tokio", "tokio-tungstenite": "@raze__tokio_tungstenite__0_15_0//:tokio_tungstenite", "url": "@raze__url__2_2_2//:url", }, "cache": { "log": "@raze__log__0_4_14//:log", "nats": "@raze__nats__0_15_2//:nats", - "redis": "@raze__redis__0_21_2//:redis", + "redis": "@raze__redis__0_21_3//:redis", "serde": "@raze__serde__1_0_130//:serde", - "serde_json": "@raze__serde_json__1_0_67//:serde_json", + "serde_json": "@raze__serde_json__1_0_68//:serde_json", }, "rest": { "futures-util": "@raze__futures_util__0_3_17//:futures_util", - "hyper": "@raze__hyper__0_14_12//:hyper", + "hyper": "@raze__hyper__0_14_13//:hyper", "hyper-tls": "@raze__hyper_tls__0_5_0//:hyper_tls", "lazy_static": "@raze__lazy_static__1_4_0//:lazy_static", "serde": "@raze__serde__1_0_130//:serde", - "tokio": "@raze__tokio__1_11_0//:tokio", + "tokio": "@raze__tokio__1_12_0//:tokio", "xxhash-rust": "@raze__xxhash_rust__0_8_2//:xxhash_rust", }, "": { - "libc": "@raze__libc__0_2_101//:libc", + "libc": "@raze__libc__0_2_104//:libc", }, } # EXPERIMENTAL -- MAY CHANGE AT ANY TIME: A mapping of package names to a set of proc_macro dependencies for the Rust targets of that package. _PROC_MACRO_DEPENDENCIES = { "webhook": { + "ctor": "@raze__ctor__0_1_21//:ctor", }, "common/rust": { + "serde_repr": "@raze__serde_repr__0_1_7//:serde_repr", }, "gateway": { "num-derive": "@raze__num_derive__0_3_3//:num_derive", @@ -404,12 +407,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__bumpalo__3_7_0", - url = "https://crates.io/api/v1/crates/bumpalo/3.7.0/download", + name = "raze__bumpalo__3_7_1", + url = "https://crates.io/api/v1/crates/bumpalo/3.7.1/download", type = "tar.gz", - sha256 = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631", - strip_prefix = "bumpalo-3.7.0", - build_file = Label("//cargo/remote:BUILD.bumpalo-3.7.0.bazel"), + sha256 = "d9df67f7bf9ef8498769f994239c45613ef0c5899415fb58e9add412d2c1a538", + strip_prefix = "bumpalo-3.7.1", + build_file = Label("//cargo/remote:BUILD.bumpalo-3.7.1.bazel"), ) maybe( @@ -444,12 +447,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__cc__1_0_70", - url = "https://crates.io/api/v1/crates/cc/1.0.70/download", + name = "raze__cc__1_0_71", + url = "https://crates.io/api/v1/crates/cc/1.0.71/download", type = "tar.gz", - sha256 = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0", - strip_prefix = "cc-1.0.70", - build_file = Label("//cargo/remote:BUILD.cc-1.0.70.bazel"), + sha256 = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd", + strip_prefix = "cc-1.0.71", + build_file = Label("//cargo/remote:BUILD.cc-1.0.71.bazel"), ) maybe( @@ -504,22 +507,22 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__core_foundation__0_9_1", - url = "https://crates.io/api/v1/crates/core-foundation/0.9.1/download", + name = "raze__core_foundation__0_9_2", + url = "https://crates.io/api/v1/crates/core-foundation/0.9.2/download", type = "tar.gz", - sha256 = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62", - strip_prefix = "core-foundation-0.9.1", - build_file = Label("//cargo/remote:BUILD.core-foundation-0.9.1.bazel"), + sha256 = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3", + strip_prefix = "core-foundation-0.9.2", + build_file = Label("//cargo/remote:BUILD.core-foundation-0.9.2.bazel"), ) maybe( http_archive, - name = "raze__core_foundation_sys__0_8_2", - url = "https://crates.io/api/v1/crates/core-foundation-sys/0.8.2/download", + name = "raze__core_foundation_sys__0_8_3", + url = "https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download", type = "tar.gz", - sha256 = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b", - strip_prefix = "core-foundation-sys-0.8.2", - build_file = Label("//cargo/remote:BUILD.core-foundation-sys-0.8.2.bazel"), + sha256 = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc", + strip_prefix = "core-foundation-sys-0.8.3", + build_file = Label("//cargo/remote:BUILD.core-foundation-sys-0.8.3.bazel"), ) maybe( @@ -584,6 +587,16 @@ def raze_fetch_remote_crates(): maybe( http_archive, + name = "raze__ctor__0_1_21", + url = "https://crates.io/api/v1/crates/ctor/0.1.21/download", + type = "tar.gz", + sha256 = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa", + strip_prefix = "ctor-0.1.21", + build_file = Label("//cargo/remote:BUILD.ctor-0.1.21.bazel"), + ) + + maybe( + http_archive, name = "raze__curve25519_dalek__3_2_0", url = "https://crates.io/api/v1/crates/curve25519-dalek/3.2.0/download", type = "tar.gz", @@ -874,12 +887,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__h2__0_3_4", - url = "https://crates.io/api/v1/crates/h2/0.3.4/download", + name = "raze__h2__0_3_6", + url = "https://crates.io/api/v1/crates/h2/0.3.6/download", type = "tar.gz", - sha256 = "d7f3675cfef6a30c8031cf9e6493ebdc3bb3272a3fea3923c4210d1830e6a472", - strip_prefix = "h2-0.3.4", - build_file = Label("//cargo/remote:BUILD.h2-0.3.4.bazel"), + sha256 = "6c06815895acec637cd6ed6e9662c935b866d20a106f8361892893a7d9234964", + strip_prefix = "h2-0.3.6", + build_file = Label("//cargo/remote:BUILD.h2-0.3.6.bazel"), ) maybe( @@ -924,12 +937,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__http__0_2_4", - url = "https://crates.io/api/v1/crates/http/0.2.4/download", + name = "raze__http__0_2_5", + url = "https://crates.io/api/v1/crates/http/0.2.5/download", type = "tar.gz", - sha256 = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11", - strip_prefix = "http-0.2.4", - build_file = Label("//cargo/remote:BUILD.http-0.2.4.bazel"), + sha256 = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b", + strip_prefix = "http-0.2.5", + build_file = Label("//cargo/remote:BUILD.http-0.2.5.bazel"), ) maybe( @@ -974,12 +987,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__hyper__0_14_12", - url = "https://crates.io/api/v1/crates/hyper/0.14.12/download", + name = "raze__hyper__0_14_13", + url = "https://crates.io/api/v1/crates/hyper/0.14.13/download", type = "tar.gz", - sha256 = "13f67199e765030fa08fe0bd581af683f0d5bc04ea09c2b1102012c5fb90e7fd", - strip_prefix = "hyper-0.14.12", - build_file = Label("//cargo/remote:BUILD.hyper-0.14.12.bazel"), + sha256 = "15d1cfb9e4f68655fa04c01f59edb405b6074a0f7118ea881e5026e4a1cd8593", + strip_prefix = "hyper-0.14.13", + build_file = Label("//cargo/remote:BUILD.hyper-0.14.13.bazel"), ) maybe( @@ -1014,12 +1027,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__instant__0_1_10", - url = "https://crates.io/api/v1/crates/instant/0.1.10/download", + name = "raze__instant__0_1_12", + url = "https://crates.io/api/v1/crates/instant/0.1.12/download", type = "tar.gz", - sha256 = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d", - strip_prefix = "instant-0.1.10", - build_file = Label("//cargo/remote:BUILD.instant-0.1.10.bazel"), + sha256 = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c", + strip_prefix = "instant-0.1.12", + build_file = Label("//cargo/remote:BUILD.instant-0.1.12.bazel"), ) maybe( @@ -1034,12 +1047,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__js_sys__0_3_53", - url = "https://crates.io/api/v1/crates/js-sys/0.3.53/download", + name = "raze__js_sys__0_3_55", + url = "https://crates.io/api/v1/crates/js-sys/0.3.55/download", type = "tar.gz", - sha256 = "e4bf49d50e2961077d9c99f4b7997d770a1114f087c3c2e0069b36c13fc2979d", - strip_prefix = "js-sys-0.3.53", - build_file = Label("//cargo/remote:BUILD.js-sys-0.3.53.bazel"), + sha256 = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84", + strip_prefix = "js-sys-0.3.55", + build_file = Label("//cargo/remote:BUILD.js-sys-0.3.55.bazel"), ) maybe( @@ -1074,12 +1087,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__libc__0_2_101", - url = "https://crates.io/api/v1/crates/libc/0.2.101/download", + name = "raze__libc__0_2_104", + url = "https://crates.io/api/v1/crates/libc/0.2.104/download", type = "tar.gz", - sha256 = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21", - strip_prefix = "libc-0.2.101", - build_file = Label("//cargo/remote:BUILD.libc-0.2.101.bazel"), + sha256 = "7b2f96d100e1cf1929e7719b7edb3b90ab5298072638fccd77be9ce942ecdfce", + strip_prefix = "libc-0.2.104", + build_file = Label("//cargo/remote:BUILD.libc-0.2.104.bazel"), ) maybe( @@ -1144,12 +1157,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__mio__0_7_13", - url = "https://crates.io/api/v1/crates/mio/0.7.13/download", + name = "raze__mio__0_7_14", + url = "https://crates.io/api/v1/crates/mio/0.7.14/download", type = "tar.gz", - sha256 = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16", - strip_prefix = "mio-0.7.13", - build_file = Label("//cargo/remote:BUILD.mio-0.7.13.bazel"), + sha256 = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc", + strip_prefix = "mio-0.7.14", + build_file = Label("//cargo/remote:BUILD.mio-0.7.14.bazel"), ) maybe( @@ -1454,22 +1467,22 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__pkg_config__0_3_19", - url = "https://crates.io/api/v1/crates/pkg-config/0.3.19/download", + name = "raze__pkg_config__0_3_20", + url = "https://crates.io/api/v1/crates/pkg-config/0.3.20/download", type = "tar.gz", - sha256 = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c", - strip_prefix = "pkg-config-0.3.19", - build_file = Label("//cargo/remote:BUILD.pkg-config-0.3.19.bazel"), + sha256 = "7c9b1041b4387893b91ee6746cddfc28516aff326a3519fb2adf820932c5e6cb", + strip_prefix = "pkg-config-0.3.20", + build_file = Label("//cargo/remote:BUILD.pkg-config-0.3.20.bazel"), ) maybe( http_archive, - name = "raze__ppv_lite86__0_2_10", - url = "https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download", + name = "raze__ppv_lite86__0_2_14", + url = "https://crates.io/api/v1/crates/ppv-lite86/0.2.14/download", type = "tar.gz", - sha256 = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857", - strip_prefix = "ppv-lite86-0.2.10", - build_file = Label("//cargo/remote:BUILD.ppv-lite86-0.2.10.bazel"), + sha256 = "c3ca011bd0129ff4ae15cd04c4eef202cadf6c51c21e47aba319b4e0501db741", + strip_prefix = "ppv-lite86-0.2.14", + build_file = Label("//cargo/remote:BUILD.ppv-lite86-0.2.14.bazel"), ) maybe( @@ -1504,12 +1517,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__proc_macro2__1_0_29", - url = "https://crates.io/api/v1/crates/proc-macro2/1.0.29/download", + name = "raze__proc_macro2__1_0_30", + url = "https://crates.io/api/v1/crates/proc-macro2/1.0.30/download", type = "tar.gz", - sha256 = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d", - strip_prefix = "proc-macro2-1.0.29", - build_file = Label("//cargo/remote:BUILD.proc-macro2-1.0.29.bazel"), + sha256 = "edc3358ebc67bc8b7fa0c007f945b0b18226f78437d61bec735a9eb96b61ee70", + strip_prefix = "proc-macro2-1.0.30", + build_file = Label("//cargo/remote:BUILD.proc-macro2-1.0.30.bazel"), ) maybe( @@ -1554,12 +1567,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__quote__1_0_9", - url = "https://crates.io/api/v1/crates/quote/1.0.9/download", + name = "raze__quote__1_0_10", + url = "https://crates.io/api/v1/crates/quote/1.0.10/download", type = "tar.gz", - sha256 = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7", - strip_prefix = "quote-1.0.9", - build_file = Label("//cargo/remote:BUILD.quote-1.0.9.bazel"), + sha256 = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05", + strip_prefix = "quote-1.0.10", + build_file = Label("//cargo/remote:BUILD.quote-1.0.10.bazel"), ) maybe( @@ -1644,12 +1657,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__redis__0_21_2", - url = "https://crates.io/api/v1/crates/redis/0.21.2/download", + name = "raze__redis__0_21_3", + url = "https://crates.io/api/v1/crates/redis/0.21.3/download", type = "tar.gz", - sha256 = "202c5bf92cad3d57605c366e644a7fbf305a83f19754fc66678c6265dcc9b8b4", - strip_prefix = "redis-0.21.2", - build_file = Label("//cargo/remote:BUILD.redis-0.21.2.bazel"), + sha256 = "dd71bdb3d0d6e9183e675c977f652fbf8abc3b63fcb722e9abb42f82ef839b65", + strip_prefix = "redis-0.21.3", + build_file = Label("//cargo/remote:BUILD.redis-0.21.3.bazel"), ) maybe( @@ -1834,12 +1847,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__serde_json__1_0_67", - url = "https://crates.io/api/v1/crates/serde_json/1.0.67/download", + name = "raze__serde_json__1_0_68", + url = "https://crates.io/api/v1/crates/serde_json/1.0.68/download", type = "tar.gz", - sha256 = "a7f9e390c27c3c0ce8bc5d725f6e4d30a29d26659494aa4b17535f7522c5c950", - strip_prefix = "serde_json-1.0.67", - build_file = Label("//cargo/remote:BUILD.serde_json-1.0.67.bazel"), + sha256 = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8", + strip_prefix = "serde_json-1.0.68", + build_file = Label("//cargo/remote:BUILD.serde_json-1.0.68.bazel"), ) maybe( @@ -1874,12 +1887,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__sha2__0_9_6", - url = "https://crates.io/api/v1/crates/sha2/0.9.6/download", + name = "raze__sha2__0_9_8", + url = "https://crates.io/api/v1/crates/sha2/0.9.8/download", type = "tar.gz", - sha256 = "9204c41a1597a8c5af23c82d1c921cb01ec0a4c59e07a9c7306062829a3903f3", - strip_prefix = "sha2-0.9.6", - build_file = Label("//cargo/remote:BUILD.sha2-0.9.6.bazel"), + sha256 = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa", + strip_prefix = "sha2-0.9.8", + build_file = Label("//cargo/remote:BUILD.sha2-0.9.8.bazel"), ) maybe( @@ -1914,32 +1927,32 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__slab__0_4_4", - url = "https://crates.io/api/v1/crates/slab/0.4.4/download", + name = "raze__slab__0_4_5", + url = "https://crates.io/api/v1/crates/slab/0.4.5/download", type = "tar.gz", - sha256 = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590", - strip_prefix = "slab-0.4.4", - build_file = Label("//cargo/remote:BUILD.slab-0.4.4.bazel"), + sha256 = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5", + strip_prefix = "slab-0.4.5", + build_file = Label("//cargo/remote:BUILD.slab-0.4.5.bazel"), ) maybe( http_archive, - name = "raze__smallvec__1_6_1", - url = "https://crates.io/api/v1/crates/smallvec/1.6.1/download", + name = "raze__smallvec__1_7_0", + url = "https://crates.io/api/v1/crates/smallvec/1.7.0/download", type = "tar.gz", - sha256 = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e", - strip_prefix = "smallvec-1.6.1", - build_file = Label("//cargo/remote:BUILD.smallvec-1.6.1.bazel"), + sha256 = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309", + strip_prefix = "smallvec-1.7.0", + build_file = Label("//cargo/remote:BUILD.smallvec-1.7.0.bazel"), ) maybe( http_archive, - name = "raze__socket2__0_4_1", - url = "https://crates.io/api/v1/crates/socket2/0.4.1/download", + name = "raze__socket2__0_4_2", + url = "https://crates.io/api/v1/crates/socket2/0.4.2/download", type = "tar.gz", - sha256 = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad", - strip_prefix = "socket2-0.4.1", - build_file = Label("//cargo/remote:BUILD.socket2-0.4.1.bazel"), + sha256 = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516", + strip_prefix = "socket2-0.4.2", + build_file = Label("//cargo/remote:BUILD.socket2-0.4.2.bazel"), ) maybe( @@ -1984,22 +1997,22 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__syn__1_0_76", - url = "https://crates.io/api/v1/crates/syn/1.0.76/download", + name = "raze__syn__1_0_80", + url = "https://crates.io/api/v1/crates/syn/1.0.80/download", type = "tar.gz", - sha256 = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84", - strip_prefix = "syn-1.0.76", - build_file = Label("//cargo/remote:BUILD.syn-1.0.76.bazel"), + sha256 = "d010a1623fbd906d51d650a9916aaefc05ffa0e4053ff7fe601167f3e715d194", + strip_prefix = "syn-1.0.80", + build_file = Label("//cargo/remote:BUILD.syn-1.0.80.bazel"), ) maybe( http_archive, - name = "raze__synstructure__0_12_5", - url = "https://crates.io/api/v1/crates/synstructure/0.12.5/download", + name = "raze__synstructure__0_12_6", + url = "https://crates.io/api/v1/crates/synstructure/0.12.6/download", type = "tar.gz", - sha256 = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa", - strip_prefix = "synstructure-0.12.5", - build_file = Label("//cargo/remote:BUILD.synstructure-0.12.5.bazel"), + sha256 = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f", + strip_prefix = "synstructure-0.12.6", + build_file = Label("//cargo/remote:BUILD.synstructure-0.12.6.bazel"), ) maybe( @@ -2034,22 +2047,22 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__thiserror__1_0_29", - url = "https://crates.io/api/v1/crates/thiserror/1.0.29/download", + name = "raze__thiserror__1_0_30", + url = "https://crates.io/api/v1/crates/thiserror/1.0.30/download", type = "tar.gz", - sha256 = "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88", - strip_prefix = "thiserror-1.0.29", - build_file = Label("//cargo/remote:BUILD.thiserror-1.0.29.bazel"), + sha256 = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417", + strip_prefix = "thiserror-1.0.30", + build_file = Label("//cargo/remote:BUILD.thiserror-1.0.30.bazel"), ) maybe( http_archive, - name = "raze__thiserror_impl__1_0_29", - url = "https://crates.io/api/v1/crates/thiserror-impl/1.0.29/download", + name = "raze__thiserror_impl__1_0_30", + url = "https://crates.io/api/v1/crates/thiserror-impl/1.0.30/download", type = "tar.gz", - sha256 = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c", - strip_prefix = "thiserror-impl-1.0.29", - build_file = Label("//cargo/remote:BUILD.thiserror-impl-1.0.29.bazel"), + sha256 = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b", + strip_prefix = "thiserror-impl-1.0.30", + build_file = Label("//cargo/remote:BUILD.thiserror-impl-1.0.30.bazel"), ) maybe( @@ -2064,12 +2077,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__tinyvec__1_3_1", - url = "https://crates.io/api/v1/crates/tinyvec/1.3.1/download", + name = "raze__tinyvec__1_5_0", + url = "https://crates.io/api/v1/crates/tinyvec/1.5.0/download", type = "tar.gz", - sha256 = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338", - strip_prefix = "tinyvec-1.3.1", - build_file = Label("//cargo/remote:BUILD.tinyvec-1.3.1.bazel"), + sha256 = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7", + strip_prefix = "tinyvec-1.5.0", + build_file = Label("//cargo/remote:BUILD.tinyvec-1.5.0.bazel"), ) maybe( @@ -2084,22 +2097,22 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__tokio__1_11_0", - url = "https://crates.io/api/v1/crates/tokio/1.11.0/download", + name = "raze__tokio__1_12_0", + url = "https://crates.io/api/v1/crates/tokio/1.12.0/download", type = "tar.gz", - sha256 = "b4efe6fc2395938c8155973d7be49fe8d03a843726e285e100a8a383cc0154ce", - strip_prefix = "tokio-1.11.0", - build_file = Label("//cargo/remote:BUILD.tokio-1.11.0.bazel"), + sha256 = "c2c2416fdedca8443ae44b4527de1ea633af61d8f7169ffa6e72c5b53d24efcc", + strip_prefix = "tokio-1.12.0", + build_file = Label("//cargo/remote:BUILD.tokio-1.12.0.bazel"), ) maybe( http_archive, - name = "raze__tokio_macros__1_3_0", - url = "https://crates.io/api/v1/crates/tokio-macros/1.3.0/download", + name = "raze__tokio_macros__1_5_0", + url = "https://crates.io/api/v1/crates/tokio-macros/1.5.0/download", type = "tar.gz", - sha256 = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110", - strip_prefix = "tokio-macros-1.3.0", - build_file = Label("//cargo/remote:BUILD.tokio-macros-1.3.0.bazel"), + sha256 = "b2dd85aeaba7b68df939bd357c6afb36c87951be9e80bf9c859f2fc3e9fca0fd", + strip_prefix = "tokio-macros-1.5.0", + build_file = Label("//cargo/remote:BUILD.tokio-macros-1.5.0.bazel"), ) maybe( @@ -2164,22 +2177,22 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__tracing__0_1_26", - url = "https://crates.io/api/v1/crates/tracing/0.1.26/download", + name = "raze__tracing__0_1_29", + url = "https://crates.io/api/v1/crates/tracing/0.1.29/download", type = "tar.gz", - sha256 = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d", - strip_prefix = "tracing-0.1.26", - build_file = Label("//cargo/remote:BUILD.tracing-0.1.26.bazel"), + sha256 = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105", + strip_prefix = "tracing-0.1.29", + build_file = Label("//cargo/remote:BUILD.tracing-0.1.29.bazel"), ) maybe( http_archive, - name = "raze__tracing_core__0_1_19", - url = "https://crates.io/api/v1/crates/tracing-core/0.1.19/download", + name = "raze__tracing_core__0_1_21", + url = "https://crates.io/api/v1/crates/tracing-core/0.1.21/download", type = "tar.gz", - sha256 = "2ca517f43f0fb96e0c3072ed5c275fe5eece87e8cb52f4a77b69226d3b1c9df8", - strip_prefix = "tracing-core-0.1.19", - build_file = Label("//cargo/remote:BUILD.tracing-core-0.1.19.bazel"), + sha256 = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4", + strip_prefix = "tracing-core-0.1.21", + build_file = Label("//cargo/remote:BUILD.tracing-core-0.1.21.bazel"), ) maybe( @@ -2214,12 +2227,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__unicode_bidi__0_3_6", - url = "https://crates.io/api/v1/crates/unicode-bidi/0.3.6/download", + name = "raze__unicode_bidi__0_3_7", + url = "https://crates.io/api/v1/crates/unicode-bidi/0.3.7/download", type = "tar.gz", - sha256 = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085", - strip_prefix = "unicode-bidi-0.3.6", - build_file = Label("//cargo/remote:BUILD.unicode-bidi-0.3.6.bazel"), + sha256 = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f", + strip_prefix = "unicode-bidi-0.3.7", + build_file = Label("//cargo/remote:BUILD.unicode-bidi-0.3.7.bazel"), ) maybe( @@ -2334,62 +2347,62 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__wasm_bindgen__0_2_76", - url = "https://crates.io/api/v1/crates/wasm-bindgen/0.2.76/download", + name = "raze__wasm_bindgen__0_2_78", + url = "https://crates.io/api/v1/crates/wasm-bindgen/0.2.78/download", type = "tar.gz", - sha256 = "8ce9b1b516211d33767048e5d47fa2a381ed8b76fc48d2ce4aa39877f9f183e0", - strip_prefix = "wasm-bindgen-0.2.76", - build_file = Label("//cargo/remote:BUILD.wasm-bindgen-0.2.76.bazel"), + sha256 = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce", + strip_prefix = "wasm-bindgen-0.2.78", + build_file = Label("//cargo/remote:BUILD.wasm-bindgen-0.2.78.bazel"), ) maybe( http_archive, - name = "raze__wasm_bindgen_backend__0_2_76", - url = "https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.76/download", + name = "raze__wasm_bindgen_backend__0_2_78", + url = "https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.78/download", type = "tar.gz", - sha256 = "cfe8dc78e2326ba5f845f4b5bf548401604fa20b1dd1d365fb73b6c1d6364041", - strip_prefix = "wasm-bindgen-backend-0.2.76", - build_file = Label("//cargo/remote:BUILD.wasm-bindgen-backend-0.2.76.bazel"), + sha256 = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b", + strip_prefix = "wasm-bindgen-backend-0.2.78", + build_file = Label("//cargo/remote:BUILD.wasm-bindgen-backend-0.2.78.bazel"), ) maybe( http_archive, - name = "raze__wasm_bindgen_macro__0_2_76", - url = "https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.76/download", + name = "raze__wasm_bindgen_macro__0_2_78", + url = "https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.78/download", type = "tar.gz", - sha256 = "44468aa53335841d9d6b6c023eaab07c0cd4bddbcfdee3e2bb1e8d2cb8069fef", - strip_prefix = "wasm-bindgen-macro-0.2.76", - build_file = Label("//cargo/remote:BUILD.wasm-bindgen-macro-0.2.76.bazel"), + sha256 = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9", + strip_prefix = "wasm-bindgen-macro-0.2.78", + build_file = Label("//cargo/remote:BUILD.wasm-bindgen-macro-0.2.78.bazel"), ) maybe( http_archive, - name = "raze__wasm_bindgen_macro_support__0_2_76", - url = "https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.76/download", + name = "raze__wasm_bindgen_macro_support__0_2_78", + url = "https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.78/download", type = "tar.gz", - sha256 = "0195807922713af1e67dc66132c7328206ed9766af3858164fb583eedc25fbad", - strip_prefix = "wasm-bindgen-macro-support-0.2.76", - build_file = Label("//cargo/remote:BUILD.wasm-bindgen-macro-support-0.2.76.bazel"), + sha256 = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab", + strip_prefix = "wasm-bindgen-macro-support-0.2.78", + build_file = Label("//cargo/remote:BUILD.wasm-bindgen-macro-support-0.2.78.bazel"), ) maybe( http_archive, - name = "raze__wasm_bindgen_shared__0_2_76", - url = "https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.76/download", + name = "raze__wasm_bindgen_shared__0_2_78", + url = "https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.78/download", type = "tar.gz", - sha256 = "acdb075a845574a1fa5f09fd77e43f7747599301ea3417a9fbffdeedfc1f4a29", - strip_prefix = "wasm-bindgen-shared-0.2.76", - build_file = Label("//cargo/remote:BUILD.wasm-bindgen-shared-0.2.76.bazel"), + sha256 = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc", + strip_prefix = "wasm-bindgen-shared-0.2.78", + build_file = Label("//cargo/remote:BUILD.wasm-bindgen-shared-0.2.78.bazel"), ) maybe( http_archive, - name = "raze__web_sys__0_3_53", - url = "https://crates.io/api/v1/crates/web-sys/0.3.53/download", + name = "raze__web_sys__0_3_55", + url = "https://crates.io/api/v1/crates/web-sys/0.3.55/download", type = "tar.gz", - sha256 = "224b2f6b67919060055ef1a67807367c2066ed520c3862cc013d26cf893a783c", - strip_prefix = "web-sys-0.3.53", - build_file = Label("//cargo/remote:BUILD.web-sys-0.3.53.bazel"), + sha256 = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb", + strip_prefix = "web-sys-0.3.55", + build_file = Label("//cargo/remote:BUILD.web-sys-0.3.55.bazel"), ) maybe( @@ -2474,20 +2487,20 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__zeroize__1_4_1", - url = "https://crates.io/api/v1/crates/zeroize/1.4.1/download", + name = "raze__zeroize__1_4_2", + url = "https://crates.io/api/v1/crates/zeroize/1.4.2/download", type = "tar.gz", - sha256 = "377db0846015f7ae377174787dd452e1c5f5a9050bc6f954911d01f116daa0cd", - strip_prefix = "zeroize-1.4.1", - build_file = Label("//cargo/remote:BUILD.zeroize-1.4.1.bazel"), + sha256 = "bf68b08513768deaa790264a7fac27a58cbf2705cfcdc9448362229217d7e970", + strip_prefix = "zeroize-1.4.2", + build_file = Label("//cargo/remote:BUILD.zeroize-1.4.2.bazel"), ) maybe( http_archive, - name = "raze__zeroize_derive__1_1_0", - url = "https://crates.io/api/v1/crates/zeroize_derive/1.1.0/download", + name = "raze__zeroize_derive__1_2_0", + url = "https://crates.io/api/v1/crates/zeroize_derive/1.2.0/download", type = "tar.gz", - sha256 = "a2c1e130bebaeab2f23886bf9acbaca14b092408c452543c857f66399cd6dab1", - strip_prefix = "zeroize_derive-1.1.0", - build_file = Label("//cargo/remote:BUILD.zeroize_derive-1.1.0.bazel"), + sha256 = "bdff2024a851a322b08f179173ae2ba620445aef1e838f0c196820eade4ae0c7", + strip_prefix = "zeroize_derive-1.2.0", + build_file = Label("//cargo/remote:BUILD.zeroize_derive-1.2.0.bazel"), ) diff --git a/cargo/remote/BUILD.async-trait-0.1.51.bazel b/cargo/remote/BUILD.async-trait-0.1.51.bazel index 7d20725..ab1a822 100644 --- a/cargo/remote/BUILD.async-trait-0.1.51.bazel +++ b/cargo/remote/BUILD.async-trait-0.1.51.bazel @@ -79,9 +79,9 @@ rust_library( # buildifier: leave-alone deps = [ ":async_trait_build_script", - "@raze__proc_macro2__1_0_29//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_76//:syn", + "@raze__proc_macro2__1_0_30//:proc_macro2", + "@raze__quote__1_0_10//:quote", + "@raze__syn__1_0_80//:syn", ], ) diff --git a/cargo/remote/BUILD.atty-0.2.14.bazel b/cargo/remote/BUILD.atty-0.2.14.bazel index 2ee1f01..80bc4f1 100644 --- a/cargo/remote/BUILD.atty-0.2.14.bazel +++ b/cargo/remote/BUILD.atty-0.2.14.bazel @@ -73,7 +73,7 @@ rust_library( "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__libc__0_2_101//:libc", + "@raze__libc__0_2_104//:libc", ], "//conditions:default": [], }) + selects.with_or({ diff --git a/cargo/remote/BUILD.bumpalo-3.7.0.bazel b/cargo/remote/BUILD.bumpalo-3.7.0.bazel deleted file mode 100644 index 01f3bb1..0000000 --- a/cargo/remote/BUILD.bumpalo-3.7.0.bazel +++ /dev/null @@ -1,80 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//cargo", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "benches" with type "bench" omitted - -rust_library( - name = "bumpalo", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "3.7.0", - # buildifier: leave-alone - deps = [ - ], -) - -# Unsupported target "alloc_fill" with type "test" omitted - -# Unsupported target "alloc_try_with" with type "test" omitted - -# Unsupported target "alloc_with" with type "test" omitted - -# Unsupported target "allocator_api" with type "test" omitted - -# Unsupported target "quickchecks" with type "test" omitted - -# Unsupported target "readme_up_to_date" with type "test" omitted - -# Unsupported target "string" with type "test" omitted - -# Unsupported target "tests" with type "test" omitted - -# Unsupported target "try_alloc" with type "test" omitted - -# Unsupported target "try_alloc_try_with" with type "test" omitted - -# Unsupported target "try_alloc_with" with type "test" omitted - -# Unsupported target "vec" with type "test" omitted diff --git a/cargo/remote/BUILD.bumpalo-3.7.1.bazel b/cargo/remote/BUILD.bumpalo-3.7.1.bazel new file mode 100644 index 0000000..1034735 --- /dev/null +++ b/cargo/remote/BUILD.bumpalo-3.7.1.bazel @@ -0,0 +1,58 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated Targets + +# Unsupported target "benches" with type "bench" omitted + +rust_library( + name = "bumpalo", + srcs = glob(["**/*.rs"]), + crate_features = [ + "default", + ], + crate_root = "src/lib.rs", + crate_type = "lib", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "3.7.1", + # buildifier: leave-alone + deps = [ + ], +) + +# Unsupported target "try_alloc" with type "test" omitted diff --git a/cargo/remote/BUILD.cc-1.0.70.bazel b/cargo/remote/BUILD.cc-1.0.71.bazel index e5591d1..563788a 100644 --- a/cargo/remote/BUILD.cc-1.0.70.bazel +++ b/cargo/remote/BUILD.cc-1.0.71.bazel @@ -47,7 +47,7 @@ rust_binary( "cargo-raze", "manual", ], - version = "1.0.70", + version = "1.0.71", # buildifier: leave-alone deps = [ ":cc", @@ -70,7 +70,7 @@ rust_library( "cargo-raze", "manual", ], - version = "1.0.70", + version = "1.0.71", # buildifier: leave-alone deps = [ ], diff --git a/cargo/remote/BUILD.chrono-0.4.19.bazel b/cargo/remote/BUILD.chrono-0.4.19.bazel index 487a0e6..af94d2e 100644 --- a/cargo/remote/BUILD.chrono-0.4.19.bazel +++ b/cargo/remote/BUILD.chrono-0.4.19.bazel @@ -63,7 +63,7 @@ rust_library( version = "0.4.19", # buildifier: leave-alone deps = [ - "@raze__libc__0_2_101//:libc", + "@raze__libc__0_2_104//:libc", "@raze__num_integer__0_1_44//:num_integer", "@raze__num_traits__0_2_14//:num_traits", "@raze__serde__1_0_130//:serde", diff --git a/cargo/remote/BUILD.combine-4.6.1.bazel b/cargo/remote/BUILD.combine-4.6.1.bazel index afefc7c..a3775ef 100644 --- a/cargo/remote/BUILD.combine-4.6.1.bazel +++ b/cargo/remote/BUILD.combine-4.6.1.bazel @@ -51,7 +51,7 @@ rust_library( srcs = glob(["**/*.rs"]), aliases = { "@raze__futures_core__0_3_17//:futures_core": "futures_core_03", - "@raze__tokio__1_11_0//:tokio": "tokio_dep", + "@raze__tokio__1_12_0//:tokio": "tokio_dep", }, crate_features = [ "alloc", @@ -81,7 +81,7 @@ rust_library( "@raze__futures_core__0_3_17//:futures_core", "@raze__memchr__2_4_1//:memchr", "@raze__pin_project_lite__0_2_7//:pin_project_lite", - "@raze__tokio__1_11_0//:tokio", + "@raze__tokio__1_12_0//:tokio", "@raze__tokio_util__0_6_8//:tokio_util", ], ) diff --git a/cargo/remote/BUILD.config-0.11.0.bazel b/cargo/remote/BUILD.config-0.11.0.bazel index 8d6fe5f..363d0ce 100644 --- a/cargo/remote/BUILD.config-0.11.0.bazel +++ b/cargo/remote/BUILD.config-0.11.0.bazel @@ -64,7 +64,7 @@ rust_library( "@raze__rust_ini__0_13_0//:rust_ini", "@raze__serde__1_0_130//:serde", "@raze__serde_hjson__0_9_1//:serde_hjson", - "@raze__serde_json__1_0_67//:serde_json", + "@raze__serde_json__1_0_68//:serde_json", "@raze__toml__0_5_8//:toml", "@raze__yaml_rust__0_4_5//:yaml_rust", ], diff --git a/cargo/remote/BUILD.core-foundation-0.9.1.bazel b/cargo/remote/BUILD.core-foundation-0.9.2.bazel index ac970a7..ad8e643 100644 --- a/cargo/remote/BUILD.core-foundation-0.9.1.bazel +++ b/cargo/remote/BUILD.core-foundation-0.9.2.bazel @@ -46,11 +46,11 @@ rust_library( "cargo-raze", "manual", ], - version = "0.9.1", + version = "0.9.2", # buildifier: leave-alone deps = [ - "@raze__core_foundation_sys__0_8_2//:core_foundation_sys", - "@raze__libc__0_2_101//:libc", + "@raze__core_foundation_sys__0_8_3//:core_foundation_sys", + "@raze__libc__0_2_104//:libc", ], ) diff --git a/cargo/remote/BUILD.core-foundation-sys-0.8.2.bazel b/cargo/remote/BUILD.core-foundation-sys-0.8.3.bazel index c34cd53..1ef53f5 100644 --- a/cargo/remote/BUILD.core-foundation-sys-0.8.2.bazel +++ b/cargo/remote/BUILD.core-foundation-sys-0.8.3.bazel @@ -53,7 +53,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.8.2", + version = "0.8.3", visibility = ["//visibility:private"], deps = [ ], @@ -75,7 +75,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.8.2", + version = "0.8.3", # buildifier: leave-alone deps = [ ":core_foundation_sys_build_script", diff --git a/cargo/remote/BUILD.cpufeatures-0.2.1.bazel b/cargo/remote/BUILD.cpufeatures-0.2.1.bazel index 676666d..bf472f6 100644 --- a/cargo/remote/BUILD.cpufeatures-0.2.1.bazel +++ b/cargo/remote/BUILD.cpufeatures-0.2.1.bazel @@ -51,7 +51,7 @@ rust_library( version = "0.2.1", # buildifier: leave-alone deps = [ - "@raze__libc__0_2_101//:libc", + "@raze__libc__0_2_104//:libc", ] + selects.with_or({ # aarch64-apple-darwin ( diff --git a/cargo/remote/BUILD.ctor-0.1.21.bazel b/cargo/remote/BUILD.ctor-0.1.21.bazel new file mode 100644 index 0000000..dcec837 --- /dev/null +++ b/cargo/remote/BUILD.ctor-0.1.21.bazel @@ -0,0 +1,57 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # Apache-2.0 from expression "Apache-2.0 OR MIT" +]) + +# Generated Targets + +# Unsupported target "example" with type "example" omitted + +rust_library( + name = "ctor", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + crate_type = "proc-macro", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.1.21", + # buildifier: leave-alone + deps = [ + "@raze__quote__1_0_10//:quote", + "@raze__syn__1_0_80//:syn", + ], +) diff --git a/cargo/remote/BUILD.curve25519-dalek-3.2.0.bazel b/cargo/remote/BUILD.curve25519-dalek-3.2.0.bazel index 45ac9f3..9270305 100644 --- a/cargo/remote/BUILD.curve25519-dalek-3.2.0.bazel +++ b/cargo/remote/BUILD.curve25519-dalek-3.2.0.bazel @@ -58,6 +58,6 @@ rust_library( "@raze__digest__0_9_0//:digest", "@raze__rand_core__0_5_1//:rand_core", "@raze__subtle__2_4_1//:subtle", - "@raze__zeroize__1_4_1//:zeroize", + "@raze__zeroize__1_4_2//:zeroize", ], ) diff --git a/cargo/remote/BUILD.ed25519-dalek-1.0.1.bazel b/cargo/remote/BUILD.ed25519-dalek-1.0.1.bazel index 8b7d819..d92b0a9 100644 --- a/cargo/remote/BUILD.ed25519-dalek-1.0.1.bazel +++ b/cargo/remote/BUILD.ed25519-dalek-1.0.1.bazel @@ -63,8 +63,8 @@ rust_library( "@raze__ed25519__1_2_0//:ed25519", "@raze__rand__0_7_3//:rand", "@raze__serde__1_0_130//:serde", - "@raze__sha2__0_9_6//:sha2", - "@raze__zeroize__1_4_1//:zeroize", + "@raze__sha2__0_9_8//:sha2", + "@raze__zeroize__1_4_2//:zeroize", ], ) diff --git a/cargo/remote/BUILD.enumflags2_derive-0.7.0.bazel b/cargo/remote/BUILD.enumflags2_derive-0.7.0.bazel index 26d8952..c3dc5a0 100644 --- a/cargo/remote/BUILD.enumflags2_derive-0.7.0.bazel +++ b/cargo/remote/BUILD.enumflags2_derive-0.7.0.bazel @@ -49,8 +49,8 @@ rust_library( version = "0.7.0", # buildifier: leave-alone deps = [ - "@raze__proc_macro2__1_0_29//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_76//:syn", + "@raze__proc_macro2__1_0_30//:proc_macro2", + "@raze__quote__1_0_10//:quote", + "@raze__syn__1_0_80//:syn", ], ) diff --git a/cargo/remote/BUILD.fastrand-1.5.0.bazel b/cargo/remote/BUILD.fastrand-1.5.0.bazel index 3085f85..664ff4f 100644 --- a/cargo/remote/BUILD.fastrand-1.5.0.bazel +++ b/cargo/remote/BUILD.fastrand-1.5.0.bazel @@ -59,7 +59,7 @@ rust_library( "@rules_rust//rust/platform:wasm32-unknown-unknown", "@rules_rust//rust/platform:wasm32-wasi", ): [ - "@raze__instant__0_1_10//:instant", + "@raze__instant__0_1_12//:instant", ], "//conditions:default": [], }), diff --git a/cargo/remote/BUILD.flate2-1.0.22.bazel b/cargo/remote/BUILD.flate2-1.0.22.bazel index 27caa81..b90354e 100644 --- a/cargo/remote/BUILD.flate2-1.0.22.bazel +++ b/cargo/remote/BUILD.flate2-1.0.22.bazel @@ -101,7 +101,7 @@ rust_library( deps = [ "@raze__cfg_if__1_0_0//:cfg_if", "@raze__crc32fast__1_2_1//:crc32fast", - "@raze__libc__0_2_101//:libc", + "@raze__libc__0_2_104//:libc", "@raze__miniz_oxide__0_4_4//:miniz_oxide", ] + selects.with_or({ # cfg(all(target_arch = "wasm32", not(target_os = "emscripten"))) diff --git a/cargo/remote/BUILD.futures-macro-0.3.17.bazel b/cargo/remote/BUILD.futures-macro-0.3.17.bazel index 7666146..6859203 100644 --- a/cargo/remote/BUILD.futures-macro-0.3.17.bazel +++ b/cargo/remote/BUILD.futures-macro-0.3.17.bazel @@ -83,8 +83,8 @@ rust_library( # buildifier: leave-alone deps = [ ":futures_macro_build_script", - "@raze__proc_macro2__1_0_29//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_76//:syn", + "@raze__proc_macro2__1_0_30//:proc_macro2", + "@raze__quote__1_0_10//:quote", + "@raze__syn__1_0_80//:syn", ], ) diff --git a/cargo/remote/BUILD.futures-util-0.3.17.bazel b/cargo/remote/BUILD.futures-util-0.3.17.bazel index 0fe5551..9b0cc6d 100644 --- a/cargo/remote/BUILD.futures-util-0.3.17.bazel +++ b/cargo/remote/BUILD.futures-util-0.3.17.bazel @@ -127,6 +127,6 @@ rust_library( "@raze__pin_project_lite__0_2_7//:pin_project_lite", "@raze__pin_utils__0_1_0//:pin_utils", "@raze__proc_macro_nested__0_1_7//:proc_macro_nested", - "@raze__slab__0_4_4//:slab", + "@raze__slab__0_4_5//:slab", ], ) diff --git a/cargo/remote/BUILD.getrandom-0.1.16.bazel b/cargo/remote/BUILD.getrandom-0.1.16.bazel index e4bf679..912e85c 100644 --- a/cargo/remote/BUILD.getrandom-0.1.16.bazel +++ b/cargo/remote/BUILD.getrandom-0.1.16.bazel @@ -150,7 +150,7 @@ rust_library( "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__libc__0_2_101//:libc", + "@raze__libc__0_2_104//:libc", ], "//conditions:default": [], }) + selects.with_or({ diff --git a/cargo/remote/BUILD.getrandom-0.2.3.bazel b/cargo/remote/BUILD.getrandom-0.2.3.bazel index ac6f855..55865df 100644 --- a/cargo/remote/BUILD.getrandom-0.2.3.bazel +++ b/cargo/remote/BUILD.getrandom-0.2.3.bazel @@ -90,7 +90,7 @@ rust_library( "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__libc__0_2_101//:libc", + "@raze__libc__0_2_104//:libc", ], "//conditions:default": [], }), diff --git a/cargo/remote/BUILD.h2-0.3.4.bazel b/cargo/remote/BUILD.h2-0.3.6.bazel index 63a1c6a..56943ea 100644 --- a/cargo/remote/BUILD.h2-0.3.4.bazel +++ b/cargo/remote/BUILD.h2-0.3.6.bazel @@ -52,7 +52,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.3.4", + version = "0.3.6", # buildifier: leave-alone deps = [ "@raze__bytes__1_1_0//:bytes", @@ -60,11 +60,11 @@ rust_library( "@raze__futures_core__0_3_17//:futures_core", "@raze__futures_sink__0_3_17//:futures_sink", "@raze__futures_util__0_3_17//:futures_util", - "@raze__http__0_2_4//:http", + "@raze__http__0_2_5//:http", "@raze__indexmap__1_7_0//:indexmap", - "@raze__slab__0_4_4//:slab", - "@raze__tokio__1_11_0//:tokio", + "@raze__slab__0_4_5//:slab", + "@raze__tokio__1_12_0//:tokio", "@raze__tokio_util__0_6_8//:tokio_util", - "@raze__tracing__0_1_26//:tracing", + "@raze__tracing__0_1_29//:tracing", ], ) diff --git a/cargo/remote/BUILD.hermit-abi-0.1.19.bazel b/cargo/remote/BUILD.hermit-abi-0.1.19.bazel index b2b6fcf..b5cef9a 100644 --- a/cargo/remote/BUILD.hermit-abi-0.1.19.bazel +++ b/cargo/remote/BUILD.hermit-abi-0.1.19.bazel @@ -50,6 +50,6 @@ rust_library( version = "0.1.19", # buildifier: leave-alone deps = [ - "@raze__libc__0_2_101//:libc", + "@raze__libc__0_2_104//:libc", ], ) diff --git a/cargo/remote/BUILD.http-0.2.4.bazel b/cargo/remote/BUILD.http-0.2.5.bazel index 86c5210..8728e7c 100644 --- a/cargo/remote/BUILD.http-0.2.4.bazel +++ b/cargo/remote/BUILD.http-0.2.5.bazel @@ -56,7 +56,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.2.4", + version = "0.2.5", # buildifier: leave-alone deps = [ "@raze__bytes__1_1_0//:bytes", diff --git a/cargo/remote/BUILD.http-body-0.4.3.bazel b/cargo/remote/BUILD.http-body-0.4.3.bazel index 624d388..c9691d6 100644 --- a/cargo/remote/BUILD.http-body-0.4.3.bazel +++ b/cargo/remote/BUILD.http-body-0.4.3.bazel @@ -50,7 +50,7 @@ rust_library( # buildifier: leave-alone deps = [ "@raze__bytes__1_1_0//:bytes", - "@raze__http__0_2_4//:http", + "@raze__http__0_2_5//:http", "@raze__pin_project_lite__0_2_7//:pin_project_lite", ], ) diff --git a/cargo/remote/BUILD.hyper-0.14.12.bazel b/cargo/remote/BUILD.hyper-0.14.13.bazel index 9c30cc9..1ddd6e4 100644 --- a/cargo/remote/BUILD.hyper-0.14.12.bazel +++ b/cargo/remote/BUILD.hyper-0.14.13.bazel @@ -103,24 +103,24 @@ rust_library( "cargo-raze", "manual", ], - version = "0.14.12", + version = "0.14.13", # buildifier: leave-alone deps = [ "@raze__bytes__1_1_0//:bytes", "@raze__futures_channel__0_3_17//:futures_channel", "@raze__futures_core__0_3_17//:futures_core", "@raze__futures_util__0_3_17//:futures_util", - "@raze__h2__0_3_4//:h2", - "@raze__http__0_2_4//:http", + "@raze__h2__0_3_6//:h2", + "@raze__http__0_2_5//:http", "@raze__http_body__0_4_3//:http_body", "@raze__httparse__1_5_1//:httparse", "@raze__httpdate__1_0_1//:httpdate", "@raze__itoa__0_4_8//:itoa", "@raze__pin_project_lite__0_2_7//:pin_project_lite", - "@raze__socket2__0_4_1//:socket2", - "@raze__tokio__1_11_0//:tokio", + "@raze__socket2__0_4_2//:socket2", + "@raze__tokio__1_12_0//:tokio", "@raze__tower_service__0_3_1//:tower_service", - "@raze__tracing__0_1_26//:tracing", + "@raze__tracing__0_1_29//:tracing", "@raze__want__0_3_0//:want", ] + selects.with_or({ # cfg(any(target_os = "linux", target_os = "macos")) diff --git a/cargo/remote/BUILD.hyper-tls-0.5.0.bazel b/cargo/remote/BUILD.hyper-tls-0.5.0.bazel index 5cfb670..4f68593 100644 --- a/cargo/remote/BUILD.hyper-tls-0.5.0.bazel +++ b/cargo/remote/BUILD.hyper-tls-0.5.0.bazel @@ -52,9 +52,9 @@ rust_library( # buildifier: leave-alone deps = [ "@raze__bytes__1_1_0//:bytes", - "@raze__hyper__0_14_12//:hyper", + "@raze__hyper__0_14_13//:hyper", "@raze__native_tls__0_2_8//:native_tls", - "@raze__tokio__1_11_0//:tokio", + "@raze__tokio__1_12_0//:tokio", "@raze__tokio_native_tls__0_3_0//:tokio_native_tls", ], ) diff --git a/cargo/remote/BUILD.idna-0.2.3.bazel b/cargo/remote/BUILD.idna-0.2.3.bazel index f38a5ec..6a601cc 100644 --- a/cargo/remote/BUILD.idna-0.2.3.bazel +++ b/cargo/remote/BUILD.idna-0.2.3.bazel @@ -52,7 +52,7 @@ rust_library( # buildifier: leave-alone deps = [ "@raze__matches__0_1_9//:matches", - "@raze__unicode_bidi__0_3_6//:unicode_bidi", + "@raze__unicode_bidi__0_3_7//:unicode_bidi", "@raze__unicode_normalization__0_1_19//:unicode_normalization", ], ) diff --git a/cargo/remote/BUILD.instant-0.1.10.bazel b/cargo/remote/BUILD.instant-0.1.12.bazel index 11b0c15..d70eb7b 100644 --- a/cargo/remote/BUILD.instant-0.1.10.bazel +++ b/cargo/remote/BUILD.instant-0.1.12.bazel @@ -48,7 +48,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.1.10", + version = "0.1.12", # buildifier: leave-alone deps = [ "@raze__cfg_if__1_0_0//:cfg_if", diff --git a/cargo/remote/BUILD.js-sys-0.3.53.bazel b/cargo/remote/BUILD.js-sys-0.3.55.bazel index 1566973..879e325 100644 --- a/cargo/remote/BUILD.js-sys-0.3.53.bazel +++ b/cargo/remote/BUILD.js-sys-0.3.55.bazel @@ -48,10 +48,10 @@ rust_library( "cargo-raze", "manual", ], - version = "0.3.53", + version = "0.3.55", # buildifier: leave-alone deps = [ - "@raze__wasm_bindgen__0_2_76//:wasm_bindgen", + "@raze__wasm_bindgen__0_2_78//:wasm_bindgen", ] + selects.with_or({ # cfg(target_arch = "wasm32") ( diff --git a/cargo/remote/BUILD.libc-0.2.101.bazel b/cargo/remote/BUILD.libc-0.2.104.bazel index b70a856..38683ca 100644 --- a/cargo/remote/BUILD.libc-0.2.101.bazel +++ b/cargo/remote/BUILD.libc-0.2.104.bazel @@ -55,7 +55,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.2.101", + version = "0.2.104", visibility = ["//visibility:private"], deps = [ ], @@ -79,7 +79,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.2.101", + version = "0.2.104", # buildifier: leave-alone deps = [ ":libc_build_script", diff --git a/cargo/remote/BUILD.mio-0.7.13.bazel b/cargo/remote/BUILD.mio-0.7.14.bazel index 573afde..3f7073c 100644 --- a/cargo/remote/BUILD.mio-0.7.13.bazel +++ b/cargo/remote/BUILD.mio-0.7.14.bazel @@ -60,7 +60,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.7.13", + version = "0.7.14", # buildifier: leave-alone deps = [ "@raze__log__0_4_14//:log", @@ -84,7 +84,7 @@ rust_library( "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__libc__0_2_101//:libc", + "@raze__libc__0_2_104//:libc", ], "//conditions:default": [], }) + selects.with_or({ diff --git a/cargo/remote/BUILD.native-tls-0.2.8.bazel b/cargo/remote/BUILD.native-tls-0.2.8.bazel index cf4a6a5..68deb54 100644 --- a/cargo/remote/BUILD.native-tls-0.2.8.bazel +++ b/cargo/remote/BUILD.native-tls-0.2.8.bazel @@ -135,7 +135,7 @@ rust_library( "@rules_rust//rust/platform:x86_64-apple-ios", ): [ "@raze__lazy_static__1_4_0//:lazy_static", - "@raze__libc__0_2_101//:libc", + "@raze__libc__0_2_104//:libc", "@raze__security_framework__2_4_2//:security_framework", "@raze__security_framework_sys__2_4_2//:security_framework_sys", "@raze__tempfile__3_2_0//:tempfile", diff --git a/cargo/remote/BUILD.nats-0.15.2.bazel b/cargo/remote/BUILD.nats-0.15.2.bazel index 2012fac..1977ee8 100644 --- a/cargo/remote/BUILD.nats-0.15.2.bazel +++ b/cargo/remote/BUILD.nats-0.15.2.bazel @@ -79,7 +79,7 @@ rust_library( "@raze__rustls__0_19_1//:rustls", "@raze__rustls_native_certs__0_5_0//:rustls_native_certs", "@raze__serde__1_0_130//:serde", - "@raze__serde_json__1_0_67//:serde_json", + "@raze__serde_json__1_0_68//:serde_json", "@raze__webpki__0_21_4//:webpki", ] + selects.with_or({ # cfg(unix) @@ -101,7 +101,7 @@ rust_library( "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__libc__0_2_101//:libc", + "@raze__libc__0_2_104//:libc", ], "//conditions:default": [], }) + selects.with_or({ diff --git a/cargo/remote/BUILD.num-derive-0.3.3.bazel b/cargo/remote/BUILD.num-derive-0.3.3.bazel index d2afb67..cf86c8d 100644 --- a/cargo/remote/BUILD.num-derive-0.3.3.bazel +++ b/cargo/remote/BUILD.num-derive-0.3.3.bazel @@ -49,9 +49,9 @@ rust_library( version = "0.3.3", # buildifier: leave-alone deps = [ - "@raze__proc_macro2__1_0_29//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_76//:syn", + "@raze__proc_macro2__1_0_30//:proc_macro2", + "@raze__quote__1_0_10//:quote", + "@raze__syn__1_0_80//:syn", ], ) diff --git a/cargo/remote/BUILD.num_cpus-1.13.0.bazel b/cargo/remote/BUILD.num_cpus-1.13.0.bazel index 293aeb1..227a465 100644 --- a/cargo/remote/BUILD.num_cpus-1.13.0.bazel +++ b/cargo/remote/BUILD.num_cpus-1.13.0.bazel @@ -51,6 +51,6 @@ rust_library( version = "1.13.0", # buildifier: leave-alone deps = [ - "@raze__libc__0_2_101//:libc", + "@raze__libc__0_2_104//:libc", ], ) diff --git a/cargo/remote/BUILD.openssl-0.10.36.bazel b/cargo/remote/BUILD.openssl-0.10.36.bazel index e70a454..5196b2f 100644 --- a/cargo/remote/BUILD.openssl-0.10.36.bazel +++ b/cargo/remote/BUILD.openssl-0.10.36.bazel @@ -88,7 +88,7 @@ rust_library( "@raze__bitflags__1_3_2//:bitflags", "@raze__cfg_if__1_0_0//:cfg_if", "@raze__foreign_types__0_3_2//:foreign_types", - "@raze__libc__0_2_101//:libc", + "@raze__libc__0_2_104//:libc", "@raze__once_cell__1_8_0//:once_cell", "@raze__openssl_sys__0_9_67//:openssl_sys", ], diff --git a/cargo/remote/BUILD.openssl-sys-0.9.67.bazel b/cargo/remote/BUILD.openssl-sys-0.9.67.bazel index a97fdb8..e5499b4 100644 --- a/cargo/remote/BUILD.openssl-sys-0.9.67.bazel +++ b/cargo/remote/BUILD.openssl-sys-0.9.67.bazel @@ -58,8 +58,8 @@ cargo_build_script( visibility = ["//visibility:private"], deps = [ "@raze__autocfg__1_0_1//:autocfg", - "@raze__cc__1_0_70//:cc", - "@raze__pkg_config__0_3_19//:pkg_config", + "@raze__cc__1_0_71//:cc", + "@raze__pkg_config__0_3_20//:pkg_config", ] + selects.with_or({ # cfg(target_env = "msvc") ( @@ -94,7 +94,7 @@ rust_library( # buildifier: leave-alone deps = [ ":openssl_sys_build_script", - "@raze__libc__0_2_101//:libc", + "@raze__libc__0_2_104//:libc", ] + selects.with_or({ # cfg(target_env = "msvc") ( diff --git a/cargo/remote/BUILD.parking_lot-0.11.2.bazel b/cargo/remote/BUILD.parking_lot-0.11.2.bazel index 2232081..afa1577 100644 --- a/cargo/remote/BUILD.parking_lot-0.11.2.bazel +++ b/cargo/remote/BUILD.parking_lot-0.11.2.bazel @@ -50,7 +50,7 @@ rust_library( version = "0.11.2", # buildifier: leave-alone deps = [ - "@raze__instant__0_1_10//:instant", + "@raze__instant__0_1_12//:instant", "@raze__lock_api__0_4_5//:lock_api", "@raze__parking_lot_core__0_8_5//:parking_lot_core", ], diff --git a/cargo/remote/BUILD.parking_lot_core-0.8.5.bazel b/cargo/remote/BUILD.parking_lot_core-0.8.5.bazel index 1ce9abf..1c72dd1 100644 --- a/cargo/remote/BUILD.parking_lot_core-0.8.5.bazel +++ b/cargo/remote/BUILD.parking_lot_core-0.8.5.bazel @@ -112,8 +112,8 @@ rust_library( deps = [ ":parking_lot_core_build_script", "@raze__cfg_if__1_0_0//:cfg_if", - "@raze__instant__0_1_10//:instant", - "@raze__smallvec__1_6_1//:smallvec", + "@raze__instant__0_1_12//:instant", + "@raze__smallvec__1_7_0//:smallvec", ] + selects.with_or({ # cfg(unix) ( @@ -134,7 +134,7 @@ rust_library( "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__libc__0_2_101//:libc", + "@raze__libc__0_2_104//:libc", ], "//conditions:default": [], }) + selects.with_or({ diff --git a/cargo/remote/BUILD.pin-project-internal-1.0.8.bazel b/cargo/remote/BUILD.pin-project-internal-1.0.8.bazel index 46de660..550fbc4 100644 --- a/cargo/remote/BUILD.pin-project-internal-1.0.8.bazel +++ b/cargo/remote/BUILD.pin-project-internal-1.0.8.bazel @@ -49,8 +49,8 @@ rust_library( version = "1.0.8", # buildifier: leave-alone deps = [ - "@raze__proc_macro2__1_0_29//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_76//:syn", + "@raze__proc_macro2__1_0_30//:proc_macro2", + "@raze__quote__1_0_10//:quote", + "@raze__syn__1_0_80//:syn", ], ) diff --git a/cargo/remote/BUILD.pkg-config-0.3.19.bazel b/cargo/remote/BUILD.pkg-config-0.3.20.bazel index 5c9a7b2..0126645 100644 --- a/cargo/remote/BUILD.pkg-config-0.3.19.bazel +++ b/cargo/remote/BUILD.pkg-config-0.3.20.bazel @@ -46,7 +46,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.3.19", + version = "0.3.20", # buildifier: leave-alone deps = [ ], diff --git a/cargo/remote/BUILD.ppv-lite86-0.2.10.bazel b/cargo/remote/BUILD.ppv-lite86-0.2.14.bazel index 24a3f6f..c40923b 100644 --- a/cargo/remote/BUILD.ppv-lite86-0.2.10.bazel +++ b/cargo/remote/BUILD.ppv-lite86-0.2.14.bazel @@ -48,7 +48,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.2.10", + version = "0.2.14", # buildifier: leave-alone deps = [ ], diff --git a/cargo/remote/BUILD.proc-macro2-1.0.29.bazel b/cargo/remote/BUILD.proc-macro2-1.0.30.bazel index df8e530..80da480 100644 --- a/cargo/remote/BUILD.proc-macro2-1.0.29.bazel +++ b/cargo/remote/BUILD.proc-macro2-1.0.30.bazel @@ -55,7 +55,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "1.0.29", + version = "1.0.30", visibility = ["//visibility:private"], deps = [ ], @@ -79,7 +79,7 @@ rust_library( "cargo-raze", "manual", ], - version = "1.0.29", + version = "1.0.30", # buildifier: leave-alone deps = [ ":proc_macro2_build_script", diff --git a/cargo/remote/BUILD.procfs-0.9.1.bazel b/cargo/remote/BUILD.procfs-0.9.1.bazel index 5819e10..8364764 100644 --- a/cargo/remote/BUILD.procfs-0.9.1.bazel +++ b/cargo/remote/BUILD.procfs-0.9.1.bazel @@ -76,6 +76,6 @@ rust_library( "@raze__flate2__1_0_22//:flate2", "@raze__hex__0_4_3//:hex", "@raze__lazy_static__1_4_0//:lazy_static", - "@raze__libc__0_2_101//:libc", + "@raze__libc__0_2_104//:libc", ], ) diff --git a/cargo/remote/BUILD.prometheus-0.12.0.bazel b/cargo/remote/BUILD.prometheus-0.12.0.bazel index a9b0de3..31419dc 100644 --- a/cargo/remote/BUILD.prometheus-0.12.0.bazel +++ b/cargo/remote/BUILD.prometheus-0.12.0.bazel @@ -132,11 +132,11 @@ rust_library( "@raze__cfg_if__1_0_0//:cfg_if", "@raze__fnv__1_0_7//:fnv", "@raze__lazy_static__1_4_0//:lazy_static", - "@raze__libc__0_2_101//:libc", + "@raze__libc__0_2_104//:libc", "@raze__memchr__2_4_1//:memchr", "@raze__parking_lot__0_11_2//:parking_lot", "@raze__protobuf__2_25_1//:protobuf", - "@raze__thiserror__1_0_29//:thiserror", + "@raze__thiserror__1_0_30//:thiserror", ] + selects.with_or({ # cfg(target_os = "linux") ( diff --git a/cargo/remote/BUILD.quote-1.0.9.bazel b/cargo/remote/BUILD.quote-1.0.10.bazel index 746a01b..e37b300 100644 --- a/cargo/remote/BUILD.quote-1.0.9.bazel +++ b/cargo/remote/BUILD.quote-1.0.10.bazel @@ -30,6 +30,8 @@ licenses([ # Generated Targets +# Unsupported target "bench" with type "bench" omitted + rust_library( name = "quote", srcs = glob(["**/*.rs"]), @@ -48,10 +50,10 @@ rust_library( "cargo-raze", "manual", ], - version = "1.0.9", + version = "1.0.10", # buildifier: leave-alone deps = [ - "@raze__proc_macro2__1_0_29//:proc_macro2", + "@raze__proc_macro2__1_0_30//:proc_macro2", ], ) diff --git a/cargo/remote/BUILD.rand-0.7.3.bazel b/cargo/remote/BUILD.rand-0.7.3.bazel index 398b8d8..12ac016 100644 --- a/cargo/remote/BUILD.rand-0.7.3.bazel +++ b/cargo/remote/BUILD.rand-0.7.3.bazel @@ -93,7 +93,7 @@ rust_library( "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__libc__0_2_101//:libc", + "@raze__libc__0_2_104//:libc", ], "//conditions:default": [], }), diff --git a/cargo/remote/BUILD.rand-0.8.4.bazel b/cargo/remote/BUILD.rand-0.8.4.bazel index 4d0f4d6..e3cb7e3 100644 --- a/cargo/remote/BUILD.rand-0.8.4.bazel +++ b/cargo/remote/BUILD.rand-0.8.4.bazel @@ -81,7 +81,7 @@ rust_library( "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__libc__0_2_101//:libc", + "@raze__libc__0_2_104//:libc", ], "//conditions:default": [], }), diff --git a/cargo/remote/BUILD.rand_chacha-0.2.2.bazel b/cargo/remote/BUILD.rand_chacha-0.2.2.bazel index d21fc71..00ceaf1 100644 --- a/cargo/remote/BUILD.rand_chacha-0.2.2.bazel +++ b/cargo/remote/BUILD.rand_chacha-0.2.2.bazel @@ -50,7 +50,7 @@ rust_library( version = "0.2.2", # buildifier: leave-alone deps = [ - "@raze__ppv_lite86__0_2_10//:ppv_lite86", + "@raze__ppv_lite86__0_2_14//:ppv_lite86", "@raze__rand_core__0_5_1//:rand_core", ], ) diff --git a/cargo/remote/BUILD.rand_chacha-0.3.1.bazel b/cargo/remote/BUILD.rand_chacha-0.3.1.bazel index ff704e8..4a1824f 100644 --- a/cargo/remote/BUILD.rand_chacha-0.3.1.bazel +++ b/cargo/remote/BUILD.rand_chacha-0.3.1.bazel @@ -50,7 +50,7 @@ rust_library( version = "0.3.1", # buildifier: leave-alone deps = [ - "@raze__ppv_lite86__0_2_10//:ppv_lite86", + "@raze__ppv_lite86__0_2_14//:ppv_lite86", "@raze__rand_core__0_6_3//:rand_core", ], ) diff --git a/cargo/remote/BUILD.redis-0.21.2.bazel b/cargo/remote/BUILD.redis-0.21.3.bazel index adf435c..e5e933c 100644 --- a/cargo/remote/BUILD.redis-0.21.2.bazel +++ b/cargo/remote/BUILD.redis-0.21.3.bazel @@ -88,7 +88,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.21.2", + version = "0.21.3", # buildifier: leave-alone deps = [ "@raze__arc_swap__1_4_0//:arc_swap", @@ -103,7 +103,7 @@ rust_library( "@raze__pin_project_lite__0_2_7//:pin_project_lite", "@raze__rand__0_8_4//:rand", "@raze__sha1__0_6_0//:sha1", - "@raze__tokio__1_11_0//:tokio", + "@raze__tokio__1_12_0//:tokio", "@raze__tokio_util__0_6_8//:tokio_util", "@raze__url__2_2_2//:url", ], diff --git a/cargo/remote/BUILD.ring-0.16.20.bazel b/cargo/remote/BUILD.ring-0.16.20.bazel index feef50e..345122d 100644 --- a/cargo/remote/BUILD.ring-0.16.20.bazel +++ b/cargo/remote/BUILD.ring-0.16.20.bazel @@ -61,13 +61,13 @@ cargo_build_script( version = "0.16.20", visibility = ["//visibility:private"], deps = [ - "@raze__cc__1_0_70//:cc", + "@raze__cc__1_0_71//:cc", ] + selects.with_or({ # cfg(all(target_arch = "wasm32", target_vendor = "unknown", target_os = "unknown", target_env = "")) ( "@rules_rust//rust/platform:wasm32-unknown-unknown", ): [ - "@raze__web_sys__0_3_53//:web_sys", + "@raze__web_sys__0_3_55//:web_sys", ], "//conditions:default": [], }) + selects.with_or({ @@ -190,7 +190,7 @@ rust_library( ( "@rules_rust//rust/platform:wasm32-unknown-unknown", ): [ - "@raze__web_sys__0_3_53//:web_sys", + "@raze__web_sys__0_3_55//:web_sys", ], "//conditions:default": [], }) + selects.with_or({ @@ -227,7 +227,7 @@ rust_library( "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__libc__0_2_101//:libc", + "@raze__libc__0_2_104//:libc", ], "//conditions:default": [], }) + selects.with_or({ diff --git a/cargo/remote/BUILD.security-framework-2.4.2.bazel b/cargo/remote/BUILD.security-framework-2.4.2.bazel index ca08f2b..4e086c2 100644 --- a/cargo/remote/BUILD.security-framework-2.4.2.bazel +++ b/cargo/remote/BUILD.security-framework-2.4.2.bazel @@ -58,9 +58,9 @@ rust_library( # buildifier: leave-alone deps = [ "@raze__bitflags__1_3_2//:bitflags", - "@raze__core_foundation__0_9_1//:core_foundation", - "@raze__core_foundation_sys__0_8_2//:core_foundation_sys", - "@raze__libc__0_2_101//:libc", + "@raze__core_foundation__0_9_2//:core_foundation", + "@raze__core_foundation_sys__0_8_3//:core_foundation_sys", + "@raze__libc__0_2_104//:libc", "@raze__security_framework_sys__2_4_2//:security_framework_sys", ], ) diff --git a/cargo/remote/BUILD.security-framework-sys-2.4.2.bazel b/cargo/remote/BUILD.security-framework-sys-2.4.2.bazel index 6d2a230..c2c86b5 100644 --- a/cargo/remote/BUILD.security-framework-sys-2.4.2.bazel +++ b/cargo/remote/BUILD.security-framework-sys-2.4.2.bazel @@ -51,7 +51,7 @@ rust_library( version = "2.4.2", # buildifier: leave-alone deps = [ - "@raze__core_foundation_sys__0_8_2//:core_foundation_sys", - "@raze__libc__0_2_101//:libc", + "@raze__core_foundation_sys__0_8_3//:core_foundation_sys", + "@raze__libc__0_2_104//:libc", ], ) diff --git a/cargo/remote/BUILD.serde_derive-1.0.130.bazel b/cargo/remote/BUILD.serde_derive-1.0.130.bazel index 1309021..f993d14 100644 --- a/cargo/remote/BUILD.serde_derive-1.0.130.bazel +++ b/cargo/remote/BUILD.serde_derive-1.0.130.bazel @@ -81,8 +81,8 @@ rust_library( # buildifier: leave-alone deps = [ ":serde_derive_build_script", - "@raze__proc_macro2__1_0_29//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_76//:syn", + "@raze__proc_macro2__1_0_30//:proc_macro2", + "@raze__quote__1_0_10//:quote", + "@raze__syn__1_0_80//:syn", ], ) diff --git a/cargo/remote/BUILD.serde_json-1.0.67.bazel b/cargo/remote/BUILD.serde_json-1.0.68.bazel index e0ba4f0..d4a578e 100644 --- a/cargo/remote/BUILD.serde_json-1.0.67.bazel +++ b/cargo/remote/BUILD.serde_json-1.0.68.bazel @@ -55,7 +55,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "1.0.67", + version = "1.0.68", visibility = ["//visibility:private"], deps = [ ], @@ -79,7 +79,7 @@ rust_library( "cargo-raze", "manual", ], - version = "1.0.67", + version = "1.0.68", # buildifier: leave-alone deps = [ ":serde_json_build_script", diff --git a/cargo/remote/BUILD.serde_repr-0.1.7.bazel b/cargo/remote/BUILD.serde_repr-0.1.7.bazel index b61dcb5..b55cecb 100644 --- a/cargo/remote/BUILD.serde_repr-0.1.7.bazel +++ b/cargo/remote/BUILD.serde_repr-0.1.7.bazel @@ -49,9 +49,9 @@ rust_library( version = "0.1.7", # buildifier: leave-alone deps = [ - "@raze__proc_macro2__1_0_29//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_76//:syn", + "@raze__proc_macro2__1_0_30//:proc_macro2", + "@raze__quote__1_0_10//:quote", + "@raze__syn__1_0_80//:syn", ], ) diff --git a/cargo/remote/BUILD.sha2-0.9.6.bazel b/cargo/remote/BUILD.sha2-0.9.8.bazel index dff9109..a5f1a11 100644 --- a/cargo/remote/BUILD.sha2-0.9.6.bazel +++ b/cargo/remote/BUILD.sha2-0.9.8.bazel @@ -58,7 +58,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.9.6", + version = "0.9.8", # buildifier: leave-alone deps = [ "@raze__block_buffer__0_9_0//:block_buffer", diff --git a/cargo/remote/BUILD.signal-hook-registry-1.4.0.bazel b/cargo/remote/BUILD.signal-hook-registry-1.4.0.bazel index cf5369a..87ffecb 100644 --- a/cargo/remote/BUILD.signal-hook-registry-1.4.0.bazel +++ b/cargo/remote/BUILD.signal-hook-registry-1.4.0.bazel @@ -49,7 +49,7 @@ rust_library( version = "1.4.0", # buildifier: leave-alone deps = [ - "@raze__libc__0_2_101//:libc", + "@raze__libc__0_2_104//:libc", ], ) diff --git a/cargo/remote/BUILD.signatory-0.21.0.bazel b/cargo/remote/BUILD.signatory-0.21.0.bazel index 7ce28a3..b158893 100644 --- a/cargo/remote/BUILD.signatory-0.21.0.bazel +++ b/cargo/remote/BUILD.signatory-0.21.0.bazel @@ -58,6 +58,6 @@ rust_library( "@raze__getrandom__0_1_16//:getrandom", "@raze__signature__1_3_1//:signature", "@raze__subtle_encoding__0_5_1//:subtle_encoding", - "@raze__zeroize__1_4_1//:zeroize", + "@raze__zeroize__1_4_2//:zeroize", ], ) diff --git a/cargo/remote/BUILD.slab-0.4.4.bazel b/cargo/remote/BUILD.slab-0.4.5.bazel index 6bd848e..b7ef9ca 100644 --- a/cargo/remote/BUILD.slab-0.4.4.bazel +++ b/cargo/remote/BUILD.slab-0.4.5.bazel @@ -48,7 +48,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.4.4", + version = "0.4.5", # buildifier: leave-alone deps = [ ], diff --git a/cargo/remote/BUILD.smallvec-1.6.1.bazel b/cargo/remote/BUILD.smallvec-1.7.0.bazel index 8e7e2be..5134fb6 100644 --- a/cargo/remote/BUILD.smallvec-1.6.1.bazel +++ b/cargo/remote/BUILD.smallvec-1.7.0.bazel @@ -48,7 +48,7 @@ rust_library( "cargo-raze", "manual", ], - version = "1.6.1", + version = "1.7.0", # buildifier: leave-alone deps = [ ], diff --git a/cargo/remote/BUILD.socket2-0.4.1.bazel b/cargo/remote/BUILD.socket2-0.4.2.bazel index cad64d8..dd70588 100644 --- a/cargo/remote/BUILD.socket2-0.4.1.bazel +++ b/cargo/remote/BUILD.socket2-0.4.2.bazel @@ -48,7 +48,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.4.1", + version = "0.4.2", # buildifier: leave-alone deps = [ ] + selects.with_or({ @@ -71,7 +71,7 @@ rust_library( "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__libc__0_2_101//:libc", + "@raze__libc__0_2_104//:libc", ], "//conditions:default": [], }) + selects.with_or({ diff --git a/cargo/remote/BUILD.subtle-encoding-0.5.1.bazel b/cargo/remote/BUILD.subtle-encoding-0.5.1.bazel index 4644385..c48ca49 100644 --- a/cargo/remote/BUILD.subtle-encoding-0.5.1.bazel +++ b/cargo/remote/BUILD.subtle-encoding-0.5.1.bazel @@ -54,6 +54,6 @@ rust_library( version = "0.5.1", # buildifier: leave-alone deps = [ - "@raze__zeroize__1_4_1//:zeroize", + "@raze__zeroize__1_4_2//:zeroize", ], ) diff --git a/cargo/remote/BUILD.syn-1.0.76.bazel b/cargo/remote/BUILD.syn-1.0.80.bazel index 5127852..f557d23 100644 --- a/cargo/remote/BUILD.syn-1.0.76.bazel +++ b/cargo/remote/BUILD.syn-1.0.80.bazel @@ -64,7 +64,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "1.0.76", + version = "1.0.80", visibility = ["//visibility:private"], deps = [ ], @@ -101,12 +101,12 @@ rust_library( "cargo-raze", "manual", ], - version = "1.0.76", + version = "1.0.80", # buildifier: leave-alone deps = [ ":syn_build_script", - "@raze__proc_macro2__1_0_29//:proc_macro2", - "@raze__quote__1_0_9//:quote", + "@raze__proc_macro2__1_0_30//:proc_macro2", + "@raze__quote__1_0_10//:quote", "@raze__unicode_xid__0_2_2//:unicode_xid", ], ) diff --git a/cargo/remote/BUILD.synstructure-0.12.5.bazel b/cargo/remote/BUILD.synstructure-0.12.6.bazel index 50873b0..8752c41 100644 --- a/cargo/remote/BUILD.synstructure-0.12.5.bazel +++ b/cargo/remote/BUILD.synstructure-0.12.6.bazel @@ -48,12 +48,12 @@ rust_library( "cargo-raze", "manual", ], - version = "0.12.5", + version = "0.12.6", # buildifier: leave-alone deps = [ - "@raze__proc_macro2__1_0_29//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_76//:syn", + "@raze__proc_macro2__1_0_30//:proc_macro2", + "@raze__quote__1_0_10//:quote", + "@raze__syn__1_0_80//:syn", "@raze__unicode_xid__0_2_2//:unicode_xid", ], ) diff --git a/cargo/remote/BUILD.tempfile-3.2.0.bazel b/cargo/remote/BUILD.tempfile-3.2.0.bazel index a1e8a67..96db7ea 100644 --- a/cargo/remote/BUILD.tempfile-3.2.0.bazel +++ b/cargo/remote/BUILD.tempfile-3.2.0.bazel @@ -74,7 +74,7 @@ rust_library( "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__libc__0_2_101//:libc", + "@raze__libc__0_2_104//:libc", ], "//conditions:default": [], }) + selects.with_or({ diff --git a/cargo/remote/BUILD.testcontainers-0.12.0.bazel b/cargo/remote/BUILD.testcontainers-0.12.0.bazel index e35b1e5..8142167 100644 --- a/cargo/remote/BUILD.testcontainers-0.12.0.bazel +++ b/cargo/remote/BUILD.testcontainers-0.12.0.bazel @@ -54,8 +54,8 @@ rust_library( "@raze__log__0_4_14//:log", "@raze__rand__0_8_4//:rand", "@raze__serde__1_0_130//:serde", - "@raze__serde_json__1_0_67//:serde_json", - "@raze__sha2__0_9_6//:sha2", + "@raze__serde_json__1_0_68//:serde_json", + "@raze__sha2__0_9_8//:sha2", ], ) diff --git a/cargo/remote/BUILD.thiserror-1.0.29.bazel b/cargo/remote/BUILD.thiserror-1.0.30.bazel index a9e47d3..011e9e2 100644 --- a/cargo/remote/BUILD.thiserror-1.0.29.bazel +++ b/cargo/remote/BUILD.thiserror-1.0.30.bazel @@ -40,7 +40,7 @@ rust_library( data = [], edition = "2018", proc_macro_deps = [ - "@raze__thiserror_impl__1_0_29//:thiserror_impl", + "@raze__thiserror_impl__1_0_30//:thiserror_impl", ], rustc_flags = [ "--cap-lints=allow", @@ -49,7 +49,7 @@ rust_library( "cargo-raze", "manual", ], - version = "1.0.29", + version = "1.0.30", # buildifier: leave-alone deps = [ ], diff --git a/cargo/remote/BUILD.thiserror-impl-1.0.29.bazel b/cargo/remote/BUILD.thiserror-impl-1.0.30.bazel index 6492e1f..ce9cef7 100644 --- a/cargo/remote/BUILD.thiserror-impl-1.0.29.bazel +++ b/cargo/remote/BUILD.thiserror-impl-1.0.30.bazel @@ -46,11 +46,11 @@ rust_library( "cargo-raze", "manual", ], - version = "1.0.29", + version = "1.0.30", # buildifier: leave-alone deps = [ - "@raze__proc_macro2__1_0_29//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_76//:syn", + "@raze__proc_macro2__1_0_30//:proc_macro2", + "@raze__quote__1_0_10//:quote", + "@raze__syn__1_0_80//:syn", ], ) diff --git a/cargo/remote/BUILD.time-0.1.44.bazel b/cargo/remote/BUILD.time-0.1.44.bazel index 980ab5f..3ebe6e9 100644 --- a/cargo/remote/BUILD.time-0.1.44.bazel +++ b/cargo/remote/BUILD.time-0.1.44.bazel @@ -51,7 +51,7 @@ rust_library( version = "0.1.44", # buildifier: leave-alone deps = [ - "@raze__libc__0_2_101//:libc", + "@raze__libc__0_2_104//:libc", ] + selects.with_or({ # cfg(target_os = "wasi") ( diff --git a/cargo/remote/BUILD.tinyvec-1.3.1.bazel b/cargo/remote/BUILD.tinyvec-1.5.0.bazel index a5f5f38..f97ab23 100644 --- a/cargo/remote/BUILD.tinyvec-1.3.1.bazel +++ b/cargo/remote/BUILD.tinyvec-1.5.0.bazel @@ -51,7 +51,7 @@ rust_library( "cargo-raze", "manual", ], - version = "1.3.1", + version = "1.5.0", # buildifier: leave-alone deps = [ "@raze__tinyvec_macros__0_1_0//:tinyvec_macros", diff --git a/cargo/remote/BUILD.tokio-1.11.0.bazel b/cargo/remote/BUILD.tokio-1.12.0.bazel index a4d8b6a..d204ce7 100644 --- a/cargo/remote/BUILD.tokio-1.11.0.bazel +++ b/cargo/remote/BUILD.tokio-1.12.0.bazel @@ -76,11 +76,19 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "1.11.0", + version = "1.12.0", visibility = ["//visibility:private"], deps = [ "@raze__autocfg__1_0_1//:autocfg", ] + selects.with_or({ + # cfg(target_os = "freebsd") + ( + "@rules_rust//rust/platform:i686-unknown-freebsd", + "@rules_rust//rust/platform:x86_64-unknown-freebsd", + ): [ + ], + "//conditions:default": [], + }) + selects.with_or({ # cfg(unix) ( "@rules_rust//rust/platform:aarch64-apple-darwin", @@ -148,7 +156,7 @@ rust_library( data = [], edition = "2018", proc_macro_deps = [ - "@raze__tokio_macros__1_3_0//:tokio_macros", + "@raze__tokio_macros__1_5_0//:tokio_macros", ], rustc_flags = [ "--cap-lints=allow", @@ -157,18 +165,26 @@ rust_library( "cargo-raze", "manual", ], - version = "1.11.0", + version = "1.12.0", # buildifier: leave-alone deps = [ ":tokio_build_script", "@raze__bytes__1_1_0//:bytes", "@raze__memchr__2_4_1//:memchr", - "@raze__mio__0_7_13//:mio", + "@raze__mio__0_7_14//:mio", "@raze__num_cpus__1_13_0//:num_cpus", "@raze__once_cell__1_8_0//:once_cell", "@raze__parking_lot__0_11_2//:parking_lot", "@raze__pin_project_lite__0_2_7//:pin_project_lite", ] + selects.with_or({ + # cfg(target_os = "freebsd") + ( + "@rules_rust//rust/platform:i686-unknown-freebsd", + "@rules_rust//rust/platform:x86_64-unknown-freebsd", + ): [ + ], + "//conditions:default": [], + }) + selects.with_or({ # cfg(unix) ( "@rules_rust//rust/platform:aarch64-apple-darwin", @@ -188,7 +204,7 @@ rust_library( "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__libc__0_2_101//:libc", + "@raze__libc__0_2_104//:libc", "@raze__signal_hook_registry__1_4_0//:signal_hook_registry", ], "//conditions:default": [], @@ -244,6 +260,8 @@ rust_library( # Unsupported target "io_mem_stream" with type "test" omitted +# Unsupported target "io_poll_aio" with type "test" omitted + # Unsupported target "io_read" with type "test" omitted # Unsupported target "io_read_buf" with type "test" omitted diff --git a/cargo/remote/BUILD.tokio-macros-1.3.0.bazel b/cargo/remote/BUILD.tokio-macros-1.5.0.bazel index 6ed6ee2..404576a 100644 --- a/cargo/remote/BUILD.tokio-macros-1.3.0.bazel +++ b/cargo/remote/BUILD.tokio-macros-1.5.0.bazel @@ -46,11 +46,11 @@ rust_library( "cargo-raze", "manual", ], - version = "1.3.0", + version = "1.5.0", # buildifier: leave-alone deps = [ - "@raze__proc_macro2__1_0_29//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_76//:syn", + "@raze__proc_macro2__1_0_30//:proc_macro2", + "@raze__quote__1_0_10//:quote", + "@raze__syn__1_0_80//:syn", ], ) diff --git a/cargo/remote/BUILD.tokio-native-tls-0.3.0.bazel b/cargo/remote/BUILD.tokio-native-tls-0.3.0.bazel index 9f83be1..cf4b8cc 100644 --- a/cargo/remote/BUILD.tokio-native-tls-0.3.0.bazel +++ b/cargo/remote/BUILD.tokio-native-tls-0.3.0.bazel @@ -56,7 +56,7 @@ rust_library( # buildifier: leave-alone deps = [ "@raze__native_tls__0_2_8//:native_tls", - "@raze__tokio__1_11_0//:tokio", + "@raze__tokio__1_12_0//:tokio", ] + selects.with_or({ # cfg(all(not(target_os = "macos"), not(windows), not(target_os = "ios"))) ( diff --git a/cargo/remote/BUILD.tokio-rustls-0.22.0.bazel b/cargo/remote/BUILD.tokio-rustls-0.22.0.bazel index 26d9a2a..d71ae11 100644 --- a/cargo/remote/BUILD.tokio-rustls-0.22.0.bazel +++ b/cargo/remote/BUILD.tokio-rustls-0.22.0.bazel @@ -50,7 +50,7 @@ rust_library( # buildifier: leave-alone deps = [ "@raze__rustls__0_19_1//:rustls", - "@raze__tokio__1_11_0//:tokio", + "@raze__tokio__1_12_0//:tokio", "@raze__webpki__0_21_4//:webpki", ], ) diff --git a/cargo/remote/BUILD.tokio-tungstenite-0.15.0.bazel b/cargo/remote/BUILD.tokio-tungstenite-0.15.0.bazel index 547bc86..d292afc 100644 --- a/cargo/remote/BUILD.tokio-tungstenite-0.15.0.bazel +++ b/cargo/remote/BUILD.tokio-tungstenite-0.15.0.bazel @@ -73,7 +73,7 @@ rust_library( "@raze__log__0_4_14//:log", "@raze__pin_project__1_0_8//:pin_project", "@raze__rustls__0_19_1//:rustls", - "@raze__tokio__1_11_0//:tokio", + "@raze__tokio__1_12_0//:tokio", "@raze__tokio_rustls__0_22_0//:tokio_rustls", "@raze__tungstenite__0_14_0//:tungstenite", "@raze__webpki__0_21_4//:webpki", diff --git a/cargo/remote/BUILD.tokio-util-0.6.8.bazel b/cargo/remote/BUILD.tokio-util-0.6.8.bazel index 7f8ee44..c8b86d3 100644 --- a/cargo/remote/BUILD.tokio-util-0.6.8.bazel +++ b/cargo/remote/BUILD.tokio-util-0.6.8.bazel @@ -57,7 +57,7 @@ rust_library( "@raze__futures_sink__0_3_17//:futures_sink", "@raze__log__0_4_14//:log", "@raze__pin_project_lite__0_2_7//:pin_project_lite", - "@raze__tokio__1_11_0//:tokio", + "@raze__tokio__1_12_0//:tokio", ], ) diff --git a/cargo/remote/BUILD.tracing-0.1.26.bazel b/cargo/remote/BUILD.tracing-0.1.29.bazel index b9b15f3..e0ccc93 100644 --- a/cargo/remote/BUILD.tracing-0.1.26.bazel +++ b/cargo/remote/BUILD.tracing-0.1.29.bazel @@ -53,12 +53,12 @@ rust_library( "cargo-raze", "manual", ], - version = "0.1.26", + version = "0.1.29", # buildifier: leave-alone deps = [ "@raze__cfg_if__1_0_0//:cfg_if", "@raze__pin_project_lite__0_2_7//:pin_project_lite", - "@raze__tracing_core__0_1_19//:tracing_core", + "@raze__tracing_core__0_1_21//:tracing_core", ] + selects.with_or({ # cfg(target_arch = "wasm32") ( diff --git a/cargo/remote/BUILD.tracing-core-0.1.19.bazel b/cargo/remote/BUILD.tracing-core-0.1.21.bazel index 1dfffcd..f0afc48 100644 --- a/cargo/remote/BUILD.tracing-core-0.1.19.bazel +++ b/cargo/remote/BUILD.tracing-core-0.1.21.bazel @@ -48,7 +48,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.1.19", + version = "0.1.21", # buildifier: leave-alone deps = [ "@raze__lazy_static__1_4_0//:lazy_static", diff --git a/cargo/remote/BUILD.tungstenite-0.14.0.bazel b/cargo/remote/BUILD.tungstenite-0.14.0.bazel index d20fc37..55a7335 100644 --- a/cargo/remote/BUILD.tungstenite-0.14.0.bazel +++ b/cargo/remote/BUILD.tungstenite-0.14.0.bazel @@ -70,14 +70,14 @@ rust_library( "@raze__base64__0_13_0//:base64", "@raze__byteorder__1_4_3//:byteorder", "@raze__bytes__1_1_0//:bytes", - "@raze__http__0_2_4//:http", + "@raze__http__0_2_5//:http", "@raze__httparse__1_5_1//:httparse", "@raze__log__0_4_14//:log", "@raze__rand__0_8_4//:rand", "@raze__rustls__0_19_1//:rustls", "@raze__rustls_native_certs__0_5_0//:rustls_native_certs", "@raze__sha_1__0_9_8//:sha_1", - "@raze__thiserror__1_0_29//:thiserror", + "@raze__thiserror__1_0_30//:thiserror", "@raze__url__2_2_2//:url", "@raze__utf_8__0_7_6//:utf_8", "@raze__webpki__0_21_4//:webpki", diff --git a/cargo/remote/BUILD.unicode-bidi-0.3.6.bazel b/cargo/remote/BUILD.unicode-bidi-0.3.7.bazel index c6ca023..5be00b3 100644 --- a/cargo/remote/BUILD.unicode-bidi-0.3.6.bazel +++ b/cargo/remote/BUILD.unicode-bidi-0.3.7.bazel @@ -48,7 +48,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.3.6", + version = "0.3.7", # buildifier: leave-alone deps = [ ], diff --git a/cargo/remote/BUILD.unicode-normalization-0.1.19.bazel b/cargo/remote/BUILD.unicode-normalization-0.1.19.bazel index f73cea8..6df003b 100644 --- a/cargo/remote/BUILD.unicode-normalization-0.1.19.bazel +++ b/cargo/remote/BUILD.unicode-normalization-0.1.19.bazel @@ -53,6 +53,6 @@ rust_library( version = "0.1.19", # buildifier: leave-alone deps = [ - "@raze__tinyvec__1_3_1//:tinyvec", + "@raze__tinyvec__1_5_0//:tinyvec", ], ) diff --git a/cargo/remote/BUILD.wasm-bindgen-0.2.76.bazel b/cargo/remote/BUILD.wasm-bindgen-0.2.78.bazel index b43bdae..ca869fe 100644 --- a/cargo/remote/BUILD.wasm-bindgen-0.2.76.bazel +++ b/cargo/remote/BUILD.wasm-bindgen-0.2.78.bazel @@ -56,7 +56,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.2.76", + version = "0.2.78", visibility = ["//visibility:private"], deps = [ ] + selects.with_or({ @@ -85,7 +85,7 @@ rust_library( data = [], edition = "2018", proc_macro_deps = [ - "@raze__wasm_bindgen_macro__0_2_76//:wasm_bindgen_macro", + "@raze__wasm_bindgen_macro__0_2_78//:wasm_bindgen_macro", ], rustc_flags = [ "--cap-lints=allow", @@ -94,7 +94,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.2.76", + version = "0.2.78", # buildifier: leave-alone deps = [ ":wasm_bindgen_build_script", diff --git a/cargo/remote/BUILD.wasm-bindgen-backend-0.2.76.bazel b/cargo/remote/BUILD.wasm-bindgen-backend-0.2.78.bazel index 94baffb..c5bde8c 100644 --- a/cargo/remote/BUILD.wasm-bindgen-backend-0.2.76.bazel +++ b/cargo/remote/BUILD.wasm-bindgen-backend-0.2.78.bazel @@ -47,15 +47,15 @@ rust_library( "cargo-raze", "manual", ], - version = "0.2.76", + version = "0.2.78", # buildifier: leave-alone deps = [ - "@raze__bumpalo__3_7_0//:bumpalo", + "@raze__bumpalo__3_7_1//:bumpalo", "@raze__lazy_static__1_4_0//:lazy_static", "@raze__log__0_4_14//:log", - "@raze__proc_macro2__1_0_29//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_76//:syn", - "@raze__wasm_bindgen_shared__0_2_76//:wasm_bindgen_shared", + "@raze__proc_macro2__1_0_30//:proc_macro2", + "@raze__quote__1_0_10//:quote", + "@raze__syn__1_0_80//:syn", + "@raze__wasm_bindgen_shared__0_2_78//:wasm_bindgen_shared", ], ) diff --git a/cargo/remote/BUILD.wasm-bindgen-macro-0.2.76.bazel b/cargo/remote/BUILD.wasm-bindgen-macro-0.2.78.bazel index 81c6bf3..632a2de 100644 --- a/cargo/remote/BUILD.wasm-bindgen-macro-0.2.76.bazel +++ b/cargo/remote/BUILD.wasm-bindgen-macro-0.2.78.bazel @@ -47,11 +47,11 @@ rust_library( "cargo-raze", "manual", ], - version = "0.2.76", + version = "0.2.78", # buildifier: leave-alone deps = [ - "@raze__quote__1_0_9//:quote", - "@raze__wasm_bindgen_macro_support__0_2_76//:wasm_bindgen_macro_support", + "@raze__quote__1_0_10//:quote", + "@raze__wasm_bindgen_macro_support__0_2_78//:wasm_bindgen_macro_support", ], ) diff --git a/cargo/remote/BUILD.wasm-bindgen-macro-support-0.2.76.bazel b/cargo/remote/BUILD.wasm-bindgen-macro-support-0.2.78.bazel index 9c6d63a..5982886 100644 --- a/cargo/remote/BUILD.wasm-bindgen-macro-support-0.2.76.bazel +++ b/cargo/remote/BUILD.wasm-bindgen-macro-support-0.2.78.bazel @@ -47,13 +47,13 @@ rust_library( "cargo-raze", "manual", ], - version = "0.2.76", + version = "0.2.78", # buildifier: leave-alone deps = [ - "@raze__proc_macro2__1_0_29//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_76//:syn", - "@raze__wasm_bindgen_backend__0_2_76//:wasm_bindgen_backend", - "@raze__wasm_bindgen_shared__0_2_76//:wasm_bindgen_shared", + "@raze__proc_macro2__1_0_30//:proc_macro2", + "@raze__quote__1_0_10//:quote", + "@raze__syn__1_0_80//:syn", + "@raze__wasm_bindgen_backend__0_2_78//:wasm_bindgen_backend", + "@raze__wasm_bindgen_shared__0_2_78//:wasm_bindgen_shared", ], ) diff --git a/cargo/remote/BUILD.wasm-bindgen-shared-0.2.76.bazel b/cargo/remote/BUILD.wasm-bindgen-shared-0.2.78.bazel index 1412a8f..bb51304 100644 --- a/cargo/remote/BUILD.wasm-bindgen-shared-0.2.76.bazel +++ b/cargo/remote/BUILD.wasm-bindgen-shared-0.2.78.bazel @@ -54,7 +54,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.2.76", + version = "0.2.78", visibility = ["//visibility:private"], deps = [ ], @@ -76,7 +76,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.2.76", + version = "0.2.78", # buildifier: leave-alone deps = [ ":wasm_bindgen_shared_build_script", diff --git a/cargo/remote/BUILD.web-sys-0.3.53.bazel b/cargo/remote/BUILD.web-sys-0.3.55.bazel index a2007c2..59742f3 100644 --- a/cargo/remote/BUILD.web-sys-0.3.53.bazel +++ b/cargo/remote/BUILD.web-sys-0.3.55.bazel @@ -51,11 +51,11 @@ rust_library( "cargo-raze", "manual", ], - version = "0.3.53", + version = "0.3.55", # buildifier: leave-alone deps = [ - "@raze__js_sys__0_3_53//:js_sys", - "@raze__wasm_bindgen__0_2_76//:wasm_bindgen", + "@raze__js_sys__0_3_55//:js_sys", + "@raze__wasm_bindgen__0_2_78//:wasm_bindgen", ] + selects.with_or({ # cfg(target_arch = "wasm32") ( diff --git a/cargo/remote/BUILD.zeroize-1.4.1.bazel b/cargo/remote/BUILD.zeroize-1.4.2.bazel index e047e9e..af3ec3d 100644 --- a/cargo/remote/BUILD.zeroize-1.4.1.bazel +++ b/cargo/remote/BUILD.zeroize-1.4.2.bazel @@ -42,7 +42,7 @@ rust_library( data = [], edition = "2018", proc_macro_deps = [ - "@raze__zeroize_derive__1_1_0//:zeroize_derive", + "@raze__zeroize_derive__1_2_0//:zeroize_derive", ], rustc_flags = [ "--cap-lints=allow", @@ -51,7 +51,7 @@ rust_library( "cargo-raze", "manual", ], - version = "1.4.1", + version = "1.4.2", # buildifier: leave-alone deps = [ ], diff --git a/cargo/remote/BUILD.zeroize_derive-1.1.0.bazel b/cargo/remote/BUILD.zeroize_derive-1.2.0.bazel index 1612822..13f4b6d 100644 --- a/cargo/remote/BUILD.zeroize_derive-1.1.0.bazel +++ b/cargo/remote/BUILD.zeroize_derive-1.2.0.bazel @@ -46,12 +46,12 @@ rust_library( "cargo-raze", "manual", ], - version = "1.1.0", + version = "1.2.0", # buildifier: leave-alone deps = [ - "@raze__proc_macro2__1_0_29//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_76//:syn", - "@raze__synstructure__0_12_5//:synstructure", + "@raze__proc_macro2__1_0_30//:proc_macro2", + "@raze__quote__1_0_10//:quote", + "@raze__syn__1_0_80//:syn", + "@raze__synstructure__0_12_6//:synstructure", ], ) diff --git a/common/rust/BUILD.bazel b/common/rust/BUILD.bazel index 0fbd9b2..a1bbb4e 100644 --- a/common/rust/BUILD.bazel +++ b/common/rust/BUILD.bazel @@ -1,9 +1,10 @@ load("@rules_rust//rust:defs.bzl", "rust_library") -load("//cargo:crates.bzl", "all_crate_deps") +load("//cargo:crates.bzl", "all_crate_deps", "crate_deps") rust_library( name = "common", srcs = glob(["src/**"]), + proc_macro_deps = crate_deps(["serde_repr"]), visibility = ["//visibility:public"], deps = all_crate_deps(), ) diff --git a/common/rust/Cargo.toml b/common/rust/Cargo.toml index d54eea9..234f1b1 100644 --- a/common/rust/Cargo.toml +++ b/common/rust/Cargo.toml @@ -7,9 +7,11 @@ edition = "2018" pretty_env_logger = "0.4" log = { version = "0.4", features = ["std"] } serde = { version = "1.0.8", features = ["derive"] } +serde_repr = "0.1" config = "0.11" hyper = { version = "0.14", features = ["full"] } tokio = { version = "1", features = ["full"] } +enumflags2 = { version = "0.7.1", features = ["serde"] } prometheus = { version = "0.12.0", features = ["process"] } nats = "0.15.2" testcontainers = "0.12.0" diff --git a/common/rust/cargo/BUILD.bazel b/common/rust/cargo/BUILD.bazel index e0e6aa6..f3778e2 100644 --- a/common/rust/cargo/BUILD.bazel +++ b/common/rust/cargo/BUILD.bazel @@ -22,8 +22,17 @@ alias( ) alias( + name = "enumflags2", + actual = "@raze__enumflags2__0_7_1//:enumflags2", + tags = [ + "cargo-raze", + "manual", + ], +) + +alias( name = "hyper", - actual = "@raze__hyper__0_14_12//:hyper", + actual = "@raze__hyper__0_14_13//:hyper", tags = [ "cargo-raze", "manual", @@ -68,7 +77,7 @@ alias( alias( name = "redis", - actual = "@raze__redis__0_21_2//:redis", + actual = "@raze__redis__0_21_3//:redis", tags = [ "cargo-raze", "manual", @@ -85,6 +94,15 @@ alias( ) alias( + name = "serde_repr", + actual = "@raze__serde_repr__0_1_7//:serde_repr", + tags = [ + "cargo-raze", + "manual", + ], +) + +alias( name = "testcontainers", actual = "@raze__testcontainers__0_12_0//:testcontainers", tags = [ @@ -95,7 +113,7 @@ alias( alias( name = "tokio", - actual = "@raze__tokio__1_11_0//:tokio", + actual = "@raze__tokio__1_12_0//:tokio", tags = [ "cargo-raze", "manual", diff --git a/common/rust/src/config.rs b/common/rust/src/config.rs index e4dbade..327f6f8 100644 --- a/common/rust/src/config.rs +++ b/common/rust/src/config.rs @@ -22,6 +22,7 @@ impl<T> Settings<T> where T: Deserialize<'static> + std::default::Default + Clone, { + /// Initializes a new configuration like the other components of nova /// And starts the prometheus metrics server if needed. pub fn new(service_name: &str) -> Result<Settings<T>, ConfigError> { @@ -42,7 +43,9 @@ where let mut config: Settings<T> = default.clone().try_into().unwrap(); // try to load the config - config.config = default.get::<T>(&service_name).unwrap(); + config.config = default.get::<T>(service_name).unwrap(); + // todo(MatthieuCodder): the following line was not present in the conflict + // pretty_env_logger::init(); // start the monitoring system if needed crate::monitoring::start_monitoring(&config.monitoring); diff --git a/common/rust/src/discord_models/application.rs b/common/rust/src/discord_models/application.rs new file mode 100644 index 0000000..65707d2 --- /dev/null +++ b/common/rust/src/discord_models/application.rs @@ -0,0 +1,38 @@ +use enumflags2::{bitflags, BitFlags}; +use serde::{Deserialize, Serialize}; + +use super::{teams::Team, user::User}; + +#[bitflags] +#[repr(u64)] +#[derive(Debug, Clone, Copy)] +pub enum ApplicationFlags { + GatewayPresence = 1 << 12, + GatewayPresenceLimit = 1 << 13, + GatewayGuildMembers = 1 << 14, + GatewayGuildMembersLimited = 1 << 15, + VerificationPendingGuildLimit = 1 << 16, + Embedded = 1 << 17, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct Application { + pub id: String, + pub name: String, + pub icon: Option<String>, + pub description: String, + pub rpc_origins: Option<Vec<String>>, + pub bot_public: bool, + pub bot_require_code_grant: bool, + pub terms_of_service_url: Option<String>, + pub privacy_policy_url: Option<String>, + pub owner: Option<User>, + pub summary: String, + pub verify_key: String, + pub team: Option<Team>, + pub guild_id: Option<String>, + pub primary_sku_id: Option<String>, + pub slug: Option<String>, + pub cover_image: Option<String>, + pub flags: Option<BitFlags<ApplicationFlags>>, +} diff --git a/common/rust/src/discord_models/audit_log.rs b/common/rust/src/discord_models/audit_log.rs new file mode 100644 index 0000000..0579a37 --- /dev/null +++ b/common/rust/src/discord_models/audit_log.rs @@ -0,0 +1,208 @@ +use serde::{Deserialize, Serialize}; +use serde_repr::{Deserialize_repr, Serialize_repr}; + +use super::{guild::Integration, user::User, webhook::Webhook}; + +#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)] +#[repr(u8)] +pub enum AuditLogEvents { + GuildUpdate = 1, + ChannelCreate = 10, + ChannelUpdate = 11, + ChannelDelete = 12, + ChannelOverwriteCreate = 13, + ChannelOverwriteUpdate = 14, + ChannelOverwriteDelete = 15, + MemberKick = 20, + MemberPrune = 21, + MemberBanAdd = 22, + MemberBanRemove = 23, + MemberUpdate = 24, + MemberRoleUpdate = 25, + MemberMove = 26, + MemberDisconnect = 27, + BotAdd = 28, + RoleCreate = 30, + RoleUpdate = 31, + RoleDelete = 32, + InviteCreate = 40, + InviteUpdate = 41, + InviteDelete = 42, + WebhookCreate = 50, + WebhookUpdate = 51, + WebhookDelete = 52, + EmojiCreate = 60, + EmojiUpdate = 61, + EmojiDelete = 62, + MessageDelete = 72, + MessageBulkDelete = 73, + MessagePin = 74, + MessageUnpin = 75, + IntegrationCreate = 80, + IntegrationUpdate = 81, + IntegrationDelete = 82, + StageInstanceCreate = 83, + StageInstanceUpdate = 84, + StageInstanceDelete = 85, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub enum OptionalAuditEntryInfoType { + #[serde(rename = "0")] + Role, + #[serde(rename = "1")] + Member, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct OptionalAuditEntryInfo { + pub delete_member_days: Option<String>, + pub members_removed: Option<String>, + pub channel_id: Option<String>, + pub message_id: Option<String>, + pub count: Option<String>, + pub id: Option<String>, + #[serde(rename = "type")] + pub type_: Option<Box<OptionalAuditEntryInfo>>, + pub role_name: Option<String>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub enum AuditLogChangeKey { + #[serde(rename = "name")] + Name, + #[serde(rename = "description")] + Description, + #[serde(rename = "icon_hash")] + IconHash, + #[serde(rename = "splash_hash")] + SplashHash, + #[serde(rename = "discovery_splash_hash")] + DiscoverySplashHash, + #[serde(rename = "banner_hash")] + BannerHash, + #[serde(rename = "owner_id")] + OwnerId, + #[serde(rename = "region")] + Region, + #[serde(rename = "preferred_locale")] + PreferredLocale, + #[serde(rename = "afk_channel_id")] + AfkChannelId, + #[serde(rename = "afk_timeout")] + AfkTimeout, + #[serde(rename = "rules_channel_id")] + RulesChannelId, + #[serde(rename = "public_updates_channel_id")] + PublicUpdatesChannelId, + #[serde(rename = "mfa_level")] + MfaLevel, + #[serde(rename = "verification_level")] + VerificationLevel, + #[serde(rename = "explicit_content_filter")] + ExplicitContentFilter, + #[serde(rename = "default_message_notifications")] + DefaultMessageNotifications, + #[serde(rename = "vanity_url_code")] + VanityUrlCode, + #[serde(rename = "$add")] + Add, + #[serde(rename = "$remove")] + Remove, + #[serde(rename = "prune_delete_days")] + PruneDeleteDays, + #[serde(rename = "widget_enabled")] + WidgetEnabled, + #[serde(rename = "widget_channel_id")] + WidgetChannelId, + #[serde(rename = "system_channel_id")] + SystemChannelId, + #[serde(rename = "position")] + Position, + #[serde(rename = "topic")] + Topic, + #[serde(rename = "bitrate")] + Bitrate, + #[serde(rename = "permission_overwrites")] + PermissionOverwrites, + #[serde(rename = "nsfw")] + Nsfw, + #[serde(rename = "application_id")] + ApplicationId, + #[serde(rename = "rate_limit_per_user")] + RateLimitPerUser, + #[serde(rename = "permissions")] + Permissions, + #[serde(rename = "color")] + Color, + #[serde(rename = "hoist")] + Hoist, + #[serde(rename = "mentionable")] + Mentionable, + #[serde(rename = "allow")] + Allow, + #[serde(rename = "deny")] + Deny, + #[serde(rename = "code")] + Code, + #[serde(rename = "channel_id")] + ChannelId, + #[serde(rename = "inviter_id")] + InviterId, + #[serde(rename = "max_uses")] + MaxUses, + #[serde(rename = "uses")] + Uses, + #[serde(rename = "max_age")] + MaxAge, + #[serde(rename = "temporary")] + Temporary, + #[serde(rename = "deaf")] + Deaf, + #[serde(rename = "mute")] + Mute, + #[serde(rename = "nick")] + Nick, + #[serde(rename = "avatar_hash")] + AvatarHash, + #[serde(rename = "id")] + Id, + #[serde(rename = "type")] + Type, + #[serde(rename = "enable_emoticons")] + EnableEmoticons, + #[serde(rename = "expire_behavior")] + ExpireBehavior, + #[serde(rename = "expire_grace_period")] + ExpireGracePeriod, + #[serde(rename = "user_limit")] + UserLimit, + #[serde(rename = "privacy_level")] + PrivacyLevel, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct AuditLogChange { + pub new_value: Option<String>, + pub old_value: Option<String>, + pub key: AuditLogChangeKey, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct AuditLogEntry { + pub target_id: Option<String>, + pub changes: Option<Vec<AuditLogChange>>, + pub user_id: Option<String>, + pub id: String, + pub action_type: AuditLogEvents, + pub options: Option<OptionalAuditEntryInfo>, + pub reason: Option<String>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct AuditLog { + pub webhooks: Vec<Webhook>, + pub users: Vec<User>, + pub audit_log_entries: Vec<AuditLogEntry>, + pub integrations: Vec<Integration>, +} diff --git a/common/rust/src/discord_models/channel.rs b/common/rust/src/discord_models/channel.rs new file mode 100644 index 0000000..ef31aa1 --- /dev/null +++ b/common/rust/src/discord_models/channel.rs @@ -0,0 +1,341 @@ +use enumflags2::{bitflags, BitFlags}; +use serde::{Deserialize, Serialize}; +use serde_repr::{Deserialize_repr, Serialize_repr}; + +use super::{ + application::Application, emoji::Emoji, guild::GuildMember, message_components::Component, + slash_commands::MessageInteraction, user::User, +}; + +#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)] +#[repr(u8)] +pub enum ChannelTypes { + GuildText = 0, + Dm = 1, + GuildVoice = 2, + GroupDm = 3, + GuildCategory = 4, + GuildNews = 5, + GuildStore = 6, + GuildNewsThread = 10, + GuildPublicThread = 11, + GuildPrivateThread = 12, + GuildStageVoice = 13, +} + +#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)] +#[repr(u8)] +pub enum VideoQualityModes { + Auto = 1, + Full = 2, +} + +#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)] +#[repr(u8)] +pub enum OverwriteTypes { + Role = 0, + Member = 1, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct Overwrite { + pub id: String, + #[serde(rename = "type")] + pub type_: OverwriteTypes, + pub allow: String, + pub deny: String, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct ThreadMetadata { + pub archived: bool, + pub auto_archive_duration: i64, + pub archive_timestamp: String, + pub locked: Option<bool>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct ThreadMember { + pub id: Option<String>, + pub user_id: Option<String>, + pub join_timestamp: String, + pub flags: i64, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct Channel { + pub id: String, + #[serde(rename = "type")] + pub type_: ChannelTypes, + pub guild_id: Option<String>, + pub position: Option<i64>, + pub permission_overwrites: Option<Vec<Overwrite>>, + pub name: Option<String>, + pub topic: Option<String>, + pub nsfw: Option<bool>, + pub last_message_id: Option<String>, + pub bitrate: Option<i64>, + pub user_limit: Option<i64>, + pub rate_limit_per_user: Option<i64>, + pub recipients: Option<Vec<User>>, + pub icon: Option<String>, + pub owner_id: Option<String>, + pub application_id: Option<String>, + pub parent_id: Option<String>, + pub last_pin_timestamp: Option<String>, + pub rtc_region: Option<String>, + pub video_quality_mode: Option<VideoQualityModes>, + pub message_count: Option<i64>, + pub member_count: Option<i64>, + pub thread_metadata: Option<ThreadMetadata>, + pub member: Option<ThreadMember>, + pub default_auto_archive_duration: Option<i64>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct Attachment { + pub id: String, + pub filename: String, + pub content_type: String, + pub size: i64, + pub url: String, + pub proxy_url: String, + pub height: Option<i64>, + pub width: Option<i64>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct ChannelMention { + pub id: String, + pub guild_id: String, + #[serde(rename = "type")] + pub type_: ChannelTypes, + pub name: String, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub enum EmbedTypes { + #[serde(rename = "rich")] + Rich, + #[serde(rename = "image")] + Image, + #[serde(rename = "video")] + Video, + #[serde(rename = "gifv")] + Gifv, + #[serde(rename = "article")] + Article, + #[serde(rename = "link")] + Link, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct EmbedThumbnail { + pub url: Option<String>, + pub proxy_url: Option<String>, + pub height: Option<i64>, + pub width: Option<i64>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct EmbedVideo { + pub url: Option<String>, + pub proxy_url: Option<String>, + pub height: Option<i64>, + pub width: Option<i64>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct EmbedImage { + pub url: Option<String>, + pub proxy_url: Option<String>, + pub height: Option<i64>, + pub width: Option<i64>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct EmbedProvider { + pub name: Option<String>, + pub url: Option<String>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct EmbedAuthor { + pub name: Option<String>, + pub url: Option<String>, + pub icon_url: Option<String>, + pub proxy_icon_url: Option<String>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct EmbedFooter { + pub text: String, + pub icon_url: Option<String>, + pub proxy_icon_url: Option<String>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct EmbedField { + pub name: String, + pub value: String, + pub inline: Option<bool>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct Embed { + pub title: Option<String>, + #[serde(rename = "type")] + pub type_: Option<EmbedTypes>, + pub description: Option<String>, + pub url: Option<String>, + pub timestamp: Option<String>, + pub color: Option<i64>, + pub footer: Option<EmbedFooter>, + pub image: Option<EmbedImage>, + pub thumbnail: Option<EmbedThumbnail>, + pub video: Option<EmbedVideo>, + pub provider: Option<EmbedProvider>, + pub author: Option<EmbedAuthor>, + pub fields: Option<Vec<EmbedField>>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct Reaction { + pub count: i64, + pub me: bool, + pub emoji: Emoji, +} + +#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)] +#[repr(u8)] +pub enum MessageTypes { + Default = 0, + RecipientAdd = 1, + RecipientRemove = 2, + Call = 3, + ChannelNameChange = 4, + ChannelIconChange = 5, + ChannelPinnedMessage = 6, + GuildMemberJoin = 7, + UserPremiumGuildSubscription = 8, + UserPremiumGuildSubscriptionTier1 = 9, + UserPremiumGuildSubscriptionTier2 = 10, + UserPremiumGuildSubscriptionTier3 = 11, + ChannelFollowAdd = 12, + GuildDiscoveryDisqualified = 14, + GuildDiscoveryRequalified = 15, + GuildDiscoveryGracePeriodInitialWarning = 16, + GuildDiscoveryGracePeriodFinalWarning = 17, + ThreadCreated = 18, + Reply = 19, + ApplicationCommand = 20, + ThreadStarterMessage = 21, + GuildInviteReminder = 22, +} + +#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)] +#[repr(u8)] +pub enum MessageActivityTypes { + Join = 1, + Spectate = 2, + Listen = 3, + JoinRequest = 5, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct MessageActivity { + #[serde(rename = "type")] + pub type_: MessageActivityTypes, + pub party_id: Option<String>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct MessageReference { + pub message_id: Option<String>, + pub channel_id: Option<String>, + pub guild_id: Option<String>, + pub fail_if_not_exists: Option<bool>, +} + +#[bitflags] +#[repr(u64)] +#[derive(Debug, Clone, Copy)] +pub enum MessageFlags { + Crossposted = 1 << 0, + IsCrosspost = 1 << 1, + SuppressEmbeds = 1 << 2, + SourceMessageDeleted = 1 << 3, + Urgent = 1 << 4, + HasThread = 1 << 5, + Ephemeral = 1 << 6, + Loading = 1 << 7, +} + +#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)] +#[repr(u8)] +pub enum MessageStickerFormatTypes { + Png = 1, + Apng = 2, + Lottie = 3, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct MessageStickerItem { + pub id: String, + pub name: String, + pub format_type: MessageStickerFormatTypes, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct MessageSticker { + pub id: String, + pub pack_id: Option<String>, + pub name: String, + pub description: String, + pub tags: String, + // deprecated + // pub asset: String, + pub format_type: MessageStickerFormatTypes, + pub available: Option<bool>, + pub guild_id: Option<String>, + pub user: Option<User>, + pub sort_value: Option<i64>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct Message { + pub id: String, + pub channel_id: String, + pub guild_id: Option<String>, + pub author: User, + pub member: Option<GuildMember>, + pub content: String, + pub timestamp: String, + pub edited_timestamp: String, + pub tts: bool, + pub mention_everyone: bool, + pub mentions: Vec<User>, // todo: It is a Vector of User objects, with an additional partial member field (GuildMember) + pub mentions_roles: Vec<String>, + pub mention_channels: Option<Vec<Channel>>, + pub attachments: Vec<Attachment>, + pub embeds: Vec<Embed>, + pub reactions: Option<Vec<Reaction>>, + /// ! Can be a String or an int ! + pub nonce: Option<String>, + pub pinned: bool, + pub webhook_id: Option<String>, + #[serde(rename = "type")] + pub type_: MessageTypes, + pub activity: Option<MessageActivity>, + pub application: Option<Application>, + pub application_id: Option<String>, + pub message_reference: Option<MessageReference>, + pub flags: Option<BitFlags<MessageFlags>>, + pub referenced_message: Option<Box<Message>>, + pub interaction: Option<MessageInteraction>, + pub thread: Option<Channel>, + pub components: Option<Component>, + pub sticker_items: Option<Vec<MessageStickerItem>>, + // deprecated + // pub stickers: Option<Vec<MessageSticker>>, +} diff --git a/common/rust/src/discord_models/emoji.rs b/common/rust/src/discord_models/emoji.rs new file mode 100644 index 0000000..eec02e7 --- /dev/null +++ b/common/rust/src/discord_models/emoji.rs @@ -0,0 +1,15 @@ +use serde::{Deserialize, Serialize}; + +use super::user::User; + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct Emoji { + pub id: Option<String>, + pub name: Option<String>, + pub roles: Vec<String>, + pub user: Option<User>, + pub require_colons: Option<bool>, + pub managed: Option<bool>, + pub animated: Option<bool>, + pub available: Option<bool>, +} diff --git a/common/rust/src/discord_models/gateway.rs b/common/rust/src/discord_models/gateway.rs new file mode 100644 index 0000000..dbdf60d --- /dev/null +++ b/common/rust/src/discord_models/gateway.rs @@ -0,0 +1,118 @@ +use enumflags2::{bitflags, BitFlags}; +use serde::{Deserialize, Serialize}; +use serde_repr::{Deserialize_repr, Serialize_repr}; + +use super::user::User; + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub enum PresenceUpdateStatus { + #[serde(rename = "online")] + Online, + #[serde(rename = "idle")] + Idle, + #[serde(rename = "dnd")] + Dnd, + #[serde(rename = "offline")] + Offline, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct ClientStatus { + pub desktop: Option<String>, + pub mobile: Option<String>, + pub web: Option<String>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct PresenceUpdate { + pub user: User, + pub guild_id: String, + pub status: PresenceUpdateStatus, + pub activities: Vec<Activity>, + pub client_status: ClientStatus, +} + +#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)] +#[repr(u8)] +pub enum ActivityTypes { + Game = 0, + Streaming = 1, + Listening = 2, + Watching = 3, + Custom = 4, + Competing = 5, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct ActivityTimestamps { + pub start: Option<i64>, + pub end: Option<i64>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct ActivityEmoji { + pub name: String, + pub id: Option<String>, + pub animated: Option<bool>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct ActivityParty { + pub id: Option<String>, + /// [current_size, max_size] + pub size: Option<Vec<i64>>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct ActivityAssets { + pub large_image: Option<String>, + pub large_text: Option<String>, + pub small_image: Option<String>, + pub small_text: Option<String>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct ActivitySecrets { + pub join: Option<String>, + pub spectate: Option<String>, + #[serde(rename = "match")] + pub match_: Option<String>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct ActivityButtons { + pub label: String, + pub url: String, +} + +#[bitflags] +#[repr(u64)] +#[derive(Debug, Clone, Copy)] +pub enum ActivityFlags { + Instance = 1 << 0, + Join = 1 << 1, + Spectate = 1 << 2, + JoinRequest = 1 << 3, + Sync = 1 << 4, + Play = 1 << 5, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct Activity { + pub name: String, + #[serde(rename = "type")] + pub type_: ActivityTypes, + pub url: Option<String>, + pub created_at: String, + pub timestamps: Option<ActivityTimestamps>, + pub application_id: Option<String>, + pub details: Option<String>, + pub state: Option<String>, + pub emoji: Option<ActivityEmoji>, + pub party: Option<ActivityParty>, + pub assets: Option<ActivityAssets>, + pub secrets: Option<ActivitySecrets>, + pub instance: Option<bool>, + pub flags: Option<BitFlags<ActivityFlags>>, + pub buttons: Option<Vec<ActivityButtons>>, +} diff --git a/common/rust/src/discord_models/guild.rs b/common/rust/src/discord_models/guild.rs new file mode 100644 index 0000000..85da5b2 --- /dev/null +++ b/common/rust/src/discord_models/guild.rs @@ -0,0 +1,255 @@ +use enumflags2::{bitflags, BitFlags}; +use serde::{Deserialize, Serialize}; +use serde_repr::{Deserialize_repr, Serialize_repr}; + +use super::{ + channel::Channel, emoji::Emoji, gateway::PresenceUpdate, permissions::Role, + stage_instance::StageInstance, user::User, voice::VoiceState, +}; + +#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)] +#[repr(u8)] +pub enum IntegrationExpireBehavior { + RemoveRole = 0, + Kick = 1, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct IntegrationAccount { + pub id: String, + pub name: String, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct IntegrationApplication { + pub id: String, + pub name: String, + pub icon: Option<String>, + pub description: String, + pub summary: Option<String>, + pub bot: Option<User>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct Integration { + pub id: String, + pub name: String, + #[serde(rename = "type")] + pub type_: String, + pub enabled: bool, + pub syncing: Option<bool>, + pub role_id: Option<String>, + pub enable_emoticons: Option<bool>, + pub expire_behavior: Option<IntegrationExpireBehavior>, + pub expire_grace_period: Option<i64>, + pub user: Option<User>, + pub account: IntegrationAccount, + pub synced_at: Option<String>, + pub subscriber_count: Option<i64>, + pub revoked: Option<bool>, + pub application: Option<IntegrationApplication>, +} + +#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)] +#[repr(u8)] +pub enum VerificationLevel { + None = 0, + Low = 1, + Medium = 2, + High = 3, + VeryHigh = 4, +} + +#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)] +#[repr(u8)] +pub enum PremiumTier { + None = 0, + Tier1 = 1, + Tier2 = 2, + Tier3 = 3, +} + +#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)] +#[repr(u8)] +pub enum ExplicitContentFilter { + Disabled = 0, + MembersWithoutRoles = 1, + AllMembers = 2, +} + +#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)] +#[repr(u8)] +pub enum MfaLevel { + None = 0, + Elevated = 1, +} + +#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)] +#[repr(u8)] +pub enum DefaultMessageNotificationLevel { + AllMessages = 0, + OnlyMentions = 1, +} + +#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)] +#[repr(u8)] +pub enum GuildNsfwLevel { + Default = 0, + Explicit = 1, + Safe = 2, + AgeRestricted = 3, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +pub enum GuildFeatures { + #[serde(rename = "ANIMATED_ICON")] + AnimatedIcon, + #[serde(rename = "BANNER")] + Banner, + #[serde(rename = "COMMERCE")] + Commerce, + #[serde(rename = "COMMUNITY")] + Community, + #[serde(rename = "DISCOVERABLE")] + Discoverable, + #[serde(rename = "FEATURABLE")] + Featurable, + #[serde(rename = "INVITE_SPLASH")] + InviteSplash, + #[serde(rename = "MEMBER_VERIFICATION_GATE_ENABLED")] + MemberVerificationGateEnabled, + #[serde(rename = "NEWS")] + News, + #[serde(rename = "PARTNERED")] + Partnered, + #[serde(rename = "PREVIEW_ENABLED")] + PreviewEnabled, + #[serde(rename = "VANITY_URL")] + VanityUrl, + #[serde(rename = "VERIFIED")] + Verified, + #[serde(rename = "VIP_REGIONS")] + VipRegions, + #[serde(rename = "WELCOME_SCREEN_ENABLED")] + WelcomeScreenEnabled, + #[serde(rename = "TICKETED_EVENTS_ENABLED")] + TicketedEventsEnabled, + #[serde(rename = "MONETIZATION_ENABLED")] + MonetizationEnabled, + #[serde(rename = "MORE_STICKERS")] + MoreStickers, + #[serde(rename = "THREE_DAY_THREAD_ARCHIVE")] + ThreeDayThreadArchive, + #[serde(rename = "SEVEN_DAY_THREAD_ARCHIVE")] + SevenDayThreadArchive, + #[serde(rename = "PRIVATE_THREADS")] + PrivateThreads, +} + +#[bitflags] +#[repr(u64)] +#[derive(Debug, Clone, Copy)] +pub enum SystemChannelFlags { + SuppressJoinNotifications = 1 << 0, + SuppressPremiumSubscriptions = 1 << 1, + SuppressGuildReminderNotifications = 1 << 2, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct WelcomeScreenChannel { + pub channel_id: String, + pub description: String, + pub emoji_id: Option<String>, + pub emoji_name: Option<String>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct WelcomeScreen { + pub description: String, + pub welcome_channels: Vec<WelcomeScreenChannel>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct Guild { + pub id: String, + pub name: String, + pub icon: Option<String>, + pub icon_hash: Option<String>, + pub splash: Option<String>, + pub discovery_splash: Option<String>, + pub owner: Option<bool>, + pub owner_id: String, + pub permissions: Option<String>, + /// DEPRECATED + pub region: Option<String>, + pub afk_channel_id: Option<String>, + pub afk_timeout: i64, + pub widget_enabled: Option<bool>, + pub widget_channel_id: Option<String>, + pub verification_level: VerificationLevel, + pub default_message_notifications: DefaultMessageNotificationLevel, + pub explicit_content_filter: ExplicitContentFilter, + pub roles: Vec<Role>, + pub emojis: Vec<Emoji>, + pub features: Vec<GuildFeatures>, + pub mfa_level: MfaLevel, + pub application_id: Option<String>, + pub system_channel_id: Option<String>, + pub system_channel_flags: BitFlags<SystemChannelFlags>, + pub rules_channel_id: Option<String>, + pub joined_at: Option<String>, + pub large: Option<bool>, + pub unavailable: Option<bool>, + pub member_count: Option<i64>, + pub voice_states: Option<Vec<VoiceState>>, + pub members: Option<Vec<GuildMember>>, + pub channels: Option<Vec<Channel>>, + pub threads: Option<Vec<Channel>>, + pub presences: Option<Vec<PresenceUpdate>>, + pub max_presences: Option<i64>, + pub vanity_url_code: Option<String>, + pub description: Option<String>, + pub banner: Option<String>, + pub premium_tier: PremiumTier, + pub premium_subscription_count: i64, + pub preferred_locale: String, + pub public_updates_channel_id: Option<String>, + pub max_video_channel_users: Option<i64>, + pub approximate_member_count: Option<i64>, + pub welcome_screen: Option<WelcomeScreen>, + pub nsfw_level: GuildNsfwLevel, + pub stage_instances: Option<Vec<StageInstance>>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct GuildMember { + pub user: Option<User>, + pub nick: Option<String>, + pub roles: Vec<String>, + pub joined_at: String, + pub premium_since: Option<String>, + pub deaf: bool, + pub mute: bool, + pub pending: Option<bool>, + pub permissions: Option<String>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct GuildPreview { + pub id: String, + pub name: String, + pub icon: Option<String>, + pub splash: Option<String>, + pub discovery_splash: Option<String>, + pub emojis: Vec<Emoji>, + pub features: Vec<GuildFeatures>, + pub approximate_member_count: i64, + pub approximate_presence_count: i64, + pub description: Option<String>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct GuildWidget { + pub enabled: bool, + pub channel_id: Option<String>, +} diff --git a/common/rust/src/discord_models/guild_template.rs b/common/rust/src/discord_models/guild_template.rs new file mode 100644 index 0000000..960631d --- /dev/null +++ b/common/rust/src/discord_models/guild_template.rs @@ -0,0 +1,18 @@ +use serde::{Deserialize, Serialize}; + +use super::{guild::Guild, user::User}; + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct GuildTemplate { + pub code: String, + pub name: String, + pub description: Option<String>, + pub usage_count: i64, + pub creator_id: String, + pub creator: User, + pub created_at: String, + pub updated_at: String, + pub source_guild_ild: String, + pub serialized_source_guild: Guild, + pub is_dirty: Option<bool>, +} diff --git a/common/rust/src/discord_models/invite.rs b/common/rust/src/discord_models/invite.rs new file mode 100644 index 0000000..639278c --- /dev/null +++ b/common/rust/src/discord_models/invite.rs @@ -0,0 +1,48 @@ +use serde::{Deserialize, Serialize}; +use serde_repr::{Deserialize_repr, Serialize_repr}; + +use super::{ + application::Application, + channel::Channel, + guild::{Guild, GuildMember}, + user::User, +}; + +#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)] +#[repr(u8)] +pub enum InviteTargetTypes { + Stream = 1, + EmbeddedApplication = 2, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct InviteStageInstance { + pub members: Vec<GuildMember>, + pub participant_count: i64, + pub speaker_count: i64, + pub topic: String, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct Invite { + pub code: String, + pub guild: Option<Guild>, + pub channel: Channel, + pub inviter: Option<User>, + pub target_type: Option<InviteTargetTypes>, + pub target_user: Option<User>, + pub target_application: Option<Application>, + pub approximate_presence_count: Option<i64>, + pub approximate_member_count: Option<i64>, + pub expires_at: Option<String>, + pub stage_instance: Option<InviteStageInstance>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct InviteMetadata { + pub uses: i64, + pub max_uses: i64, + pub max_age: i64, + pub temporary: bool, + pub created_at: String, +} diff --git a/common/rust/src/discord_models/message_components.rs b/common/rust/src/discord_models/message_components.rs new file mode 100644 index 0000000..f71d7ed --- /dev/null +++ b/common/rust/src/discord_models/message_components.rs @@ -0,0 +1,75 @@ +use serde::{Deserialize, Serialize}; +use serde_repr::{Deserialize_repr, Serialize_repr}; + +use super::emoji::Emoji; + +#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)] +#[repr(u8)] +pub enum ComponentTypes { + ActionRow = 1, + Button = 2, + SelectMenu = 3, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +/// Global representation of a Component, more detailed are Button (if button) and Select Menu (if select menu) +/// Action Rows are just type: 1, content + components +pub struct Component { + #[serde(rename = "type")] + pub type_: ComponentTypes, + pub custom_id: Option<String>, + pub disabled: Option<bool>, + pub style: Option<ButtonStyles>, + pub label: Option<String>, + pub emoji: Option<Emoji>, + pub url: Option<String>, + pub options: Vec<SelectOption>, + pub placeholder: Option<String>, + pub min_values: Option<u8>, + pub max_values: Option<u8>, + pub components: Option<Vec<Component>>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct Button { + #[serde(rename = "type")] + /// it should be `2` + pub type_: ComponentTypes, + pub style: ButtonStyles, + pub label: Option<String>, + pub emoji: Option<Emoji>, + pub custom_id: Option<String>, + pub url: Option<String>, + pub disabled: Option<bool>, +} + +#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)] +#[repr(u8)] +pub enum ButtonStyles { + Primary = 1, + Secondary = 2, + Success = 3, + Danger = 4, + Link = 5, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct SelectOption { + pub label: String, + pub value: String, + pub description: Option<String>, + pub emoji: Option<Emoji>, + pub default: Option<bool>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct SelectMenu { + /// it should be 3 + pub type_: ComponentTypes, + pub custom_id: String, + pub options: Vec<SelectOption>, + pub placeholder: Option<String>, + pub min_values: Option<u8>, + pub max_values: Option<u8>, + pub disabled: Option<bool>, +} diff --git a/common/rust/src/discord_models/mod.rs b/common/rust/src/discord_models/mod.rs new file mode 100644 index 0000000..8017e2a --- /dev/null +++ b/common/rust/src/discord_models/mod.rs @@ -0,0 +1,16 @@ +pub mod application; +pub mod audit_log; +pub mod channel; +pub mod emoji; +pub mod gateway; +pub mod guild; +pub mod guild_template; +pub mod invite; +pub mod message_components; +pub mod permissions; +pub mod slash_commands; +pub mod stage_instance; +pub mod teams; +pub mod user; +pub mod voice; +pub mod webhook; diff --git a/common/rust/src/discord_models/permissions.rs b/common/rust/src/discord_models/permissions.rs new file mode 100644 index 0000000..76fa34a --- /dev/null +++ b/common/rust/src/discord_models/permissions.rs @@ -0,0 +1,21 @@ +use serde::{Deserialize, Serialize}; + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct RoleTags { + pub bot_id: Option<String>, + pub integration_id: Option<String>, + pub premium_subscriber: Option<bool>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct Role { + pub id: String, + pub name: String, + pub color: i64, + pub hoist: bool, + pub position: i64, + pub permissions: String, + pub managed: bool, + pub mentionable: bool, + pub tags: Option<RoleTags>, +} diff --git a/common/rust/src/discord_models/slash_commands.rs b/common/rust/src/discord_models/slash_commands.rs new file mode 100644 index 0000000..181a622 --- /dev/null +++ b/common/rust/src/discord_models/slash_commands.rs @@ -0,0 +1,104 @@ +use serde::{Deserialize, Serialize}; +use serde_repr::{Deserialize_repr, Serialize_repr}; + +use super::{channel::Message, guild::GuildMember, user::User}; + +#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)] +#[repr(u8)] +pub enum ApplicationCommandOptionType { + SubCommand = 1, + SubCommandGroup = 2, + String = 3, + Integer = 4, + Boolean = 5, + User = 6, + Channel = 7, + Role = 8, + Mentionable = 9, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct ApplicationCommandOptionChoice { + pub name: String, + /// todo: Can also be a String!!!! + pub value: i64, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct ApplicationCommandOption { + #[serde(rename = "type")] + pub type_: ApplicationCommandOptionType, + pub name: String, + pub description: String, + pub required: Option<bool>, + pub choices: Option<Vec<ApplicationCommandOptionChoice>>, + pub options: Option<Vec<ApplicationCommandOption>>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct ApplicationCommand { + pub id: String, + pub application_id: String, + pub guild_id: Option<String>, + pub name: String, + pub description: String, + pub options: Option<Vec<ApplicationCommandOption>>, + pub default_permission: Option<bool>, +} + +#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)] +#[repr(u8)] +pub enum ApplicationCommandPermissionType { + Role = 1, + User = 2, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct GuildApplicationCommandPermissions { + pub id: String, + pub application_id: String, + pub guild_id: String, + pub permissions: Vec<ApplicationCommandPermissions>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct ApplicationCommandPermissions { + pub id: String, + #[serde(rename = "type")] + pub type_: ApplicationCommandPermissionType, + pub permission: bool, +} + +#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)] +#[repr(u8)] +pub enum InteractionRequestType { + Ping = 1, + ApplicationCommand = 2, + MessageComponent = 3, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct MessageInteraction { + pub id: String, + #[serde(rename = "type")] + pub type_: InteractionRequestType, + pub name: String, + pub user: User, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct Interaction { + pub id: String, + pub application_id: String, + #[serde(rename = "type")] + pub type_: InteractionRequestType, + /// i am not sure about this one https://canary.discord.com/developers/docs/interactions/slash-commands#interaction-object-application-command-interaction-data + pub data: Option<ApplicationCommand>, + pub guild_id: Option<String>, + pub channel_id: Option<String>, + pub member: Option<GuildMember>, + pub user: Option<User>, + pub token: String, + pub version: i64, + pub message: Option<Message>, +} diff --git a/common/rust/src/discord_models/stage_instance.rs b/common/rust/src/discord_models/stage_instance.rs new file mode 100644 index 0000000..1eee1c2 --- /dev/null +++ b/common/rust/src/discord_models/stage_instance.rs @@ -0,0 +1,19 @@ +use serde::{Deserialize, Serialize}; +use serde_repr::{Deserialize_repr, Serialize_repr}; + +#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)] +#[repr(u8)] +pub enum PrivacyLevel { + Public = 1, + GuildOnly = 2, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct StageInstance { + pub id: String, + pub guild_id: String, + pub channel_id: String, + pub topic: String, + pub privacy_level: PrivacyLevel, + pub discoverable_disabled: bool, +} diff --git a/common/rust/src/discord_models/teams.rs b/common/rust/src/discord_models/teams.rs new file mode 100644 index 0000000..369b3cd --- /dev/null +++ b/common/rust/src/discord_models/teams.rs @@ -0,0 +1,28 @@ +use serde::{Deserialize, Serialize}; +use serde_repr::{Deserialize_repr, Serialize_repr}; + +use super::user::User; + +#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)] +#[repr(u8)] +pub enum MembershipState { + Invited = 0, + Accepted = 1, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct TeamMembers { + pub membership_state: MembershipState, + pub permissions: Vec<String>, + pub team_id: String, + pub user: User, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct Team { + pub icon: Option<String>, + pub id: String, + pub members: Vec<TeamMembers>, + pub name: String, + pub owner_user_id: String, +} diff --git a/common/rust/src/discord_models/user.rs b/common/rust/src/discord_models/user.rs new file mode 100644 index 0000000..36914ce --- /dev/null +++ b/common/rust/src/discord_models/user.rs @@ -0,0 +1,73 @@ +use enumflags2::{bitflags, BitFlags}; +use serde::{Deserialize, Serialize}; +use serde_repr::{Deserialize_repr, Serialize_repr}; + +use super::guild::Integration; + +#[bitflags] +#[repr(u64)] +#[derive(Debug, Clone, Copy)] +pub enum UserFlags { + // None = 0 << 0, + DiscordEmployee = 1 << 0, + PartneredServerOwner = 1 << 1, + HypesquadEvents = 1 << 2, + BugHunterLevel1 = 1 << 3, + HouseBravery = 1 << 6, + HouseBrilliance = 1 << 7, + HouseBalance = 1 << 8, + EarlySupporter = 1 << 9, + TeamUser = 1 << 10, + BugHunterLevel2 = 1 << 14, + VerifiedBot = 1 << 16, + EarlyVerifiedBotDeveloper = 1 << 17, + DiscordCertifiedModerator = 1 << 18, +} + +#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)] +#[repr(u8)] +pub enum PremiumTypes { + None = 0, + NitroClassic = 1, + Nitro = 2, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +/// Represents a User within Discord +pub struct User { + pub id: String, + pub username: String, + pub discriminator: String, + pub avatar: Option<String>, + pub bot: Option<bool>, + pub system: Option<bool>, + pub mfa_enabled: Option<bool>, + pub locale: Option<String>, + pub verified: Option<bool>, + pub email: Option<String>, + pub flags: Option<BitFlags<UserFlags>>, + pub premium_type: Option<PremiumTypes>, + pub public_flags: Option<BitFlags<UserFlags>>, +} + +#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)] +#[repr(u8)] +pub enum VisibilityTypes { + None = 0, + Everyone = 1, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +/// The connection object that the user has attached. +pub struct Connection { + pub id: String, + pub name: String, + #[serde(rename = "type")] + pub type_: String, + pub revoked: Option<bool>, + pub integrations: Option<Vec<Integration>>, + pub verified: bool, + pub friend_sync: bool, + pub show_activity: bool, + pub visibility: VisibilityTypes, +} diff --git a/common/rust/src/discord_models/voice.rs b/common/rust/src/discord_models/voice.rs new file mode 100644 index 0000000..8263af5 --- /dev/null +++ b/common/rust/src/discord_models/voice.rs @@ -0,0 +1,30 @@ +use serde::{Deserialize, Serialize}; + +use super::guild::GuildMember; + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct VoiceState { + pub guild_id: Option<String>, + pub channel_id: Option<String>, + pub user_id: String, + pub member: Option<GuildMember>, + pub session_id: String, + pub deaf: bool, + pub mute: bool, + pub self_deaf: bool, + pub self_mute: bool, + pub self_stream: Option<bool>, + pub self_video: bool, + pub suppress: bool, + pub request_to_speak_timestamp: Option<String>, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct VoiceRegion { + pub id: String, + pub name: String, + pub vip: bool, + pub optimal: bool, + pub deprecated: bool, + pub custom: bool, +} diff --git a/common/rust/src/discord_models/webhook.rs b/common/rust/src/discord_models/webhook.rs new file mode 100644 index 0000000..4648772 --- /dev/null +++ b/common/rust/src/discord_models/webhook.rs @@ -0,0 +1,29 @@ +use serde::{Deserialize, Serialize}; +use serde_repr::{Deserialize_repr, Serialize_repr}; + +use super::{channel::Channel, guild::Guild, user::User}; + +#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)] +#[repr(u8)] +pub enum WebhookTypes { + Incoming = 1, + ChannelFollower = 2, + Application = 3, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct Webhook { + pub id: String, + #[serde(rename = "type")] + pub type_: WebhookTypes, + pub guild_id: Option<String>, + pub channel_id: Option<String>, + pub user: Option<User>, + pub name: Option<String>, + pub avatar: Option<String>, + pub token: Option<String>, + pub application_id: Option<String>, + pub source_guild: Option<Guild>, + pub source_channel: Option<Channel>, + pub url: String, +} diff --git a/common/rust/src/lib.rs b/common/rust/src/lib.rs index f4e27fc..fa2c6fc 100644 --- a/common/rust/src/lib.rs +++ b/common/rust/src/lib.rs @@ -1,16 +1,18 @@ +pub use ::config as config_crate; +pub use ::nats as nats_crate; +pub use ::redis as redis_crate; +pub use log; +pub use prometheus; +pub use serde; +pub use testcontainers; + /// This crate is all the utilities shared by the nova rust projects -/// It includes loging, config and protocols. +/// It includes logging, config and protocols. pub mod config; +pub mod discord_models; +pub mod error; pub mod monitoring; pub mod nats; pub mod payloads; -pub mod error; pub mod redis; -pub use log as log; -pub use serde as serde; -pub use ::config as config_crate; -pub use prometheus as prometheus; -pub use ::nats as nats_crate; -pub use testcontainers as testcontainers; -pub use ::redis as redis_crate;
\ No newline at end of file diff --git a/common/rust/src/nats.rs b/common/rust/src/nats.rs index c61aa4c..a001dc9 100644 --- a/common/rust/src/nats.rs +++ b/common/rust/src/nats.rs @@ -6,6 +6,7 @@ pub struct NatsConfigurationClientCert { pub cert: String, pub key: String, } + #[derive(Clone, Debug, Deserialize)] pub struct NatsConfigurationTls { pub mtu: Option<usize>, @@ -24,6 +25,7 @@ pub struct NatsConfiguration { pub host: String, } +// todo: Prefer From since it automatically gives a free Into implementation // Allows the configuration to directly create a nats connection impl Into<Connection> for NatsConfiguration { fn into(self) -> Connection { @@ -47,7 +49,7 @@ impl Into<Connection> for NatsConfiguration { options = options.no_echo(); options = options.reconnect_buffer_size(self.reconnect_buffer_size.unwrap_or(64 * 1024)); options = options.tls_required(self.tls_required.unwrap_or(false)); - options = options.with_name(&self.client_name.unwrap_or("Nova".to_string())); + options = options.with_name(&self.client_name.unwrap_or_else(|| "Nova".to_string())); if let Some(tls) = self.tls { let mut config = nats::rustls::ClientConfig::new(); diff --git a/common/rust/src/payloads.rs b/common/rust/src/payloads.rs index c97ac1d..fd7717d 100644 --- a/common/rust/src/payloads.rs +++ b/common/rust/src/payloads.rs @@ -1,24 +1,270 @@ -use serde::{Deserialize, Serialize}; use std::fmt::Debug; -/// Data structure sent to the cache component -/// by the gateway & webhook. -#[derive(Serialize, Deserialize, Debug)] -#[serde(bound(deserialize = "T: Deserialize<'de> + Debug"))] -pub struct CachePayload<T> { - - #[serde(rename = "tr")] - pub tracing: Tracing, +use serde::{Deserialize, Serialize}; - #[serde(rename = "d")] - pub data: T, +use crate::discord_models::{ + application::Application, + channel::{Channel, Message, ThreadMember}, + emoji::Emoji, + gateway::PresenceUpdate, + guild::{Guild, GuildMember, Integration}, + invite::InviteTargetTypes, + permissions::Role, + slash_commands::{ApplicationCommand, Interaction}, + stage_instance::StageInstance, + user::User, + voice::VoiceState, +}; - #[serde(rename = "o")] - pub operation: String, +/// Payload send to the nova cache queues +#[derive(Serialize, Deserialize, Debug, Clone)] +// #[serde(bound(deserialize = "T: Deserialize<'de> + std::default::Default + Clone"))] +pub struct CachePayload { + pub tracing: Tracing, + pub data: CacheData, } -#[derive(Serialize, Deserialize, Debug)] +#[derive(Serialize, Deserialize, Debug, Clone)] pub struct Tracing { pub node_id: String, - pub span: Option<String> + pub span: Option<String>, +} + +#[derive(Serialize, Deserialize, Debug, Clone)] +pub enum CacheData { + Ready { + version: u8, + user: User, + guilds: Vec<Guild>, + session_id: String, + shard: Option<Vec<i64>>, + application: Application, + }, + ApplicationCommandCreate { + guild_id: Option<String>, + command: ApplicationCommand, + }, + ApplicationCommandUpdate { + guild_id: Option<String>, + command: ApplicationCommand, + }, + ApplicationCommandDelete { + guild_id: Option<String>, + command: ApplicationCommand, + }, + ChannelCreate { + channel: Channel, + }, + ChannelUpdate { + channel: Channel, + }, + ChannelDelete { + channel: Channel, + }, + ThreadCreate { + channel: Channel, + }, + ThreadUpdate { + channel: Channel, + }, + ThreadDelete { + channel: Channel, + }, + ThreadListSync { + guild_id: String, + channel_ids: Option<Vec<String>>, + threads: Vec<Channel>, + members: Vec<ThreadMember>, + }, + ThreadMemberUpdate { + member: ThreadMember, + }, + ThreadMembersUpdate { + id: String, + guild_id: String, + member_count: i64, + added_members: Option<Vec<ThreadMember>>, + removed_member_ids: Option<Vec<String>>, + }, + ChannelPinsUpdate { + guild_id: Option<String>, + channel_id: String, + last_pin_timestamp: Option<String>, + }, + GuildCreate { + guild: Guild, + }, + GuildUpdate { + guild: Guild, + }, + GuildDelete { + guild: Guild, + }, + GuildBanAdd { + guild_id: String, + user: User, + }, + GuildBanRemove { + guild_id: String, + user: User, + }, + GuildEmojisUpdate { + guild_id: String, + emojis: Vec<Emoji>, + }, + GuildIntegrationsUpdate { + guild_id: String, + }, + GuildMemberAdd { + guild_id: String, + member: GuildMember, + }, + GuildMemberRemove { + guild_id: String, + user: User, + }, + GuildMemberUpdate { + guild_id: String, + roles: Vec<String>, + user: User, + nick: Option<String>, + joined_at: Option<String>, + premium_since: Option<String>, + deaf: Option<bool>, + mute: Option<bool>, + pending: Option<bool>, + }, + GuildMembersChunk { + guild_id: String, + members: Vec<GuildMember>, + chunk_index: i64, + chunk_count: i64, + not_found: Option<Vec<String>>, + presences: Option<Vec<PresenceUpdate>>, + nonce: Option<String>, + }, + GuildRoleCreate { + guild_id: String, + role: Role, + }, + GuildRoleUpdate { + guild_id: String, + role: Role, + }, + GuildRoleDelete { + guild_id: String, + role_id: String, + }, + IntegrationCreate { + guild_id: String, + integration: Integration, + }, + IntegrationUpdate { + guild_id: String, + integration: Integration, + }, + IntegrationDelete { + id: String, + guild_id: String, + application_id: Option<String>, + }, + InviteCreate { + channel_id: String, + code: String, + created_at: String, + guild_id: Option<String>, + inviter: Option<User>, + max_age: i64, + max_uses: i64, + target_type: Option<InviteTargetTypes>, + target_user: Option<User>, + target_application: Option<Application>, + temporary: bool, + uses: i64, + }, + InviteDelete { + channel_id: String, + guild_id: Option<String>, + code: String, + }, + InteractionCreate { + // boxed to avoid a large difference size between variants (https://rust-lang.github.io/rust-clippy/master/index.html#large_enum_variant) + interaction: Box<Interaction>, + }, + MessageCreate { + message: Message, + }, + MessageUpdate { + message: Message, + }, + MessageDelete { + id: String, + channel_id: String, + guild_id: Option<String>, + }, + MessageDeleteBulk { + ids: Vec<String>, + channel_id: String, + guild_id: Option<String>, + }, + MessageReactionAdd { + user_id: String, + channel_id: String, + message_id: String, + guild_id: Option<String>, + member: Option<GuildMember>, + emoji: Emoji, + }, + MessageReactionRemove { + user_id: String, + channel_id: String, + message_id: String, + guild_id: Option<String>, + emoji: Emoji, + }, + MessageReactionRemoveAll { + channel_id: String, + message_id: String, + guild_id: Option<String>, + }, + MessageReactionRemoveEmoji { + channel_id: String, + message_id: String, + guild_id: Option<String>, + emoji: Emoji, + }, + PresenceUpdate { + presence: PresenceUpdate, + }, + TypingStart { + channel_id: String, + guild_id: Option<String>, + user_id: String, + timestamp: i64, + member: Option<GuildMember>, + }, + UserUpdate { + user: User, + }, + VoiceStateUpdate { + state: VoiceState, + }, + VoiceServerUpdate { + token: String, + guild_id: String, + endpoint: Option<String>, + }, + WebhookUpdate { + guild_id: String, + channel_id: String, + }, + StageInstanceCreate { + instance: StageInstance, + }, + StageInstanceUpdate { + instance: StageInstance, + }, + StageInstanceDelete { + instance: StageInstance, + }, } diff --git a/gateway/cargo/BUILD.bazel b/gateway/cargo/BUILD.bazel index 211b096..e5271e2 100644 --- a/gateway/cargo/BUILD.bazel +++ b/gateway/cargo/BUILD.bazel @@ -77,7 +77,7 @@ alias( alias( name = "serde_json", - actual = "@raze__serde_json__1_0_67//:serde_json", + actual = "@raze__serde_json__1_0_68//:serde_json", tags = [ "cargo-raze", "manual", @@ -95,7 +95,7 @@ alias( alias( name = "tokio", - actual = "@raze__tokio__1_11_0//:tokio", + actual = "@raze__tokio__1_12_0//:tokio", tags = [ "cargo-raze", "manual", diff --git a/rest/cargo/BUILD.bazel b/rest/cargo/BUILD.bazel index c56ad3d..499c2ac 100644 --- a/rest/cargo/BUILD.bazel +++ b/rest/cargo/BUILD.bazel @@ -23,7 +23,7 @@ alias( alias( name = "hyper", - actual = "@raze__hyper__0_14_12//:hyper", + actual = "@raze__hyper__0_14_13//:hyper", tags = [ "cargo-raze", "manual", @@ -59,7 +59,7 @@ alias( alias( name = "tokio", - actual = "@raze__tokio__1_11_0//:tokio", + actual = "@raze__tokio__1_12_0//:tokio", tags = [ "cargo-raze", "manual", diff --git a/webhook/BUILD b/webhook/BUILD index 4340909..82f3305 100644 --- a/webhook/BUILD +++ b/webhook/BUILD @@ -1,5 +1,5 @@ load("@rules_rust//rust:rust.bzl", "rust_binary", "rust_test") -load("//cargo:crates.bzl", "all_crate_deps") +load("//cargo:crates.bzl", "all_crate_deps", "crate_deps") load("@io_bazel_rules_docker//rust:image.bzl", "rust_image") test_suite(name = "tests") @@ -7,6 +7,7 @@ test_suite(name = "tests") rust_binary( name = "webhook", srcs = glob(["src/**"]), + proc_macro_deps = crate_deps(["ctor"]), visibility = ["//visibility:public"], deps = all_crate_deps() + ["//common/rust:common"], ) diff --git a/webhook/Cargo.toml b/webhook/Cargo.toml index 4ef2674..24c68f8 100644 --- a/webhook/Cargo.toml +++ b/webhook/Cargo.toml @@ -12,6 +12,7 @@ hex = "0.4.3" serde_json = { version = "1.0" } libc = "0.2.101" lazy_static = "1.4.0" +ctor = "0.1.21" ed25519-dalek = "1" rand = "0.7" diff --git a/webhook/cargo/BUILD.bazel b/webhook/cargo/BUILD.bazel index 8d3e7f4..77bc34f 100644 --- a/webhook/cargo/BUILD.bazel +++ b/webhook/cargo/BUILD.bazel @@ -13,6 +13,15 @@ licenses([ # Aliased targets alias( + name = "ctor", + actual = "@raze__ctor__0_1_21//:ctor", + tags = [ + "cargo-raze", + "manual", + ], +) + +alias( name = "ed25519_dalek", actual = "@raze__ed25519_dalek__1_0_1//:ed25519_dalek", tags = [ @@ -32,7 +41,7 @@ alias( alias( name = "hyper", - actual = "@raze__hyper__0_14_12//:hyper", + actual = "@raze__hyper__0_14_13//:hyper", tags = [ "cargo-raze", "manual", @@ -50,7 +59,7 @@ alias( alias( name = "libc", - actual = "@raze__libc__0_2_101//:libc", + actual = "@raze__libc__0_2_104//:libc", tags = [ "cargo-raze", "manual", @@ -77,7 +86,7 @@ alias( alias( name = "serde_json", - actual = "@raze__serde_json__1_0_67//:serde_json", + actual = "@raze__serde_json__1_0_68//:serde_json", tags = [ "cargo-raze", "manual", @@ -86,7 +95,7 @@ alias( alias( name = "tokio", - actual = "@raze__tokio__1_11_0//:tokio", + actual = "@raze__tokio__1_12_0//:tokio", tags = [ "cargo-raze", "manual", diff --git a/webhook/src/handler/handler.rs b/webhook/src/handler/handler.rs index d482e01..a07f995 100644 --- a/webhook/src/handler/handler.rs +++ b/webhook/src/handler/handler.rs @@ -1,8 +1,10 @@ use super::error::WebhookError; -use super::{signature::validate_signature, types::Interaction}; +use super::signature::validate_signature; use crate::config::Config; -use common::log::{debug, error, info}; +use common::discord_models::slash_commands::{Interaction, InteractionRequestType}; +use common::log::{debug, error}; use common::nats_crate::Connection; +use common::payloads::CacheData; use hyper::{ body::{to_bytes, Bytes}, service::Service, @@ -81,15 +83,12 @@ impl HandlerService { let utf8 = from_utf8(&data); match utf8 { Ok(data) => match serde_json::from_str::<Interaction>(data) { - Ok(value) => { - if value.t == 1 { - info!("sending pong"); - // a ping must be responded with another ping - return Ok(Response::builder() - .header("Content-Type", "application/json") - .body(serde_json::to_string(&Ping { t: 1 }).unwrap().into()) - .unwrap()); - } else { + Ok(value) => match value.type_ { + InteractionRequestType::Ping => Ok(Response::builder() + .header("Content-Type", "application/json") + .body(serde_json::to_string(&Ping { t: 1 }).unwrap().into()) + .unwrap()), + _ => { debug!("calling nats"); // this should hopefully not fail ? let payload = @@ -98,8 +97,9 @@ impl HandlerService { node_id: "".to_string(), span: None, }, - operation: "".to_string(), - data: value, + data: CacheData::InteractionCreate { + interaction: Box::new(value), + }, }) .unwrap(); @@ -122,7 +122,7 @@ impl HandlerService { } } } - } + }, Err(_) => Err(WebhookError::new( StatusCode::BAD_REQUEST, diff --git a/webhook/src/handler/mod.rs b/webhook/src/handler/mod.rs index a437dd5..20a977a 100644 --- a/webhook/src/handler/mod.rs +++ b/webhook/src/handler/mod.rs @@ -1,8 +1,7 @@ +mod error; +mod handler; pub mod make_service; mod signature; -mod handler; -mod types; -mod error; #[cfg(test)] -pub mod tests;
\ No newline at end of file +pub mod tests; diff --git a/webhook/src/handler/tests/handler_integration.rs b/webhook/src/handler/tests/handler_integration.rs index 2475b94..906b347 100644 --- a/webhook/src/handler/tests/handler_integration.rs +++ b/webhook/src/handler/tests/handler_integration.rs @@ -1,106 +1,107 @@ use std::time::Duration; -use crate::{ - config::Config, - handler::tests::utils::{generate_keypair, sign_message}, - start, +use ctor; +use hyper::{Body, Method, Request, StatusCode}; +use lazy_static::lazy_static; +use serde_json::json; +use ed25519_dalek::Keypair; + +use common::{ + config::test_init, + nats_crate::Connection, + testcontainers::{Image, images::generic::WaitFor}, }; -use common::{config::test_init, nats_crate::Connection, testcontainers::{Image, images::generic::WaitFor}}; use common::{ config::Settings, log::info, - testcontainers::{clients::Cli, images::generic::GenericImage, Container, Docker}, + testcontainers::{clients::Cli, Container, Docker, images::generic::GenericImage}, }; -use hyper::{Body, Method, Request}; -use lazy_static::{__Deref, lazy_static}; -use serde_json::json; -#[cfg(all(unix, target_arch = "x86_64"))] -const fn nats_image<'a>() -> &'a str { - return "amd64/nats"; -} +use crate::{ + config::Config, + handler::tests::utils::{generate_keypair, sign_message}, + start, +}; -#[cfg(all(unix, target_arch = "aarch64"))] const fn nats_image<'a>() -> &'a str { + #[cfg(all(unix, target_arch = "x86_64"))] + return "amd64/nats"; + #[cfg(all(unix, target_arch = "aarch64"))] return "arm64v8/nats"; -} - -#[cfg(all(target_arch = "x86_64", target_os = "windows"))] -const fn nats_image<'a>() -> &'a str { + #[cfg(all(target_arch = "x86_64", target_os = "windows"))] return "winamd64/nats"; } +static mut NATS: Option<Container<Cli, GenericImage>> = None; +static mut SETTINGS: Option<Settings<Config>> = None; + lazy_static! { + static ref TEST_KEYPAIR: Keypair = generate_keypair(); static ref DOCKER: Cli = Cli::default(); +} - static ref NATS_CONTAINER: Container<'static, Cli, GenericImage> = { - test_init(); - - let image: GenericImage = GenericImage::new(nats_image()) - .with_wait_for(WaitFor::message_on_stderr("Server is ready")); - - let container = DOCKER.run(image); - container.start(); - container.image().wait_until_ready(&container); - container.get_host_port(4222).unwrap(); - container - }; - - - static ref TEST_KEYPAIR: ed25519_dalek::Keypair = { - generate_keypair() - }; - - static ref SETTINGS: Settings<Config> = { - let port = NATS_CONTAINER.get_host_port(4222).unwrap(); - common::config::Settings { - config: crate::config::Config { - server: crate::config::ServerSettings { - port: 5003, - address: "0.0.0.0".to_string(), - }, - discord: crate::config::Discord { - public_key: hex::encode(TEST_KEYPAIR.to_bytes()), - client_id: 0, - }, +#[ctor::ctor] +unsafe fn init() { + test_init(); + let image = GenericImage::new(nats_image()) + .with_wait_for(WaitFor::message_on_stderr("Server is ready")); + + let container = DOCKER.run(image); + container.start(); + container.image().wait_until_ready(&container); + container.get_host_port(4222).unwrap(); + + let port = container.get_host_port(4222).unwrap(); + NATS = Some(container); + SETTINGS = Some(common::config::Settings { + config: crate::config::Config { + server: crate::config::ServerSettings { + port: 5003, + address: "0.0.0.0".to_string(), }, - redis: common::redis::RedisConfiguration { - url: "".to_string(), + discord: crate::config::Discord { + public_key: hex::encode(TEST_KEYPAIR.public.clone()), + client_id: 0, }, - monitoring: common::monitoring::MonitoringConfiguration { - enabled: false, - address: None, - port: None, - }, - nats: common::nats::NatsConfiguration { - client_cert: None, - root_cert: None, - jetstream_api_prefix: None, - max_reconnects: None, - reconnect_buffer_size: None, - tls: None, - client_name: None, - tls_required: None, - host: format!("localhost:{}", port), - }, - } - }; - - static ref TASK: () = { - std::thread::spawn(|| { - let r = tokio::runtime::Runtime::new().unwrap(); - r.spawn(async { start(SETTINGS.clone()).await }); - loop {} - }); - std::thread::sleep(Duration::from_secs(1)); - }; + }, + redis: common::redis::RedisConfiguration { + url: "".to_string(), + }, + monitoring: common::monitoring::MonitoringConfiguration { + enabled: false, + address: None, + port: None, + }, + nats: common::nats::NatsConfiguration { + client_cert: None, + root_cert: None, + jetstream_api_prefix: None, + max_reconnects: None, + reconnect_buffer_size: None, + tls: None, + client_name: None, + tls_required: None, + host: format!("localhost:{}", port), + }, + }); + let settings = (&mut SETTINGS).as_ref().unwrap(); + + std::thread::spawn(move || { + let runtime = tokio::runtime::Runtime::new().unwrap(); + runtime.block_on(start(settings.clone())); + }); + std::thread::sleep(Duration::from_secs(3)); +} + +#[ctor::dtor] +unsafe fn destroy() { + let nats = (&mut NATS).as_ref().unwrap(); + nats.stop(); } #[tokio::test] async fn respond_to_pings() { - let _ = NATS_CONTAINER.deref(); - let _ = TASK.deref(); - let ping = json!({ "type": 1 }).to_string(); + let ping = json!({ "type": 1, "id": "0", "application_id": "0", "token": "random token", "version": 1 }).to_string(); let timestamp = "my datetime :)"; let signature_data = [timestamp.as_bytes().to_vec(), ping.as_bytes().to_vec()].concat(); let signature = sign_message(signature_data, &TEST_KEYPAIR); @@ -115,14 +116,12 @@ async fn respond_to_pings() { let client = hyper::client::Client::new(); let result = client.request(req).await.unwrap(); - assert!(result.status() == 200); + assert_eq!(result.status(), StatusCode::OK); } #[tokio::test] async fn deny_invalid_signatures() { - let _ = NATS_CONTAINER.deref(); - let _ = TASK.deref(); - let ping = json!({ "type": 1 }).to_string(); + let ping = json!({ "type": 1, "id": "0", "application_id": "0", "token": "random token", "version": 1 }).to_string(); let timestamp = "my datetime :)"; let req = Request::builder() @@ -134,14 +133,12 @@ async fn deny_invalid_signatures() { .expect("request builder"); let client = hyper::client::Client::new(); let result = client.request(req).await.unwrap(); - assert!(result.status() == 401); + assert_eq!(result.status(), StatusCode::UNAUTHORIZED); } #[tokio::test] async fn response_500_when_no_nats_response() { - let _ = NATS_CONTAINER.deref(); - let _ = TASK.deref(); - let ping = json!({ "type": 0 }).to_string(); + let ping = json!({ "type": 2, "id": "0", "application_id": "0", "token": "random token", "version": 1 }).to_string(); let timestamp = "my datetime :)"; let signature_data = [timestamp.as_bytes().to_vec(), ping.as_bytes().to_vec()].concat(); let signature = sign_message(signature_data, &TEST_KEYPAIR); @@ -157,16 +154,17 @@ async fn response_500_when_no_nats_response() { let client = hyper::client::Client::new(); let result = client.request(req).await.unwrap(); - assert!(result.status() == 500); + assert_eq!(result.status(), StatusCode::INTERNAL_SERVER_ERROR); } #[tokio::test] async fn respond_from_nats_response() { - let _ = NATS_CONTAINER.deref(); - let _ = TASK.deref(); - let nats: Connection = SETTINGS.clone().nats.into(); + let nats: Connection; + unsafe { + nats = SETTINGS.clone().unwrap().nats.into(); + } let sub = nats.subscribe("nova.cache.dispatch.interaction").unwrap(); - let ping = json!({ "type": 0 }).to_string(); + let ping = json!({ "type": 2, "id": "0", "application_id": "0", "token": "random token", "version": 1 }).to_string(); let timestamp = "my datetime :)"; let signature_data = [timestamp.as_bytes().to_vec(), ping.as_bytes().to_vec()].concat(); let signature = sign_message(signature_data, &TEST_KEYPAIR); @@ -186,13 +184,11 @@ async fn respond_from_nats_response() { .expect("request builder"); let client = hyper::client::Client::new(); let result = client.request(req).await.unwrap(); - assert!(result.status() == 200); + assert_eq!(result.status(), StatusCode::OK); } #[tokio::test] async fn response_400_when_invalid_json_body() { - let _ = NATS_CONTAINER.deref(); - let _ = TASK.deref(); let ping = "{".to_string(); let timestamp = "my datetime :)"; let signature_data = [timestamp.as_bytes().to_vec(), ping.as_bytes().to_vec()].concat(); @@ -207,13 +203,11 @@ async fn response_400_when_invalid_json_body() { .expect("request builder"); let client = hyper::client::Client::new(); let result = client.request(req).await.unwrap(); - assert!(result.status() == 400); + assert_eq!(result.status(), StatusCode::BAD_REQUEST); } #[tokio::test] async fn response_400_when_invalid_utf8_body() { - let _ = NATS_CONTAINER.deref(); - let _ = TASK.deref(); // invalid 2 octet sequence let ping = vec![0xc3, 0x28]; @@ -230,5 +224,5 @@ async fn response_400_when_invalid_utf8_body() { .expect("request builder"); let client = hyper::client::Client::new(); let result = client.request(req).await.unwrap(); - assert!(result.status() == 400); + assert_eq!(result.status(), StatusCode::BAD_REQUEST); } diff --git a/webhook/src/handler/types.rs b/webhook/src/handler/types.rs deleted file mode 100644 index 4fc5b68..0000000 --- a/webhook/src/handler/types.rs +++ /dev/null @@ -1,9 +0,0 @@ -use serde::{Serialize, Deserialize}; -use serde_json::Value; - -#[derive(Debug, Deserialize, Clone, Default, Serialize)] -pub struct Interaction { - #[serde(rename = "type")] - pub t: i16, - pub data: Option<Value>, -} |