From 4c5e11db2d7fb887b35d84f9d568c5e9e73a7180 Mon Sep 17 00:00:00 2001 From: "Aode (Lion)" Date: Thu, 21 Oct 2021 11:17:34 -0500 Subject: [PATCH 1/3] Published deps --- Cargo.lock | 6 ++++-- Cargo.toml | 8 ++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 28a7fa1..accfcdf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1948,7 +1948,8 @@ dependencies = [ [[package]] name = "tracing-actix-web" version = "0.4.0-beta.15" -source = "git+https://github.com/asonix/tracing-actix-web?branch=asonix/update-deps#1dbfa67f88e4f1fc8a1b800a8a47c606114b8334" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5d25e8e2381e03c36530607daea5663488a21a1b75db0431cf9b961e9ca8a02" dependencies = [ "actix-web", "opentelemetry", @@ -1973,7 +1974,8 @@ dependencies = [ [[package]] name = "tracing-awc" version = "0.1.0-beta.6" -source = "git+https://git.asonix.dog/asonix/tracing-awc?branch=main#282e715969b4d29b8490de1f2a6311a5e3764f7a" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf90c391b9e519449554c325aea5ebfce3d0b525f193428250b0cb5389d6e13" dependencies = [ "actix-http", "awc", diff --git a/Cargo.toml b/Cargo.toml index 4c31786..1ea86f2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,15 +50,11 @@ url = "2.2" uuid = { version = "0.8.2", features = ["v4", "serde"]} [dependencies.tracing-actix-web] -version = "0.4.0-beta.14" +version = "0.4.0-beta.15" default-features = false features = ["emit_event_on_error", "opentelemetry_0_16"] -git = "https://github.com/asonix/tracing-actix-web" -branch = "asonix/update-deps" [dependencies.tracing-awc] -version = "0.1.0-beta.4" +version = "0.1.0-beta.5" default-features = false features = ["emit_event_on_error", "opentelemetry_0_16"] -git = "https://git.asonix.dog/asonix/tracing-awc" -branch = "main" From 2b490b7465a4dff28081c94fc5beb8ad877ef716 Mon Sep 17 00:00:00 2001 From: "Aode (Lion)" Date: Thu, 21 Oct 2021 11:21:04 -0500 Subject: [PATCH 2/3] Version v0.3.0-alpha.40 --- docker/prod/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index f2ef8db..a7ac0dc 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.3' services: pictrs: - image: asonix/pictrs:v0.3.0-alpha.39 + image: asonix/pictrs:v0.3.0-alpha.40 ports: - "127.0.0.1:8080:8080" restart: always From 2295837ea4a4573dedc2650674437e80ec51e9d4 Mon Sep 17 00:00:00 2001 From: "Aode (Lion)" Date: Thu, 21 Oct 2021 16:36:31 -0500 Subject: [PATCH 3/3] 2021 --- Cargo.toml | 2 +- src/middleware.rs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1ea86f2..da43384 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ authors = ["asonix "] license = "AGPL-3.0" readme = "README.md" repository = "https://git.asonix.dog/asonix/pict-rs" -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [features] diff --git a/src/middleware.rs b/src/middleware.rs index 47dbd28..3c08eff 100644 --- a/src/middleware.rs +++ b/src/middleware.rs @@ -113,7 +113,6 @@ where .headers() .get("X-Request-Deadline") .and_then(|deadline| { - use std::convert::TryInto; let deadline = time::OffsetDateTime::from_unix_timestamp_nanos( deadline.to_str().ok()?.parse().ok()?, )