From 8f50716fe794b0dd3ca9c6defa91f1d7e235f811 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Mar 2023 14:24:11 +0000 Subject: [PATCH] build(deps): bump pin-project from 0.4.30 to 1.0.12 (#6222) * build(deps): bump pin-project from 0.4.30 to 1.0.12 Bumps [pin-project](https://github.com/taiki-e/pin-project) from 0.4.30 to 1.0.12. - [Release notes](https://github.com/taiki-e/pin-project/releases) - [Changelog](https://github.com/taiki-e/pin-project/blob/main/CHANGELOG.md) - [Commits](https://github.com/taiki-e/pin-project/compare/v0.4.30...v1.0.12) --- updated-dependencies: - dependency-name: pin-project dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Change macro arguments as specified in pin_project's 1.0.0 changelog --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: teor Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- Cargo.lock | 38 +++++++++--------------------------- deny.toml | 3 --- tower-fallback/Cargo.toml | 2 +- tower-fallback/src/future.rs | 5 +---- 4 files changed, 11 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7cc9658b..f4c9a9cc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2908,33 +2908,13 @@ dependencies = [ "indexmap", ] -[[package]] -name = "pin-project" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef0f924a5ee7ea9cbcea77529dba45f8a9ba9f622419fe3386ca581a3ae9d5a" -dependencies = [ - "pin-project-internal 0.4.30", -] - [[package]] name = "pin-project" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" dependencies = [ - "pin-project-internal 1.0.12", -] - -[[package]] -name = "pin-project-internal" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "851c8d0ce9bebe43790dedfc86614c23494ac9f423dd618d3a61fc693eafe61e" -dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.20", - "syn 1.0.104", + "pin-project-internal", ] [[package]] @@ -4492,7 +4472,7 @@ dependencies = [ "hyper", "hyper-timeout", "percent-encoding", - "pin-project 1.0.12", + "pin-project", "prost", "prost-derive", "tokio", @@ -4528,7 +4508,7 @@ dependencies = [ "futures-util", "hdrhistogram", "indexmap", - "pin-project 1.0.12", + "pin-project", "pin-project-lite", "rand 0.8.5", "slab", @@ -4547,7 +4527,7 @@ dependencies = [ "ed25519-zebra", "futures", "futures-core", - "pin-project 1.0.12", + "pin-project", "rand 0.8.5", "rayon", "tinyvec", @@ -4568,7 +4548,7 @@ name = "tower-fallback" version = "0.2.36" dependencies = [ "futures-core", - "pin-project 0.4.30", + "pin-project", "tokio", "tower", "tracing", @@ -4613,7 +4593,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4546773ffeab9e4ea02b8872faa49bb616a80a7da66afc2f32688943f97efa7" dependencies = [ "futures-util", - "pin-project 1.0.12", + "pin-project", "tokio", "tokio-test", "tower-layer", @@ -4692,7 +4672,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project 1.0.12", + "pin-project", "tracing", ] @@ -5587,7 +5567,7 @@ dependencies = [ "lazy_static", "metrics", "ordered-map", - "pin-project 1.0.12", + "pin-project", "proptest", "proptest-derive", "rand 0.8.5", @@ -5765,7 +5745,7 @@ dependencies = [ "metrics-exporter-prometheus", "num-integer", "once_cell", - "pin-project 1.0.12", + "pin-project", "proptest", "proptest-derive", "prost", diff --git a/deny.toml b/deny.toml index 34d8103f..4498a512 100644 --- a/deny.toml +++ b/deny.toml @@ -35,9 +35,6 @@ skip = [ # dependencies starting at the specified crate, up to a certain depth, which is # by default infinite skip-tree = [ - # ticket #3000: upgrade tower-fallback dependencies - { name = "pin-project", version = "=0.4.30" }, - # wait for ordered-map to release a dependency fix { name = "ordered-map", version = "=0.4.2" }, diff --git a/tower-fallback/Cargo.toml b/tower-fallback/Cargo.toml index bb1ec8a3..3e769fd6 100644 --- a/tower-fallback/Cargo.toml +++ b/tower-fallback/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT" edition = "2021" [dependencies] -pin-project = "0.4.29" +pin-project = "1.0.12" tower = "0.4.13" futures-core = "0.3.26" tracing = "0.1.37" diff --git a/tower-fallback/src/future.rs b/tower-fallback/src/future.rs index dbbea911..aecf08ee 100644 --- a/tower-fallback/src/future.rs +++ b/tower-fallback/src/future.rs @@ -1,8 +1,5 @@ //! Future types for the `Fallback` middleware. -// TODO: remove this lint exception after upgrading to pin-project 1.0.11 or later (#2355) -#![allow(dead_code)] - use std::{ fmt::Debug, future::Future, @@ -29,7 +26,7 @@ where state: ResponseState, } -#[pin_project(project_replace, project = ResponseStateProj)] +#[pin_project(project_replace = __ResponseStateProjectionOwned, project = ResponseStateProj)] enum ResponseState where S1: Service,