From 1eb546758091719241142e525e19611e2f9e593c Mon Sep 17 00:00:00 2001 From: Yoh Deadfall Date: Mon, 24 Feb 2025 18:02:37 +0300 Subject: [PATCH] Updated expected UI test outputs --- .../tests/todo/busted-exotic-signature.stderr | 2 +- .../tests/todo/composite-types-broken-on-spi.stderr | 8 ++++---- pgrx-tests/tests/todo/for-dog-in-dogs.stderr | 12 ++++++------ pgrx-tests/tests/todo/roundtrip-tests.stderr | 13 +++---------- ...ec-option-composite_type-nesting-problems.stderr | 2 +- 5 files changed, 15 insertions(+), 22 deletions(-) diff --git a/pgrx-tests/tests/todo/busted-exotic-signature.stderr b/pgrx-tests/tests/todo/busted-exotic-signature.stderr index 9ae0dacdd3..2853b707a7 100644 --- a/pgrx-tests/tests/todo/busted-exotic-signature.stderr +++ b/pgrx-tests/tests/todo/busted-exotic-signature.stderr @@ -5,7 +5,7 @@ error[E0277]: the trait bound `Vec>>: Ar | ------------ in this procedural macro expansion 11 | fn exotic_signature( 12 | _cats: pgrx::default!( - | ^^^^^ the trait `ArgAbi<'_>` is not implemented for `Vec>>`, which is required by `Option>>>: ArgAbi<'_>` + | ^^^^^ the trait `ArgAbi<'_>` is not implemented for `Vec>>` | = help: the following other types implement trait `ArgAbi<'fcx>`: Vec> diff --git a/pgrx-tests/tests/todo/composite-types-broken-on-spi.stderr b/pgrx-tests/tests/todo/composite-types-broken-on-spi.stderr index d344d5f17b..47653dcec6 100644 --- a/pgrx-tests/tests/todo/composite-types-broken-on-spi.stderr +++ b/pgrx-tests/tests/todo/composite-types-broken-on-spi.stderr @@ -45,7 +45,7 @@ error[E0277]: the trait bound `Vec>>, - | ^^^^ the trait `ArgAbi<'_>` is not implemented for `Vec>>`, which is required by `Option>>>: ArgAbi<'_>` + | ^^^^ the trait `ArgAbi<'_>` is not implemented for `Vec>>` | = help: the following other types implement trait `ArgAbi<'fcx>`: Vec> @@ -66,7 +66,7 @@ error[E0277]: `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` | ^^^^ `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` is not an iterator | = help: the trait `IntoIterator` is not implemented for `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` - = help: the trait `IntoIterator` is implemented for `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` + but trait `IntoIterator` is implemented for it error[E0277]: `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` is not an iterator --> tests/todo/composite-types-broken-on-spi.rs:145:20 @@ -75,7 +75,7 @@ error[E0277]: `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` | ^^^^ `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` is not an iterator | = help: the trait `IntoIterator` is not implemented for `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` - = help: the trait `IntoIterator` is implemented for `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` + but trait `IntoIterator` is implemented for it error[E0277]: `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` is not an iterator --> tests/todo/composite-types-broken-on-spi.rs:162:20 @@ -84,7 +84,7 @@ error[E0277]: `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` | ^^^^ `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` is not an iterator | = help: the trait `IntoIterator` is not implemented for `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` - = help: the trait `IntoIterator` is implemented for `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` + but trait `IntoIterator` is implemented for it error[E0308]: mismatched types --> tests/todo/composite-types-broken-on-spi.rs:11:5 diff --git a/pgrx-tests/tests/todo/for-dog-in-dogs.stderr b/pgrx-tests/tests/todo/for-dog-in-dogs.stderr index 3d825ce7aa..78c5ff77a5 100644 --- a/pgrx-tests/tests/todo/for-dog-in-dogs.stderr +++ b/pgrx-tests/tests/todo/for-dog-in-dogs.stderr @@ -5,7 +5,7 @@ error[E0277]: `pgrx::VariadicArray<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::Allo | ^^^^ `pgrx::VariadicArray<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` is not an iterator | = help: the trait `IntoIterator` is not implemented for `pgrx::VariadicArray<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` - = help: the trait `IntoIterator` is implemented for `pgrx::VariadicArray<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` + but trait `IntoIterator` is implemented for it error[E0277]: `pgrx::VariadicArray<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` is not an iterator --> tests/todo/for-dog-in-dogs.rs:32:16 @@ -14,7 +14,7 @@ error[E0277]: `pgrx::VariadicArray<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::Allo | ^^^^ `pgrx::VariadicArray<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` is not an iterator | = help: the trait `IntoIterator` is not implemented for `pgrx::VariadicArray<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` - = help: the trait `IntoIterator` is implemented for `pgrx::VariadicArray<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` + but trait `IntoIterator` is implemented for it error[E0277]: `pgrx::VariadicArray<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` is not an iterator --> tests/todo/for-dog-in-dogs.rs:48:16 @@ -23,7 +23,7 @@ error[E0277]: `pgrx::VariadicArray<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::Allo | ^^^^ `pgrx::VariadicArray<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` is not an iterator | = help: the trait `IntoIterator` is not implemented for `pgrx::VariadicArray<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` - = help: the trait `IntoIterator` is implemented for `pgrx::VariadicArray<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` + but trait `IntoIterator` is implemented for it error[E0277]: `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` is not an iterator --> tests/todo/for-dog-in-dogs.rs:65:16 @@ -32,7 +32,7 @@ error[E0277]: `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` | ^^^^ `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` is not an iterator | = help: the trait `IntoIterator` is not implemented for `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` - = help: the trait `IntoIterator` is implemented for `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` + but trait `IntoIterator` is implemented for it error[E0277]: `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` is not an iterator --> tests/todo/for-dog-in-dogs.rs:85:16 @@ -41,7 +41,7 @@ error[E0277]: `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` | ^^^^ `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` is not an iterator | = help: the trait `IntoIterator` is not implemented for `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` - = help: the trait `IntoIterator` is implemented for `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` + but trait `IntoIterator` is implemented for it error[E0277]: `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` is not an iterator --> tests/todo/for-dog-in-dogs.rs:102:16 @@ -50,4 +50,4 @@ error[E0277]: `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` | ^^^^ `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` is not an iterator | = help: the trait `IntoIterator` is not implemented for `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` - = help: the trait `IntoIterator` is implemented for `Array<'_, pgrx::prelude::PgHeapTuple<'_, pgrx::AllocatedByRust>>` + but trait `IntoIterator` is implemented for it diff --git a/pgrx-tests/tests/todo/roundtrip-tests.stderr b/pgrx-tests/tests/todo/roundtrip-tests.stderr index 9faaeae973..f18531cb76 100644 --- a/pgrx-tests/tests/todo/roundtrip-tests.stderr +++ b/pgrx-tests/tests/todo/roundtrip-tests.stderr @@ -58,7 +58,6 @@ error[E0277]: the trait bound `Vec>: ArgAbi<'_>` is not satisfied 54 | | test_rt_array_bytea, 55 | | Vec>, ... | -63 | | ] 64 | | ); | |_____- in this macro invocation | @@ -88,7 +87,6 @@ error[E0277]: the trait bound `Vec>: FromDatum` is not satisfied 54 | | test_rt_array_bytea, 55 | | Vec>, ... | -63 | | ] 64 | | ); | |_____- in this macro invocation | @@ -103,7 +101,7 @@ note: required by a bound in `pgrx::Spi::get_one_with_args` | ^^^^^^^^^ required by this bound in `Spi::get_one_with_args` = note: this error originates in the macro `roundtrip_test` which comes from the expansion of the macro `roundtrip` (in Nightly builds, run with -Z macro-backtrace for more info) -error[E0277]: the trait bound `Vec>: FromDatum` is not satisfied +error[E0284]: type annotations needed: cannot satisfy `for<'arr> as UnboxDatum>::As<'arr> == Option<&str>` --> tests/todo/roundtrip-tests.rs:36:38 | 36 | let result: $rtype = Spi::get_one_with_args( @@ -111,7 +109,7 @@ error[E0277]: the trait bound `Vec>: FromDatum` is not satisfied 37 | | &format!("SELECT {}($1)", stringify!(tests.$fname)), 38 | | &[value.into()], 39 | | )? - | |_________________^ the trait `FromDatum` is not implemented for `Vec>` + | |_________________^ cannot satisfy `for<'arr> as UnboxDatum>::As<'arr> == Option<&str>` ... 66 | / roundtrip!( 67 | | rt_array_refstr, @@ -121,10 +119,7 @@ error[E0277]: the trait bound `Vec>: FromDatum` is not satisfied 71 | | ); | |_____- in this macro invocation | - = help: the following other types implement trait `FromDatum`: - Vec> - Vec - Vec + = note: required for `Vec>` to implement `FromDatum` note: required by a bound in `pgrx::Spi::get_one_with_args` --> $WORKSPACE/pgrx/src/spi.rs | @@ -143,7 +138,6 @@ error[E0277]: the trait bound `Vec>: ArgAbi<'_>` is not satisfied 75 | | test_rt_array_cstr, 76 | | Vec>, ... | -84 | | ] 85 | | ); | |_____- in this macro invocation | @@ -173,7 +167,6 @@ error[E0277]: the trait bound `Vec>: FromDatum` is not satisfied 75 | | test_rt_array_cstr, 76 | | Vec>, ... | -84 | | ] 85 | | ); | |_____- in this macro invocation | diff --git a/pgrx-tests/tests/todo/vec-option-composite_type-nesting-problems.stderr b/pgrx-tests/tests/todo/vec-option-composite_type-nesting-problems.stderr index db0d11388b..13e5ad01ff 100644 --- a/pgrx-tests/tests/todo/vec-option-composite_type-nesting-problems.stderr +++ b/pgrx-tests/tests/todo/vec-option-composite_type-nesting-problems.stderr @@ -45,7 +45,7 @@ error[E0277]: the trait bound `Vec>>, - | ^^^^ the trait `ArgAbi<'_>` is not implemented for `Vec>>`, which is required by `Option>>>: ArgAbi<'_>` + | ^^^^ the trait `ArgAbi<'_>` is not implemented for `Vec>>` | = help: the following other types implement trait `ArgAbi<'fcx>`: Vec>