diff --git a/.vscode/settings.json b/.vscode/settings.json index 55fb0902..5e6212bc 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,6 +9,7 @@ "binstall", "casbin", "chrono", + "clippy", "deadpool", "dotenv", "dotenvy", diff --git a/Cargo.lock b/Cargo.lock index 4dbbbeaf..4497964e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "Inflector" @@ -76,7 +76,7 @@ dependencies = [ [[package]] name = "actix-casbin-example" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "casbin", @@ -153,24 +153,24 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.9.0" +version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d48f96fc3003717aeb9856ca3d02a8c7de502667ad76eeacd830b48d2e91fac4" +checksum = "0fa882656b67966045e4152c634051e70346939fced7117d5f0b52146a7c74c9" dependencies = [ "actix-codec", "actix-rt", "actix-service", "actix-tls", "actix-utils", - "ahash 0.8.11", "base64 0.22.1", "bitflags 2.8.0", "brotli", "bytes", "bytestring", - "derive_more 0.99.19", + "derive_more 2.0.1", "encoding_rs", "flate2", + "foldhash", "futures-core", "h2 0.3.26", "http 0.2.12", @@ -182,7 +182,7 @@ dependencies = [ "mime", "percent-encoding", "pin-project-lite", - "rand 0.8.5", + "rand 0.9.0", "sha1", "smallvec", "tokio", @@ -422,9 +422,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.9.0" +version = "4.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9180d76e5cc7ccbc4d60a506f2c727730b154010262df5b910eb17dbe4b8cb38" +checksum = "f2e3b15b3dc6c6ed996e4032389e9849d4ab002b1e92fbfe85b5f307d1479b4d" dependencies = [ "actix-codec", "actix-http", @@ -436,13 +436,13 @@ dependencies = [ "actix-tls", "actix-utils", "actix-web-codegen", - "ahash 0.8.11", "bytes", "bytestring", "cfg-if", "cookie", - "derive_more 0.99.19", + "derive_more 2.0.1", "encoding_rs", + "foldhash", "futures-core", "futures-util", "impl-more", @@ -460,6 +460,7 @@ dependencies = [ "smallvec", "socket2", "time", + "tracing", "url", ] @@ -495,9 +496,9 @@ dependencies = [ [[package]] name = "actix-web-lab" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee75923689132fc5fb57ccc5bb98d25bb214796a29cd505844eb3b42daf11df0" +checksum = "53df243e3d9bae9e2e1078e8639a0e6f4223a4d0cd7ee3b43ab9d25ec0751f88" dependencies = [ "actix-http", "actix-router", @@ -510,15 +511,14 @@ dependencies = [ "bytes", "bytestring", "csv", - "derive_more 1.0.0", + "derive_more 2.0.1", "form_urlencoded", "futures-core", "futures-util", "http 0.2.12", "impl-more", - "itertools 0.13.0", + "itertools 0.14.0", "local-channel", - "mediatype", "mime", "pin-project-lite", "regex", @@ -533,11 +533,10 @@ dependencies = [ [[package]] name = "actix-web-lab-derive" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c221da13534b9352f3f79fcbbd6095f6d8aee63bdf1da8a73d36f9eeea17d5a" +checksum = "9dd80fa0bd6217e482112d9d87a05af8e0f8dec9e3aa51f34816f761c5cf7da7" dependencies = [ - "proc-macro2", "quote", "syn 2.0.98", ] @@ -903,7 +902,7 @@ dependencies = [ [[package]] name = "async-data" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "env_logger", @@ -964,7 +963,7 @@ dependencies = [ [[package]] name = "async-graphql-demo" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-cors", "actix-web", @@ -1119,7 +1118,7 @@ dependencies = [ [[package]] name = "awc_https" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "awc", @@ -1597,7 +1596,7 @@ dependencies = [ [[package]] name = "background-jobs" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "apalis", @@ -1701,7 +1700,7 @@ dependencies = [ [[package]] name = "basics" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-files", "actix-session", @@ -1859,9 +1858,9 @@ dependencies = [ [[package]] name = "brotli" -version = "6.0.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" +checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -2018,7 +2017,7 @@ dependencies = [ [[package]] name = "cert-watch" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "color-eyre", @@ -2299,7 +2298,7 @@ dependencies = [ [[package]] name = "cookie-auth" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-identity", "actix-session", @@ -2310,7 +2309,7 @@ dependencies = [ [[package]] name = "cookie-session" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-session", "actix-web", @@ -2336,7 +2335,7 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cors" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-cors", "actix-web", @@ -2593,7 +2592,7 @@ checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010" [[package]] name = "db-diesel" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "diesel", @@ -2606,7 +2605,7 @@ dependencies = [ [[package]] name = "db-mongo" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "mongodb", @@ -2615,7 +2614,7 @@ dependencies = [ [[package]] name = "db-postgres" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "confik", @@ -2630,7 +2629,7 @@ dependencies = [ [[package]] name = "db-redis" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "env_logger", @@ -2878,7 +2877,7 @@ dependencies = [ [[package]] name = "docker_sample" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "env_logger", @@ -3064,7 +3063,7 @@ dependencies = [ [[package]] name = "error-handling" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "derive_more 2.0.1", @@ -3299,7 +3298,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form-example" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "serde", @@ -3643,7 +3642,7 @@ dependencies = [ [[package]] name = "guards" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", ] @@ -3789,7 +3788,7 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hello-world" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "env_logger", @@ -3949,7 +3948,7 @@ dependencies = [ [[package]] name = "http-proxy" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "awc", @@ -4510,7 +4509,7 @@ dependencies = [ [[package]] name = "json-example" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "env_logger", @@ -4521,7 +4520,7 @@ dependencies = [ [[package]] name = "json-validation" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "awc", @@ -4535,7 +4534,7 @@ dependencies = [ [[package]] name = "json_decode_error" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "env_logger", @@ -4545,7 +4544,7 @@ dependencies = [ [[package]] name = "json_error" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "env_logger", @@ -4556,7 +4555,7 @@ dependencies = [ [[package]] name = "jsonrpc-example" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "bytes", @@ -4586,7 +4585,7 @@ dependencies = [ [[package]] name = "juniper-advanced" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-cors", "actix-web", @@ -4602,7 +4601,7 @@ dependencies = [ [[package]] name = "juniper-example" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-cors", "actix-web", @@ -4750,7 +4749,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -4969,12 +4968,6 @@ dependencies = [ "digest", ] -[[package]] -name = "mediatype" -version = "0.19.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8878cd8d1b3c8c8ae4b2ba0a36652b7cf192f618a599a7fbdfa25cffd4ea72dd" - [[package]] name = "memchr" version = "2.7.4" @@ -5028,7 +5021,7 @@ dependencies = [ [[package]] name = "middleware-encrypted-payloads" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-http", "actix-web", @@ -5042,7 +5035,7 @@ dependencies = [ [[package]] name = "middleware-http-to-https" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "env_logger", @@ -5054,7 +5047,7 @@ dependencies = [ [[package]] name = "middleware-rate-limit" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-governor", "actix-web", @@ -5066,7 +5059,7 @@ dependencies = [ [[package]] name = "middleware-request-extensions" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "env_logger", @@ -5075,7 +5068,7 @@ dependencies = [ [[package]] name = "middleware-various" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-http", "actix-web", @@ -5261,7 +5254,7 @@ dependencies = [ [[package]] name = "multipart-example" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-multipart", "actix-web", @@ -5274,7 +5267,7 @@ dependencies = [ [[package]] name = "multipart-s3-example" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-multipart", "actix-web", @@ -5299,7 +5292,7 @@ checksum = "e94e1e6445d314f972ff7395df2de295fe51b71821694f0b0e1e79c4f12c8577" [[package]] name = "mysql" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "derive_more 2.0.1", @@ -5420,7 +5413,7 @@ dependencies = [ [[package]] name = "nested-routing" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "env_logger", @@ -6261,7 +6254,7 @@ dependencies = [ [[package]] name = "protobuf-example" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-protobuf", "actix-web", @@ -6535,7 +6528,7 @@ dependencies = [ [[package]] name = "redis-session-example" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-session", "actix-test", @@ -6793,7 +6786,7 @@ dependencies = [ [[package]] name = "run-in-thread" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "env_logger", @@ -6921,7 +6914,7 @@ dependencies = [ [[package]] name = "rustls-client-cert" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-tls", "actix-web", @@ -6933,7 +6926,7 @@ dependencies = [ [[package]] name = "rustls-example" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-files", "actix-web", @@ -7331,7 +7324,7 @@ dependencies = [ [[package]] name = "server-sent-events" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "actix-web-lab", @@ -7399,7 +7392,7 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "shutdown-server" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "actix-web-lab", @@ -7445,7 +7438,7 @@ checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "simple-auth-server" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-identity", "actix-session", @@ -7462,6 +7455,7 @@ dependencies = [ "serde", "serde_json", "sparklepost", + "temp-env", "time", "uuid", ] @@ -7804,7 +7798,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "state" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "env_logger", @@ -7813,7 +7807,7 @@ dependencies = [ [[package]] name = "static-files" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-files", "actix-web", @@ -8010,6 +8004,15 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +[[package]] +name = "temp-env" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96374855068f47402c3121c6eed88d29cb1de8f3ab27090e273e420bdabcf050" +dependencies = [ + "parking_lot", +] + [[package]] name = "tempfile" version = "3.17.1" @@ -8026,7 +8029,7 @@ dependencies = [ [[package]] name = "templating-askama" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "askama", @@ -8036,7 +8039,7 @@ dependencies = [ [[package]] name = "templating-fluent" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "actix-web-lab", @@ -8049,7 +8052,7 @@ dependencies = [ [[package]] name = "templating-handlebars" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "env_logger", @@ -8059,7 +8062,7 @@ dependencies = [ [[package]] name = "templating-minijinja" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-utils", "actix-web", @@ -8071,7 +8074,7 @@ dependencies = [ [[package]] name = "templating-sailfish" -version = "0.1.0" +version = "0.0.0" dependencies = [ "actix-web", "env_logger", @@ -8081,7 +8084,7 @@ dependencies = [ [[package]] name = "templating-tera" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "env_logger", @@ -8091,7 +8094,7 @@ dependencies = [ [[package]] name = "templating-tinytemplate" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "env_logger", @@ -8102,7 +8105,7 @@ dependencies = [ [[package]] name = "templating-yarte" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "derive_more 2.0.1", @@ -8290,7 +8293,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tls-acme" -version = "1.0.0" +version = "0.0.0" dependencies = [ "acme-rfc8555", "actix-files", @@ -8306,7 +8309,7 @@ dependencies = [ [[package]] name = "tls-openssl" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "env_logger", @@ -8337,7 +8340,7 @@ dependencies = [ [[package]] name = "todo" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-files", "actix-session", @@ -8767,7 +8770,7 @@ dependencies = [ [[package]] name = "tracing-mainmatter-workshop" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "dotenvy", @@ -9054,7 +9057,7 @@ dependencies = [ [[package]] name = "unix-socket" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-web", "env_logger", @@ -9376,7 +9379,7 @@ dependencies = [ [[package]] name = "websocket" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-files", "actix-web", @@ -9392,7 +9395,7 @@ dependencies = [ [[package]] name = "websocket-autobahn" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix", "actix-web", @@ -9403,7 +9406,7 @@ dependencies = [ [[package]] name = "websocket-chat-actorless-example" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-files", "actix-web", @@ -9417,7 +9420,7 @@ dependencies = [ [[package]] name = "websocket-chat-broker" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix", "actix-broker", @@ -9431,7 +9434,7 @@ dependencies = [ [[package]] name = "websocket-example" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix", "actix-files", @@ -9444,7 +9447,7 @@ dependencies = [ [[package]] name = "websocket-tcp-example" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix", "actix-codec", @@ -9465,7 +9468,7 @@ dependencies = [ [[package]] name = "websockets-echo-actorless-example" -version = "1.0.0" +version = "0.0.0" dependencies = [ "actix-files", "actix-web", @@ -9529,7 +9532,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 792fd300..d6b22773 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -resolver = "2" +resolver = "3" members = [ "auth/casbin", "auth/cookie-auth", @@ -74,8 +74,8 @@ exclude = [ [workspace.package] publish = false -edition = "2021" -rust-version = "1.72" +edition = "2024" +rust-version = "1.85" [workspace.dependencies] actix = "0.13" @@ -83,7 +83,7 @@ actix-broker = "0.4" actix-codec = "0.5" actix-cors = "0.7" actix-files = "0.6" -actix-http = "3.5" +actix-http = "3.10" actix-identity = "0.8" actix-multipart = "0.7" actix-protobuf = "0.11" @@ -91,11 +91,11 @@ actix-session = "0.10" actix-test = "0.1" actix-tls = "3.4" actix-utils = "3" -actix-web = "4.9" +actix-web = "4.10" actix-web-actors = "4.1" -actix-web-lab = "0.23" +actix-web-lab = "0.24" actix-ws = "0.3" -awc = "3.2" +awc = "3.6" chrono = { version = "0.4.30", features = ["serde"] } derive_more = "2" @@ -116,6 +116,7 @@ rustls-pemfile = "2" serde = { version = "1", features = ["derive"] } serde_json = "1" time = "0.3" +temp-env = "0.3" tokio = { version = "1.24.2", features = ["sync", "io-util"] } tokio-util = "0.7.4" tokio-stream = "0.1.1" diff --git a/auth/casbin/Cargo.toml b/auth/casbin/Cargo.toml index 15dfb330..bc1b524a 100644 --- a/auth/casbin/Cargo.toml +++ b/auth/casbin/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "actix-casbin-example" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/auth/cookie-auth/Cargo.toml b/auth/cookie-auth/Cargo.toml index fcf20115..dd704da8 100644 --- a/auth/cookie-auth/Cargo.toml +++ b/auth/cookie-auth/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cookie-auth" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/auth/cookie-session/Cargo.toml b/auth/cookie-session/Cargo.toml index 12bb4411..b91a2e82 100644 --- a/auth/cookie-session/Cargo.toml +++ b/auth/cookie-session/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cookie-session" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/auth/redis-session/Cargo.toml b/auth/redis-session/Cargo.toml index b4a57e1e..65d2ecc5 100644 --- a/auth/redis-session/Cargo.toml +++ b/auth/redis-session/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "redis-session-example" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/auth/simple-auth-server/Cargo.toml b/auth/simple-auth-server/Cargo.toml index d9db50d8..0ca14245 100644 --- a/auth/simple-auth-server/Cargo.toml +++ b/auth/simple-auth-server/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "simple-auth-server" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-identity.workspace = true @@ -20,5 +20,6 @@ rust-argon2 = "2" serde_json.workspace = true serde.workspace = true sparklepost = "0.5" +temp-env.workspace = true time.workspace = true uuid.workspace = true diff --git a/auth/simple-auth-server/src/errors.rs b/auth/simple-auth-server/src/errors.rs index 0ddd6e20..e4ed41c4 100644 --- a/auth/simple-auth-server/src/errors.rs +++ b/auth/simple-auth-server/src/errors.rs @@ -1,4 +1,4 @@ -use actix_web::{error::ResponseError, HttpResponse}; +use actix_web::{HttpResponse, error::ResponseError}; use derive_more::Display; use diesel::result::{DatabaseErrorKind, Error as DBError}; use uuid::Error as ParseError; @@ -22,7 +22,7 @@ impl ResponseError for ServiceError { ServiceError::InternalServerError => { HttpResponse::InternalServerError().json("Internal Server Error, Please try later") } - ServiceError::BadRequest(ref message) => HttpResponse::BadRequest().json(message), + ServiceError::BadRequest(message) => HttpResponse::BadRequest().json(message), ServiceError::Unauthorized => HttpResponse::Unauthorized().json("Unauthorized"), } } diff --git a/auth/simple-auth-server/src/utils.rs b/auth/simple-auth-server/src/utils.rs index cbce02b6..e0b1a6b6 100644 --- a/auth/simple-auth-server/src/utils.rs +++ b/auth/simple-auth-server/src/utils.rs @@ -30,16 +30,14 @@ pub fn verify(hash: &str, password: &str) -> Result { #[cfg(test)] mod tests { - use std::env; - use actix_web::cookie::Key; use super::SECRET_KEY; #[test] fn secret_key_default() { - env::remove_var("SECRET_KEY"); - - assert!(Key::try_from(SECRET_KEY.as_bytes()).is_ok()); + temp_env::with_var("SECRET_KEY", None::<&str>, || { + assert!(Key::try_from(SECRET_KEY.as_bytes()).is_ok()); + }); } } diff --git a/background-jobs/Cargo.toml b/background-jobs/Cargo.toml index 8289b7ff..87d851f9 100644 --- a/background-jobs/Cargo.toml +++ b/background-jobs/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "background-jobs" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/basics/basics/Cargo.toml b/basics/basics/Cargo.toml index 0034e266..4fc43dd7 100644 --- a/basics/basics/Cargo.toml +++ b/basics/basics/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "basics" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-files.workspace = true diff --git a/basics/error-handling/Cargo.toml b/basics/error-handling/Cargo.toml index fc738793..c9c24878 100644 --- a/basics/error-handling/Cargo.toml +++ b/basics/error-handling/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "error-handling" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/basics/hello-world/Cargo.toml b/basics/hello-world/Cargo.toml index af2c23e2..c9adb007 100644 --- a/basics/hello-world/Cargo.toml +++ b/basics/hello-world/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "hello-world" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/basics/nested-routing/Cargo.toml b/basics/nested-routing/Cargo.toml index d9b36201..ef9f63ee 100644 --- a/basics/nested-routing/Cargo.toml +++ b/basics/nested-routing/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "nested-routing" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/basics/state/Cargo.toml b/basics/state/Cargo.toml index a894b021..d088b5b2 100644 --- a/basics/state/Cargo.toml +++ b/basics/state/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "state" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/basics/static-files/Cargo.toml b/basics/static-files/Cargo.toml index 98136fca..7461706b 100644 --- a/basics/static-files/Cargo.toml +++ b/basics/static-files/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "static-files" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/basics/todo/Cargo.toml b/basics/todo/Cargo.toml index 20a9e295..b7b3cd36 100644 --- a/basics/todo/Cargo.toml +++ b/basics/todo/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "todo" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-files.workspace = true diff --git a/cors/backend/Cargo.toml b/cors/backend/Cargo.toml index a6477c90..07767730 100644 --- a/cors/backend/Cargo.toml +++ b/cors/backend/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cors" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/data-factory/Cargo.toml b/data-factory/Cargo.toml index 96333c4a..ea93a6fd 100644 --- a/data-factory/Cargo.toml +++ b/data-factory/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "async-data" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/databases/diesel/Cargo.toml b/databases/diesel/Cargo.toml index 08a77ff7..739e0673 100644 --- a/databases/diesel/Cargo.toml +++ b/databases/diesel/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "db-diesel" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/databases/mongodb/Cargo.toml b/databases/mongodb/Cargo.toml index 75b2becf..cb2a8c63 100644 --- a/databases/mongodb/Cargo.toml +++ b/databases/mongodb/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "db-mongo" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/databases/mysql/Cargo.toml b/databases/mysql/Cargo.toml index 8b2a15b3..0df2e302 100644 --- a/databases/mysql/Cargo.toml +++ b/databases/mysql/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "mysql" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/databases/postgres/Cargo.toml b/databases/postgres/Cargo.toml index 71413f77..d00951a5 100644 --- a/databases/postgres/Cargo.toml +++ b/databases/postgres/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "db-postgres" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/databases/redis/Cargo.toml b/databases/redis/Cargo.toml index 4dbe6786..090b8e29 100644 --- a/databases/redis/Cargo.toml +++ b/databases/redis/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "db-redis" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/databases/sqlite/Cargo.toml b/databases/sqlite/Cargo.toml index 631ca11d..b4981d8d 100644 --- a/databases/sqlite/Cargo.toml +++ b/databases/sqlite/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "db-sqlite" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true # Do not use workspace deps as this package isn't part of the workspace. [dependencies] diff --git a/docker/Cargo.toml b/docker/Cargo.toml index 354927e2..2994aadd 100644 --- a/docker/Cargo.toml +++ b/docker/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "docker_sample" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true # Do not use workspace deps as they won't work in docker context. [dependencies] diff --git a/forms/form/Cargo.toml b/forms/form/Cargo.toml index 8df75021..5e143eb6 100644 --- a/forms/form/Cargo.toml +++ b/forms/form/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "form-example" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/forms/multipart-s3/Cargo.toml b/forms/multipart-s3/Cargo.toml index 81a7477a..0c1133e9 100644 --- a/forms/multipart-s3/Cargo.toml +++ b/forms/multipart-s3/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "multipart-s3-example" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-multipart.workspace = true diff --git a/forms/multipart/Cargo.toml b/forms/multipart/Cargo.toml index e5d37882..22a4eb7d 100644 --- a/forms/multipart/Cargo.toml +++ b/forms/multipart/Cargo.toml @@ -1,8 +1,7 @@ [package] name = "multipart-example" -version = "1.0.0" -description = "Simple file uploader in Actix Web with Async/Await" edition.workspace = true +rust-version.workspace = true [dependencies] actix-multipart.workspace = true diff --git a/graphql/async-graphql/Cargo.toml b/graphql/async-graphql/Cargo.toml index 9e9adbb1..70e9e91f 100644 --- a/graphql/async-graphql/Cargo.toml +++ b/graphql/async-graphql/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "async-graphql-demo" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/graphql/juniper-advanced/Cargo.toml b/graphql/juniper-advanced/Cargo.toml index fbdfaa91..1bb5bb2c 100644 --- a/graphql/juniper-advanced/Cargo.toml +++ b/graphql/juniper-advanced/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "juniper-advanced" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/graphql/juniper/Cargo.toml b/graphql/juniper/Cargo.toml index 264a9596..272000ac 100644 --- a/graphql/juniper/Cargo.toml +++ b/graphql/juniper/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "juniper-example" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/guards/Cargo.toml b/guards/Cargo.toml index 1b0708e3..c912535c 100644 --- a/guards/Cargo.toml +++ b/guards/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "guards" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/http-proxy/Cargo.toml b/http-proxy/Cargo.toml index e54259b5..90d3abe2 100644 --- a/http-proxy/Cargo.toml +++ b/http-proxy/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "http-proxy" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web = { workspace = true, features = ["openssl"] } diff --git a/https-tls/acme-letsencrypt/Cargo.toml b/https-tls/acme-letsencrypt/Cargo.toml index 22274f74..94c82950 100644 --- a/https-tls/acme-letsencrypt/Cargo.toml +++ b/https-tls/acme-letsencrypt/Cargo.toml @@ -1,8 +1,7 @@ [package] name = "tls-acme" -version = "1.0.0" -publish = false edition.workspace = true +rust-version.workspace = true [dependencies] acme-rfc8555 = "0.1" diff --git a/https-tls/awc-https/Cargo.toml b/https-tls/awc-https/Cargo.toml index 61cf992a..e0aa72af 100644 --- a/https-tls/awc-https/Cargo.toml +++ b/https-tls/awc-https/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "awc_https" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/https-tls/cert-watch/Cargo.toml b/https-tls/cert-watch/Cargo.toml index b8cf8d00..dc1c6d6d 100644 --- a/https-tls/cert-watch/Cargo.toml +++ b/https-tls/cert-watch/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cert-watch" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web = { workspace = true, features = ["rustls-0_23"] } diff --git a/https-tls/openssl/Cargo.toml b/https-tls/openssl/Cargo.toml index abcb2a07..dbaf2730 100644 --- a/https-tls/openssl/Cargo.toml +++ b/https-tls/openssl/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tls-openssl" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web = { workspace = true, features = ["openssl"] } diff --git a/https-tls/rustls-client-cert/Cargo.toml b/https-tls/rustls-client-cert/Cargo.toml index 79aaa3fa..9654e4b6 100644 --- a/https-tls/rustls-client-cert/Cargo.toml +++ b/https-tls/rustls-client-cert/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "rustls-client-cert" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-tls = { workspace = true, features = ["rustls-0_23"] } diff --git a/https-tls/rustls/Cargo.toml b/https-tls/rustls/Cargo.toml index 4cbd7811..577795ee 100644 --- a/https-tls/rustls/Cargo.toml +++ b/https-tls/rustls/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "rustls-example" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web = { workspace = true, features = ["rustls-0_23"] } diff --git a/json/json-decode-error/Cargo.toml b/json/json-decode-error/Cargo.toml index 91c8f5aa..7c134802 100644 --- a/json/json-decode-error/Cargo.toml +++ b/json/json-decode-error/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "json_decode_error" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/json/json-error/Cargo.toml b/json/json-error/Cargo.toml index 4e7d3b13..07c9ac73 100644 --- a/json/json-error/Cargo.toml +++ b/json/json-error/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "json_error" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/json/json-validation/Cargo.toml b/json/json-validation/Cargo.toml index c033f942..b1150e2f 100644 --- a/json/json-validation/Cargo.toml +++ b/json/json-validation/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "json-validation" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/json/json/Cargo.toml b/json/json/Cargo.toml index 729b1df8..59af20b0 100644 --- a/json/json/Cargo.toml +++ b/json/json/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "json-example" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/json/jsonrpc/Cargo.toml b/json/jsonrpc/Cargo.toml index 831f052c..f14703ed 100644 --- a/json/jsonrpc/Cargo.toml +++ b/json/jsonrpc/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "jsonrpc-example" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/json/jsonrpc/src/main.rs b/json/jsonrpc/src/main.rs index 7ef875b1..475d1097 100644 --- a/json/jsonrpc/src/main.rs +++ b/json/jsonrpc/src/main.rs @@ -1,15 +1,11 @@ -// Allow this lint since it's fine to use type directly in the short example. -#![allow(clippy::type_complexity)] - use std::{ error, - future::Future, pin::Pin, sync::{Arc, RwLock}, time::Duration, }; -use actix_web::{middleware, web, App, Error, HttpResponse, HttpServer}; +use actix_web::{App, Error, HttpResponse, HttpServer, middleware, web}; use bytes::Bytes; use futures_util::FutureExt as _; use serde_json::Value; @@ -88,9 +84,12 @@ async fn rpc_select( pub trait ImplNetwork { fn ping(&self) -> String; + + #[allow(clippy::type_complexity)] fn wait(&self, d: u64) -> Pin>>>>; fn get(&self) -> u32; + fn inc(&mut self); } diff --git a/middleware/encrypted-payloads/Cargo.toml b/middleware/encrypted-payloads/Cargo.toml index ceaece46..a7c75403 100644 --- a/middleware/encrypted-payloads/Cargo.toml +++ b/middleware/encrypted-payloads/Cargo.toml @@ -1,8 +1,7 @@ [package] name = "middleware-encrypted-payloads" -version = "1.0.0" -publish.workspace = true edition.workspace = true +rust-version.workspace = true [dependencies] actix-http.workspace = true diff --git a/middleware/http-to-https/Cargo.toml b/middleware/http-to-https/Cargo.toml index 759b9560..47c6c75b 100644 --- a/middleware/http-to-https/Cargo.toml +++ b/middleware/http-to-https/Cargo.toml @@ -1,8 +1,7 @@ [package] name = "middleware-http-to-https" -version = "1.0.0" -publish.workspace = true edition.workspace = true +rust-version.workspace = true [dependencies] actix-web = { workspace = true, features = ["rustls-0_23"] } diff --git a/middleware/rate-limit/Cargo.toml b/middleware/rate-limit/Cargo.toml index a27fdd04..74dbe3dc 100644 --- a/middleware/rate-limit/Cargo.toml +++ b/middleware/rate-limit/Cargo.toml @@ -1,8 +1,7 @@ [package] name = "middleware-rate-limit" -version = "1.0.0" -publish.workspace = true edition.workspace = true +rust-version.workspace = true [dependencies] actix-governor = "0.5" diff --git a/middleware/request-extensions/Cargo.toml b/middleware/request-extensions/Cargo.toml index e875e4c8..3f78f0ac 100644 --- a/middleware/request-extensions/Cargo.toml +++ b/middleware/request-extensions/Cargo.toml @@ -1,8 +1,7 @@ [package] name = "middleware-request-extensions" -version = "1.0.0" -publish.workspace = true edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/middleware/various/Cargo.toml b/middleware/various/Cargo.toml index 580b6162..c3be8a33 100644 --- a/middleware/various/Cargo.toml +++ b/middleware/various/Cargo.toml @@ -1,8 +1,7 @@ [package] name = "middleware-various" -version = "1.0.0" -publish.workspace = true edition.workspace = true +rust-version.workspace = true [dependencies] actix-http.workspace = true diff --git a/protobuf/Cargo.toml b/protobuf/Cargo.toml index 085855fc..aeff79a9 100644 --- a/protobuf/Cargo.toml +++ b/protobuf/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "protobuf-example" -version = "1.0.0" edition.workspace = true +rust-version.workspace = true [dependencies] actix-protobuf.workspace = true diff --git a/run-in-thread/Cargo.toml b/run-in-thread/Cargo.toml index 92f31cc5..b720a54d 100644 --- a/run-in-thread/Cargo.toml +++ b/run-in-thread/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "run-in-thread" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true description = "Run Actix Web in separate thread" [dependencies] diff --git a/server-sent-events/Cargo.toml b/server-sent-events/Cargo.toml index 258baa96..575b8600 100644 --- a/server-sent-events/Cargo.toml +++ b/server-sent-events/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "server-sent-events" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/shutdown-server/Cargo.toml b/shutdown-server/Cargo.toml index d097168a..69bb2f8b 100644 --- a/shutdown-server/Cargo.toml +++ b/shutdown-server/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "shutdown-server" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true description = "Send a request to the server to shut it down" [dependencies] diff --git a/templating/askama/Cargo.toml b/templating/askama/Cargo.toml index 4a165f9c..eb2c88e5 100644 --- a/templating/askama/Cargo.toml +++ b/templating/askama/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "templating-askama" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/templating/fluent/Cargo.toml b/templating/fluent/Cargo.toml index 53b29e03..2ee9a3da 100644 --- a/templating/fluent/Cargo.toml +++ b/templating/fluent/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "templating-fluent" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/templating/handlebars/Cargo.toml b/templating/handlebars/Cargo.toml index 340d87e7..05a3ce09 100644 --- a/templating/handlebars/Cargo.toml +++ b/templating/handlebars/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "templating-handlebars" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/templating/minijinja/Cargo.toml b/templating/minijinja/Cargo.toml index f5b90545..ee237c09 100644 --- a/templating/minijinja/Cargo.toml +++ b/templating/minijinja/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "templating-minijinja" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/templating/minijinja/src/main.rs b/templating/minijinja/src/main.rs index 7e2c7c10..000244df 100644 --- a/templating/minijinja/src/main.rs +++ b/templating/minijinja/src/main.rs @@ -1,12 +1,13 @@ use std::{collections::HashMap, env, path::PathBuf}; -use actix_utils::future::{ready, Ready}; +use actix_utils::future::{Ready, ready}; use actix_web::{ + App, FromRequest, HttpRequest, HttpResponse, HttpServer, Responder, Result, dev::{self, ServiceResponse}, error, - http::{header::ContentType, StatusCode}, + http::{StatusCode, header::ContentType}, middleware::{ErrorHandlerResponse, ErrorHandlers, Logger}, - web, App, FromRequest, HttpRequest, HttpResponse, HttpServer, Responder, Result, + web, }; use minijinja::path_loader; use minijinja_autoreload::AutoReloader; @@ -16,11 +17,11 @@ struct MiniJinjaRenderer { } impl MiniJinjaRenderer { - fn render( + fn render>( &self, tmpl: &str, - ctx: impl Into, - ) -> actix_web::Result { + ctx: T, + ) -> actix_web::Result> { self.tmpl_env .acquire_env() .map_err(|_| error::ErrorInternalServerError("could not acquire template env"))? diff --git a/templating/sailfish/Cargo.toml b/templating/sailfish/Cargo.toml index f8b10680..ee8c6798 100644 --- a/templating/sailfish/Cargo.toml +++ b/templating/sailfish/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "templating-sailfish" -version = "0.1.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/templating/tera/Cargo.toml b/templating/tera/Cargo.toml index 77347795..24d3cbb2 100644 --- a/templating/tera/Cargo.toml +++ b/templating/tera/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "templating-tera" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/templating/tinytemplate/Cargo.toml b/templating/tinytemplate/Cargo.toml index 61aaa7df..7a8fc4d4 100644 --- a/templating/tinytemplate/Cargo.toml +++ b/templating/tinytemplate/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "templating-tinytemplate" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/templating/yarte/Cargo.toml b/templating/yarte/Cargo.toml index 863f3c55..012fdef8 100644 --- a/templating/yarte/Cargo.toml +++ b/templating/yarte/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "templating-yarte" -version = "1.0.0" +edition.workspace = true +rust-version.workspace = true publish = false -edition = "2021" [package.metadata.cargo-machete] ignored = [ diff --git a/tracing/mainmatter-workshop/Cargo.toml b/tracing/mainmatter-workshop/Cargo.toml index d7f24085..4077cd4f 100644 --- a/tracing/mainmatter-workshop/Cargo.toml +++ b/tracing/mainmatter-workshop/Cargo.toml @@ -1,7 +1,5 @@ [package] name = "tracing-mainmatter-workshop" -version = "1.0.0" -publish.workspace = true edition.workspace = true rust-version.workspace = true diff --git a/unix-socket/Cargo.toml b/unix-socket/Cargo.toml index b705ef8f..2d1e1822 100644 --- a/unix-socket/Cargo.toml +++ b/unix-socket/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "unix-socket" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-web.workspace = true diff --git a/websockets/autobahn/Cargo.toml b/websockets/autobahn/Cargo.toml index 5494f3b3..4ba55437 100644 --- a/websockets/autobahn/Cargo.toml +++ b/websockets/autobahn/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "websocket-autobahn" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [[bin]] name = "websocket-autobahn-server" diff --git a/websockets/chat-actorless/Cargo.toml b/websockets/chat-actorless/Cargo.toml index 795ec395..ab804d8e 100644 --- a/websockets/chat-actorless/Cargo.toml +++ b/websockets/chat-actorless/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "websocket-chat-actorless-example" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [dependencies] actix-files.workspace = true diff --git a/websockets/chat-actorless/src/handler.rs b/websockets/chat-actorless/src/handler.rs index 864e6fdf..f3da3be9 100644 --- a/websockets/chat-actorless/src/handler.rs +++ b/websockets/chat-actorless/src/handler.rs @@ -5,8 +5,8 @@ use std::{ use actix_ws::AggregatedMessage; use futures_util::{ - future::{select, Either}, StreamExt as _, + future::{Either, select}, }; use tokio::{sync::mpsc, time::interval}; @@ -182,7 +182,7 @@ async fn process_text_msg( } else { // prefix message with our name, if assigned let msg = match name { - Some(ref name) => format!("{name}: {msg}"), + Some(name) => format!("{name}: {msg}"), None => msg.to_owned(), }; diff --git a/websockets/chat-broker/Cargo.toml b/websockets/chat-broker/Cargo.toml index 49c68af1..ed2de230 100644 --- a/websockets/chat-broker/Cargo.toml +++ b/websockets/chat-broker/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "websocket-chat-broker" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [[bin]] name = "server" diff --git a/websockets/chat-tcp/Cargo.toml b/websockets/chat-tcp/Cargo.toml index 4657e322..31a9ac45 100644 --- a/websockets/chat-tcp/Cargo.toml +++ b/websockets/chat-tcp/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "websocket-tcp-example" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [[bin]] name = "websocket-tcp-server" diff --git a/websockets/chat/Cargo.toml b/websockets/chat/Cargo.toml index a5b90ed3..b312c901 100644 --- a/websockets/chat/Cargo.toml +++ b/websockets/chat/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "websocket-example" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [[bin]] name = "websocket-chat-server" diff --git a/websockets/echo-actorless/Cargo.toml b/websockets/echo-actorless/Cargo.toml index 3059e5f2..ef1f3ee2 100644 --- a/websockets/echo-actorless/Cargo.toml +++ b/websockets/echo-actorless/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "websockets-echo-actorless-example" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [[bin]] name = "websocket-server" diff --git a/websockets/echo/Cargo.toml b/websockets/echo/Cargo.toml index c66c51db..0bac4ac1 100644 --- a/websockets/echo/Cargo.toml +++ b/websockets/echo/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "websocket" -version = "1.0.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true [[bin]] name = "websocket-server"