Stable actix

This commit is contained in:
asonix 2020-09-14 10:52:18 -05:00
parent baed90a84f
commit 2515de00c2
3 changed files with 55 additions and 101 deletions

148
Cargo.lock generated
View File

@ -1,20 +1,5 @@
# This file is automatically @generated by Cargo. # This file is automatically @generated by Cargo.
# It is not intended for manual editing. # It is not intended for manual editing.
[[package]]
name = "actix-codec"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09e55f0a5c2ca15795035d90c46bd0e73a5123b72f68f12596d6ba5282051380"
dependencies = [
"bitflags",
"bytes",
"futures-core",
"futures-sink",
"log",
"tokio",
"tokio-util 0.2.0",
]
[[package]] [[package]]
name = "actix-codec" name = "actix-codec"
version = "0.3.0" version = "0.3.0"
@ -28,7 +13,7 @@ dependencies = [
"log", "log",
"pin-project", "pin-project",
"tokio", "tokio",
"tokio-util 0.3.1", "tokio-util",
] ]
[[package]] [[package]]
@ -37,10 +22,10 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "177837a10863f15ba8d3ae3ec12fac1099099529ed20083a27fdfe247381d0dc" checksum = "177837a10863f15ba8d3ae3ec12fac1099099529ed20083a27fdfe247381d0dc"
dependencies = [ dependencies = [
"actix-codec 0.3.0", "actix-codec",
"actix-rt", "actix-rt",
"actix-service", "actix-service",
"actix-utils 2.0.0", "actix-utils",
"derive_more", "derive_more",
"either", "either",
"futures-util", "futures-util",
@ -55,10 +40,10 @@ dependencies = [
[[package]] [[package]]
name = "actix-form-data" name = "actix-form-data"
version = "0.5.0-alpha.0" version = "0.5.0"
source = "git+https://git.asonix.dog/Aardwolf/actix-form-data#eefb669e0d16f89114da9acdf4ff9c5d8cc76b00" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4693ffd29f7f9d5cc1f3d67702900f6110044169ff18d59f7063bd16dbf80bd"
dependencies = [ dependencies = [
"actix-http",
"actix-multipart", "actix-multipart",
"actix-rt", "actix-rt",
"actix-web", "actix-web",
@ -68,33 +53,33 @@ dependencies = [
"thiserror", "thiserror",
"tokio", "tokio",
"tracing", "tracing",
"tracing-futures",
] ]
[[package]] [[package]]
name = "actix-fs" name = "actix-fs"
version = "0.1.0" version = "0.1.0"
source = "git+https://git.asonix.dog/asonix/actix-fs?branch=main#80826dc5a342dd1ae1544c1bf586a4f81159686f" source = "git+https://git.asonix.dog/asonix/actix-fs?branch=main#dc37026b9f1a8016304b71af34802a1ec52a318b"
dependencies = [ dependencies = [
"actix-threadpool", "actix-threadpool",
"bytes", "bytes",
"futures", "futures",
"log",
"thiserror", "thiserror",
] ]
[[package]] [[package]]
name = "actix-http" name = "actix-http"
version = "2.0.0-beta.4" version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a10621f225411d86d5aa703da1cd11c93c0fdf4c3e07806997f6991732dc048c" checksum = "05dd80ba8f27c4a34357c07e338c8f5c38f8520e6d626ca1727d8fecc41b0cab"
dependencies = [ dependencies = [
"actix-codec 0.3.0", "actix-codec",
"actix-connect", "actix-connect",
"actix-rt", "actix-rt",
"actix-service", "actix-service",
"actix-threadpool", "actix-threadpool",
"actix-tls", "actix-tls",
"actix-utils 2.0.0", "actix-utils",
"base64", "base64",
"bitflags", "bitflags",
"brotli2", "brotli2",
@ -127,7 +112,7 @@ dependencies = [
"serde_urlencoded", "serde_urlencoded",
"sha-1", "sha-1",
"slab", "slab",
"time 0.2.18", "time 0.2.19",
] ]
[[package]] [[package]]
@ -142,12 +127,12 @@ dependencies = [
[[package]] [[package]]
name = "actix-multipart" name = "actix-multipart"
version = "0.3.0-beta.2" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dbb7d499194c11f82fb182b0be2ef2cb4335953cbe51f6fb175b152b2d5395e8" checksum = "774bfeb11b54bf9c857a005b8ab893293da4eaff79261a66a9200dab7f5ab6e3"
dependencies = [ dependencies = [
"actix-service", "actix-service",
"actix-utils 2.0.0", "actix-utils",
"actix-web", "actix-web",
"bytes", "bytes",
"derive_more", "derive_more",
@ -188,14 +173,14 @@ dependencies = [
[[package]] [[package]]
name = "actix-server" name = "actix-server"
version = "1.0.3" version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6d74b464215a473c973a2d7d03a69cc10f4ce1f4b38a7659c5193dc5c675630" checksum = "45407e6e672ca24784baa667c5d32ef109ccdd8d5e0b5ebb9ef8a67f4dfb708e"
dependencies = [ dependencies = [
"actix-codec 0.2.0", "actix-codec",
"actix-rt", "actix-rt",
"actix-service", "actix-service",
"actix-utils 1.0.6", "actix-utils",
"futures-channel", "futures-channel",
"futures-util", "futures-util",
"log", "log",
@ -251,9 +236,9 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24789b7d7361cf5503a504ebe1c10806896f61e96eca9a7350e23001aca715fb" checksum = "24789b7d7361cf5503a504ebe1c10806896f61e96eca9a7350e23001aca715fb"
dependencies = [ dependencies = [
"actix-codec 0.3.0", "actix-codec",
"actix-service", "actix-service",
"actix-utils 2.0.0", "actix-utils",
"futures-util", "futures-util",
"rustls", "rustls",
"tokio-rustls", "tokio-rustls",
@ -261,31 +246,13 @@ dependencies = [
"webpki-roots", "webpki-roots",
] ]
[[package]]
name = "actix-utils"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcf8f5631bf01adec2267808f00e228b761c60c0584cc9fa0b5364f41d147f4e"
dependencies = [
"actix-codec 0.2.0",
"actix-rt",
"actix-service",
"bitflags",
"bytes",
"either",
"futures",
"log",
"pin-project",
"slab",
]
[[package]] [[package]]
name = "actix-utils" name = "actix-utils"
version = "2.0.0" version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e9022dec56632d1d7979e59af14f0597a28a830a9c1c7fec8b2327eb9f16b5a" checksum = "2e9022dec56632d1d7979e59af14f0597a28a830a9c1c7fec8b2327eb9f16b5a"
dependencies = [ dependencies = [
"actix-codec 0.3.0", "actix-codec",
"actix-rt", "actix-rt",
"actix-service", "actix-service",
"bitflags", "bitflags",
@ -301,11 +268,11 @@ dependencies = [
[[package]] [[package]]
name = "actix-web" name = "actix-web"
version = "3.0.0-beta.4" version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbfafbef7fc52b38836bf9d976dbfa57331eb3491f46529a3b31f6b18c756007" checksum = "cd7fc56022da91a4dc00ccae7d7bb82e539749ca36df181695f4efdf5d413b2e"
dependencies = [ dependencies = [
"actix-codec 0.3.0", "actix-codec",
"actix-http", "actix-http",
"actix-macros", "actix-macros",
"actix-router", "actix-router",
@ -315,7 +282,7 @@ dependencies = [
"actix-testing", "actix-testing",
"actix-threadpool", "actix-threadpool",
"actix-tls", "actix-tls",
"actix-utils 2.0.0", "actix-utils",
"actix-web-codegen", "actix-web-codegen",
"awc", "awc",
"bytes", "bytes",
@ -334,16 +301,16 @@ dependencies = [
"serde_json", "serde_json",
"serde_urlencoded", "serde_urlencoded",
"socket2", "socket2",
"time 0.2.18", "time 0.2.19",
"tinyvec", "tinyvec",
"url", "url",
] ]
[[package]] [[package]]
name = "actix-web-codegen" name = "actix-web-codegen"
version = "0.3.0-beta.1" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df9679f5b1f4c819de08b63b0a61a131b2fdc30b367c2c208984fda8eaa07fa0" checksum = "750ca8fb60bbdc79491991650ba5d2ae7cd75f3fc00ead51390cfe9efda0d4d8"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -440,11 +407,11 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[[package]] [[package]]
name = "awc" name = "awc"
version = "2.0.0-beta.4" version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96f8e83028cb7516a0f84ec64870681521fc0ce66c860595e84948fcd3a8af3b" checksum = "150e00c06683ab44c5f97d033950e5d87a7a042d06d77f5eecb443cbd23d0575"
dependencies = [ dependencies = [
"actix-codec 0.3.0", "actix-codec",
"actix-http", "actix-http",
"actix-rt", "actix-rt",
"actix-service", "actix-service",
@ -678,7 +645,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1373a16a4937bc34efec7b391f9c1500c30b8478a701a4f44c9165cc0475a6e0" checksum = "1373a16a4937bc34efec7b391f9c1500c30b8478a701a4f44c9165cc0475a6e0"
dependencies = [ dependencies = [
"percent-encoding", "percent-encoding",
"time 0.2.18", "time 0.2.19",
"version_check", "version_check",
] ]
@ -731,9 +698,9 @@ dependencies = [
[[package]] [[package]]
name = "derive_more" name = "derive_more"
version = "0.99.9" version = "0.99.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "298998b1cf6b5b2c8a7b023dfd45821825ce3ba8a8af55c921a0e734e4653f76" checksum = "1dcfabdab475c16a93d669dddfc393027803e347d09663f524447f642fbb84ba"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -1030,7 +997,7 @@ dependencies = [
"indexmap", "indexmap",
"slab", "slab",
"tokio", "tokio",
"tokio-util 0.3.1", "tokio-util",
"tracing", "tracing",
] ]
@ -1295,11 +1262,12 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
[[package]] [[package]]
name = "miniz_oxide" name = "miniz_oxide"
version = "0.4.1" version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d7559a8a40d0f97e1edea3220f698f78b1c5ab67532e49f68fde3910323b722" checksum = "c60c0dfe32c10b43a144bad8fc83538c52f58302c92300ea7ec7bf7b38d5a7b9"
dependencies = [ dependencies = [
"adler", "adler",
"autocfg",
] ]
[[package]] [[package]]
@ -1463,7 +1431,7 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
[[package]] [[package]]
name = "pict-rs" name = "pict-rs"
version = "0.2.0-alpha.4" version = "0.2.0-alpha.5"
dependencies = [ dependencies = [
"actix-form-data", "actix-form-data",
"actix-fs", "actix-fs",
@ -1780,18 +1748,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.115" version = "1.0.116"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5" checksum = "96fe57af81d28386a513cbc6858332abc6117cfdb5999647c6444b8f43a370a5"
dependencies = [ dependencies = [
"serde_derive", "serde_derive",
] ]
[[package]] [[package]]
name = "serde_derive" name = "serde_derive"
version = "1.0.115" version = "1.0.116"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "609feed1d0a73cc36a0182a840a9b37b4a82f0b1150369f0536a9e3f2a31dc48" checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -2110,9 +2078,9 @@ dependencies = [
[[package]] [[package]]
name = "time" name = "time"
version = "0.2.18" version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12785163ae8a1cbb52a5db39af4a5baabd3fe49f07f76f952f89d7e89e5ce531" checksum = "80c1a1fd93112fc50b11c43a1def21f926be3c18884fad676ea879572da070a1"
dependencies = [ dependencies = [
"const_fn", "const_fn",
"libc", "libc",
@ -2185,20 +2153,6 @@ dependencies = [
"webpki", "webpki",
] ]
[[package]]
name = "tokio-util"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930"
dependencies = [
"bytes",
"futures-core",
"futures-sink",
"log",
"pin-project-lite",
"tokio",
]
[[package]] [[package]]
name = "tokio-util" name = "tokio-util"
version = "0.3.1" version = "0.3.1"
@ -2268,9 +2222,9 @@ dependencies = [
[[package]] [[package]]
name = "tracing-serde" name = "tracing-serde"
version = "0.1.1" version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6ccba2f8f16e0ed268fc765d9b7ff22e965e7185d32f8f1ec8294fe17d86e79" checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b"
dependencies = [ dependencies = [
"serde", "serde",
"tracing-core", "tracing-core",
@ -2278,9 +2232,9 @@ dependencies = [
[[package]] [[package]]
name = "tracing-subscriber" name = "tracing-subscriber"
version = "0.2.11" version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abd165311cc4d7a555ad11cc77a37756df836182db0d81aac908c8184c584f40" checksum = "82bb5079aa76438620837198db8a5c529fb9878c730bc2b28179b0241cf04c10"
dependencies = [ dependencies = [
"ansi_term 0.12.1", "ansi_term 0.12.1",
"chrono", "chrono",

View File

@ -1,7 +1,7 @@
[package] [package]
name = "pict-rs" name = "pict-rs"
description = "A simple image hosting service" description = "A simple image hosting service"
version = "0.2.0-alpha.4" version = "0.2.0-alpha.5"
authors = ["asonix <asonix@asonix.dog>"] authors = ["asonix <asonix@asonix.dog>"]
license = "AGPL-3.0" license = "AGPL-3.0"
readme = "README.md" readme = "README.md"
@ -16,10 +16,10 @@ ffmpeg42 = ["ffmpeg", "ffmpeg-next/ffmpeg42"]
ffmpeg = ["ffmpeg-next/codec", "ffmpeg-next/filter", "ffmpeg-next/device", "ffmpeg-next/format", "ffmpeg-next/resampling", "ffmpeg-next/postprocessing", "ffmpeg-next/software-resampling", "ffmpeg-next/software-scaling"] ffmpeg = ["ffmpeg-next/codec", "ffmpeg-next/filter", "ffmpeg-next/device", "ffmpeg-next/format", "ffmpeg-next/resampling", "ffmpeg-next/postprocessing", "ffmpeg-next/software-resampling", "ffmpeg-next/software-scaling"]
[dependencies] [dependencies]
actix-form-data = { git = "https://git.asonix.dog/Aardwolf/actix-form-data" } actix-form-data = "0.5.0"
actix-fs = { git = "https://git.asonix.dog/asonix/actix-fs", branch = "main" } actix-fs = { git = "https://git.asonix.dog/asonix/actix-fs", branch = "main" }
actix-rt = "1.1.1" actix-rt = "1.1.1"
actix-web = { version = "3.0.0-alpha.2", features = ["rustls"] } actix-web = { version = "3.0.1", default-features = false, features = ["rustls"] }
anyhow = "1.0" anyhow = "1.0"
base64 = "0.12.1" base64 = "0.12.1"
bytes = "0.5" bytes = "0.5"

View File

@ -533,7 +533,7 @@ async fn main() -> Result<(), anyhow::Error> {
); );
HttpServer::new(move || { HttpServer::new(move || {
let client = Client::build() let client = Client::builder()
.header("User-Agent", "pict-rs v0.1.0-master") .header("User-Agent", "pict-rs v0.1.0-master")
.finish(); .finish();