From c445615c47834fe5e784ffd6512da59fe069c51c Mon Sep 17 00:00:00 2001 From: "Aode (lion)" Date: Sun, 12 Dec 2021 14:48:37 -0600 Subject: [PATCH] Update to latest betas --- Cargo.lock | 96 +++++++++++++++++++++++++--------------------------- Cargo.toml | 5 ++- src/range.rs | 5 +-- 3 files changed, 52 insertions(+), 54 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fdd52e9..602801e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -37,9 +37,9 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.0.0-beta.14" +version = "3.0.0-beta.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "055b723746f19534fc5c9a210788686542986d6f1b9cb2900a297bb4c6619f3b" +checksum = "a1ff7b149cc1b99967c22cb81c2c31f128ac88ed12bbf80c29c55a7511d46edb" dependencies = [ "actix-codec", "actix-rt", @@ -83,9 +83,9 @@ dependencies = [ [[package]] name = "actix-multipart" -version = "0.4.0-beta.9" +version = "0.4.0-beta.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae01eeef2fdfd9df63d5124e35ff0968988cb0a2f24460ff005425de903d4f4f" +checksum = "62e33c01e2b0806580b90f4563f44ae25b84fdc0cc2aa3923f514cec316231e6" dependencies = [ "actix-utils", "actix-web", @@ -110,7 +110,7 @@ dependencies = [ "http", "log", "regex", - "serde 1.0.130", + "serde 1.0.131", ] [[package]] @@ -157,9 +157,9 @@ dependencies = [ [[package]] name = "actix-tls" -version = "3.0.0-rc.1" +version = "3.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a78e066ef965e3501b0710f0722d0741e025b09e01f1af13afba0774efc2f40" +checksum = "bcebfd4a6255a2a75b7b87c1a3a723c57f08293ca9a7fade692e94515585f7a6" dependencies = [ "actix-codec", "actix-rt", @@ -187,9 +187,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.0.0-beta.13" +version = "4.0.0-beta.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657eb2ed5e8ef246b6e951bafb38644ca433042a65a44f02e5601083b71b895" +checksum = "9387ea044357f12b606b8fad0652d3804ba498954f66ae5c677236cb0bd47db4" dependencies = [ "actix-codec", "actix-http", @@ -216,7 +216,7 @@ dependencies = [ "paste", "pin-project-lite", "regex", - "serde 1.0.130", + "serde 1.0.131", "serde_json", "serde_urlencoded", "smallvec", @@ -227,9 +227,9 @@ dependencies = [ [[package]] name = "actix-web-codegen" -version = "0.5.0-beta.5" +version = "0.5.0-beta.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfe80a8828fa88a0420dc8fdd4c16b8207326c917f17701881b063eadc2a8d3b" +checksum = "30a90b7f6c2fde9a1fe3df4da758c2c3c9d620dfa3eae4da0b6925dc0a13444a" dependencies = [ "actix-router", "proc-macro2", @@ -307,9 +307,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.51" +version = "0.1.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e" +checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" dependencies = [ "proc-macro2", "quote", @@ -335,9 +335,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "awc" -version = "3.0.0-beta.12" +version = "3.0.0-beta.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9fef22345ed9fc111adf13c3b1e48473136a2669a73680b82d18d6e71e720fe" +checksum = "26d6c84166873707ee2e689d14aebf5eacf1629c45f8f3f5c0fd3638038c3044" dependencies = [ "actix-codec", "actix-http", @@ -361,7 +361,7 @@ dependencies = [ "pin-project-lite", "rand", "rustls", - "serde 1.0.130", + "serde 1.0.131", "serde_json", "serde_urlencoded", "tokio", @@ -375,7 +375,7 @@ dependencies = [ "anyhow", "dirs", "rust-ini 0.17.0", - "serde 1.0.130", + "serde 1.0.131", "serde-xml-rs", "serde_derive", "url", @@ -487,7 +487,7 @@ dependencies = [ "lazy_static", "nom", "rust-ini 0.13.0", - "serde 1.0.130", + "serde 1.0.131", "serde-hjson", "serde_json", "toml", @@ -630,9 +630,9 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "encoding_rs" -version = "0.8.29" +version = "0.8.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746" +checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df" dependencies = [ "cfg-if", ] @@ -796,9 +796,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fd819562fcebdac5afc5c113c3ec36f902840b70fd4fc458799c8ce4607ae55" +checksum = "8f072413d126e57991455e0a922b31e4c8ba7c2ffbebf6b78b4f8521397d65cd" dependencies = [ "bytes", "fnv", @@ -898,9 +898,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.15" +version = "0.14.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436ec0091e4f20e655156a30a0df3770fe2900aa301e548e08446ec794b6953c" +checksum = "b7ec3e62bdc98a2f0393a5048e4c30ef659440ea6e0e572965103e72bd836f55" dependencies = [ "bytes", "futures-channel", @@ -1042,9 +1042,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.109" +version = "0.2.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98a04dce437184842841303488f70d0188c5f51437d2a834dc097eafa909a01" +checksum = "8e167738f1866a7ec625567bae89ca0d44477232a4f7c52b1c7f2adc2c98804f" [[package]] name = "linked-hash-map" @@ -1347,7 +1347,7 @@ dependencies = [ [[package]] name = "pict-rs" -version = "0.3.0-beta.11" +version = "0.3.0-beta.12" dependencies = [ "actix-form-data", "actix-rt", @@ -1368,7 +1368,7 @@ dependencies = [ "pin-project-lite", "reqwest", "rust-s3", - "serde 1.0.130", + "serde 1.0.131", "serde_json", "sha2", "sled", @@ -1640,7 +1640,7 @@ dependencies = [ "pin-project-lite", "rustls", "rustls-pemfile", - "serde 1.0.130", + "serde 1.0.131", "serde_json", "serde_urlencoded", "tokio", @@ -1714,7 +1714,7 @@ dependencies = [ "md5", "percent-encoding", "reqwest", - "serde 1.0.130", + "serde 1.0.131", "serde-xml-rs", "serde_derive", "sha2", @@ -1755,9 +1755,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c9613b5a66ab9ba26415184cfc41156594925a9cf3a2057e57f31ff145f6568" +checksum = "b30e4c09749c107e83dd61baf9604198efc4542863c88af39dafcaca89c7c9f9" [[package]] name = "scoped-tls" @@ -1795,9 +1795,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" [[package]] name = "serde" -version = "1.0.130" +version = "1.0.131" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" +checksum = "b4ad69dfbd3e45369132cc64e6748c2d65cdfb001a2b1c232d128b4ad60561c1" dependencies = [ "serde_derive", ] @@ -1821,16 +1821,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65162e9059be2f6a3421ebbb4fef3e74b7d9e7c60c50a0e292c6239f19f1edfa" dependencies = [ "log", - "serde 1.0.130", + "serde 1.0.131", "thiserror", "xml-rs", ] [[package]] name = "serde_derive" -version = "1.0.130" +version = "1.0.131" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" +checksum = "b710a83c4e0dff6a3d511946b95274ad9ca9e5d3ae497b63fda866ac955358d2" dependencies = [ "proc-macro2", "quote", @@ -1845,7 +1845,7 @@ checksum = "d0ffa0837f2dfa6fb90868c2b5468cad482e175f7dad97e7421951e663f2b527" dependencies = [ "itoa", "ryu", - "serde 1.0.130", + "serde 1.0.131", ] [[package]] @@ -1857,7 +1857,7 @@ dependencies = [ "form_urlencoded", "itoa", "ryu", - "serde 1.0.130", + "serde 1.0.131", ] [[package]] @@ -2081,7 +2081,7 @@ checksum = "41effe7cfa8af36f439fac33861b66b049edc6f9a32331e2312660529c1c24ad" dependencies = [ "itoa", "libc", - "serde 1.0.130", + "serde 1.0.131", ] [[package]] @@ -2195,7 +2195,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" dependencies = [ - "serde 1.0.130", + "serde 1.0.131", ] [[package]] @@ -2290,8 +2290,7 @@ dependencies = [ [[package]] name = "tracing-actix-web" version = "0.5.0-beta.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a90ef8ed903a84ce2c0cf35bd2896e55e22eaa5e2b49c4f16167f4615bb204ac" +source = "git+https://github.com/asonix/tracing-actix-web?branch=riley/beta.14#1abbda4ed0229552bcfd6a7ce7da0e3de5d89d41" dependencies = [ "actix-web", "opentelemetry", @@ -2315,9 +2314,8 @@ dependencies = [ [[package]] name = "tracing-awc" -version = "0.1.0-beta.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b402c6fc9569204780e01c02ade7eb4e7bec4452cd95a0adf281803e069e37b7" +version = "0.1.0-beta.14" +source = "git+https://git.asonix.dog/asonix/tracing-awc#4898546aa1bebb00577b6fecf5dae025613f9d09" dependencies = [ "actix-http", "actix-service", @@ -2478,7 +2476,7 @@ dependencies = [ "idna", "matches", "percent-encoding", - "serde 1.0.130", + "serde 1.0.131", ] [[package]] @@ -2488,7 +2486,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ "getrandom", - "serde 1.0.130", + "serde 1.0.131", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 94d1e58..500f69b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pict-rs" description = "A simple image hosting service" -version = "0.3.0-beta.11" +version = "0.3.0-beta.12" authors = ["asonix "] license = "AGPL-3.0" readme = "README.md" @@ -58,8 +58,11 @@ uuid = { version = "0.8.2", features = ["v4", "serde"] } version = "0.5.0-beta.3" default-features = false features = ["emit_event_on_error", "opentelemetry_0_16"] +git = "https://github.com/asonix/tracing-actix-web" +branch = "riley/beta.14" [dependencies.tracing-awc] version = "0.1.0-beta.10" default-features = false features = ["emit_event_on_error", "opentelemetry_0_16"] +git = "https://git.asonix.dog/asonix/tracing-awc" diff --git a/src/range.rs b/src/range.rs index 5467b06..43c9902 100644 --- a/src/range.rs +++ b/src/range.rs @@ -4,10 +4,7 @@ use crate::{ }; use actix_web::{ dev::Payload, - http::{ - header::{ContentRange, ContentRangeSpec}, - HeaderValue, - }, + http::header::{ContentRange, ContentRangeSpec, HeaderValue}, web::Bytes, FromRequest, HttpRequest, };