🦖 update CI to Rust 1.74 (use-ink#2027)

* Update image to 1.74.0 * Clippy * ui test
agryaznov · Dec 20, 2023 · bf021b0 · bf021b0
1 parent 8e5776a
commit bf021b0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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<Self, Error> {
-   |         ^^^ 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<T>