From bf021b0efc71d8e27b13367e7ea0ab3cea406542 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Wed, 20 Dec 2023 16:08:26 +0000 Subject: [PATCH] :t-rex: update CI to Rust `1.74` (#2027) * Update image to 1.74.0 * Clippy * ui test --- .github/workflows/ci.yml | 2 +- .github/workflows/measurements.yml | 2 +- .../ink/codegen/src/generator/as_dependency/contract_ref.rs | 4 ++-- .../fail/constructor-return-result-non-codec-error.stderr | 6 ++++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3fb46d92447..ca20534b53f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ on: - 'FILE_HEADER' env: - IMAGE: paritytech/ci-unified:bullseye-1.73.0 + IMAGE: paritytech/ci-unified:bullseye-1.74.0 CARGO_TARGET_DIR: /ci-cache/${{ github.repository }}/targets/${{ github.ref_name }}/${{ github.job }} CARGO_INCREMENTAL: 0 PURELY_STD_CRATES: ink/codegen metadata engine e2e e2e/macro ink/ir diff --git a/.github/workflows/measurements.yml b/.github/workflows/measurements.yml index 535a7ba900d..1c8d810ca65 100644 --- a/.github/workflows/measurements.yml +++ b/.github/workflows/measurements.yml @@ -14,7 +14,7 @@ jobs: run: shell: bash container: - image: paritytech/ci-unified:bullseye-1.73.0 + image: paritytech/ci-unified:bullseye-1.74.0 steps: - name: Checkout uses: actions/checkout@v4 diff --git a/crates/ink/codegen/src/generator/as_dependency/contract_ref.rs b/crates/ink/codegen/src/generator/as_dependency/contract_ref.rs index a2c026b1f91..0801345fb60 100644 --- a/crates/ink/codegen/src/generator/as_dependency/contract_ref.rs +++ b/crates/ink/codegen/src/generator/as_dependency/contract_ref.rs @@ -81,8 +81,8 @@ impl ContractRef<'_> { .storage() .attrs() .iter() - .cloned() - .filter(syn::Attribute::is_doc_attribute); + .filter(|&x| syn::Attribute::is_doc_attribute(x)) + .cloned(); let storage_ident = self.contract.module().storage().ident(); let ref_ident = self.generate_contract_ref_ident(); quote_spanned!(span=> diff --git a/crates/ink/tests/ui/contract/fail/constructor-return-result-non-codec-error.stderr b/crates/ink/tests/ui/contract/fail/constructor-return-result-non-codec-error.stderr index ba04fb8f656..4d6666c3076 100644 --- a/crates/ink/tests/ui/contract/fail/constructor-return-result-non-codec-error.stderr +++ b/crates/ink/tests/ui/contract/fail/constructor-return-result-non-codec-error.stderr @@ -15,10 +15,12 @@ note: required by a bound in `return_value` | ^^^^^^^^^^^^^ required by this bound in `return_value` error[E0277]: the trait bound `contract::Error: WrapperTypeDecode` is not satisfied - --> tests/ui/contract/fail/constructor-return-result-non-codec-error.rs:13:9 + --> tests/ui/contract/fail/constructor-return-result-non-codec-error.rs:13:33 | 13 | pub fn constructor() -> Result { - | ^^^ the trait `WrapperTypeDecode` is not implemented for `contract::Error` + | --- ^^^^^^^^^^^^^^^^^^^ the trait `WrapperTypeDecode` is not implemented for `contract::Error` + | | + | required by a bound introduced by this call | = help: the following other types implement trait `WrapperTypeDecode`: Box