chore: Update Rust to 1.58.1 (#327)

* Update to 1.58.1

* Update to new lints

* Add rust-version key to all crate manifests

* Set all crates to 2021 edition

* Test updated release workflow

* Add aggregate checks

.github/workflows/fmt.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        rust: [ '1.55.0' ]
+        rust: [ '1.58.1' ]
         os: [ ubuntu-latest ]
 
     steps:
@@ -32,3 +32,12 @@ jobs:
         run: cargo fmt --all -- --check
         env:
           RUST_BACKTRACE: 1
+  aggregate:
+    name: fmt:required
+    runs-on: ubuntu-latest
+    if: ${{ always() }}
+    needs: test
+    steps:
+      - name: Check fmt result
+        if: ${{ needs.test.result != 'success' }}
+        run: exit 1

.github/workflows/ic-ref.yml

@@ -17,7 +17,7 @@ jobs:
             ghc: '8.10.7'
             spec: 'f771c6b3e7cdde413d3b960f63165c6ecf3e0b7c'
             os: ubuntu-latest
-            rust: 1.55.0
+            rust: '1.58.1'
 
     steps:
       - uses: haskell/actions/setup@v1
@@ -145,3 +145,12 @@ jobs:
           killall ic-ref
         env:
           RUST_BACKTRACE: 1
+  aggregate:
+    name: ic-ref:required
+    runs-on: ubuntu-latest
+    if: ${{ always() }}
+    needs: test
+    steps:
+      - name: Check ic-ref result
+        if: ${{ needs.test.result != 'success' }}
+        run: exit 1

.github/workflows/icx_asset.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [ macos-latest, ubuntu-latest ]
-        rust: [ '1.55.0' ]
+        rust: [ '1.58.1' ]
         dfx: [ '0.7.2', '0.8.4' ]
 
     steps:

.github/workflows/lint.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        rust: [ '1.55.0' ]
+        rust: [ '1.58.1' ]
         os: [ ubuntu-latest ]
 
     steps:
@@ -31,3 +31,12 @@ jobs:
         run: cargo clippy --verbose --tests --benches -- -D clippy::all
         env:
           RUST_BACKTRACE: 1
+  aggregate:
+    name: lint:required
+    runs-on: ubuntu-latest
+    if: ${{ always() }}
+    needs: test
+    steps:
+      - name: Check lint result
+        if: ${{ needs.test.result != 'success' }}
+        run: exit 1

.github/workflows/release.yml

@@ -16,12 +16,12 @@ jobs:
             name: linux
             binary_path: target/x86_64-unknown-linux-musl/release
             binary_files: icx
-            rust: 1.50.0 # gmiam/rust-musl-action@master is only at 1.50.0 now
+            rust: '1.58.1'
           - os: macos-latest
             name: macos
             binary_path: target/release
             binary_files: icx
-            rust: 1.55.0
+            rust: '1.58.1'
     steps:
     - uses: actions/checkout@master
 

.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        rust: [ '1.55.0' ]
+        rust: [ '1.58.1' ]
         os: [ ubuntu-latest, macos-latest, windows-latest ]
 
     steps:
@@ -67,3 +67,12 @@ jobs:
           # information. An alternative solution here is to install GNU tar, but
           # flushing the disk cache seems to work, too.
           sudo /usr/sbin/purge
+  aggregate:
+    name: test:required
+    runs-on: ubuntu-latest
+    if: ${{ always() }}
+    needs: test
+    steps:
+      - name: Check test result
+        if: ${{ needs.test.result != 'success' }}
+        run: exit 1

ic-agent/Cargo.toml

@@ -2,7 +2,7 @@
 name = "ic-agent"
 version = "0.14.0"
 authors = ["DFINITY Stiftung <[email protected]>"]
-edition = "2018"
+edition = "2021"
 description = "Agent library to communicate with the Internet Computer, following the Public Specification."
 homepage = "https://docs.rs/ic-agent"
 documentation = "https://docs.rs/ic-agent"
@@ -11,6 +11,7 @@ readme = "README.md"
 categories = ["api-bindings", "data-structures", "no-std"]
 keywords = ["internet-computer", "agent", "icp", "dfinity"]
 include = ["src", "Cargo.toml", "../LICENSE", "README.md"]
+rust-version = "1.58.1"
 
 [dependencies]
 async-trait = "0.1.51"

ic-agent/src/agent/builder.rs

@@ -5,19 +5,11 @@ use crate::{
 use std::sync::Arc;
 
 /// A builder for an [`Agent`].
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub struct AgentBuilder {
     config: AgentConfig,
 }
 
-impl Default for AgentBuilder {
-    fn default() -> Self {
-        Self {
-            config: Default::default(),
-        }
-    }
-}
-
 impl AgentBuilder {
     /// Create an instance of [Agent] with the information from this builder.
     pub fn build(self) -> Result<Agent, AgentError> {

ic-agent/src/identity/secp256k1.rs

@@ -23,7 +23,7 @@ use simple_asn1::{
 #[derive(Clone, Debug)]
 pub struct Secp256k1Identity {
     private_key: EcKey<Private>,
-    public_key: EcKey<Public>,
+    _public_key: EcKey<Public>,
     der_encoded_public_key: Vec<u8>,
 }
 
@@ -58,7 +58,7 @@ impl Secp256k1Identity {
             to_der(&asn1_block).expect("Cannot DER encode secp256k1 public key.");
         Self {
             private_key,
-            public_key,
+            _public_key: public_key,
             der_encoded_public_key,
         }
     }
@@ -72,7 +72,7 @@ impl Identity for Secp256k1Identity {
     fn sign(&self, msg: &[u8]) -> Result<Signature, String> {
         let digest = sha256(msg);
         let ecdsa_sig = EcdsaSig::sign(&digest, &self.private_key.clone())
-            .map_err(|err| format!("Cannot create secp256k1 signature: {}", err.to_string(),))?;
+            .map_err(|err| format!("Cannot create secp256k1 signature: {}", err))?;
         let r = ecdsa_sig.r().to_vec();
         let s = ecdsa_sig.s().to_vec();
         let mut bytes = [0; 64];
@@ -186,7 +186,7 @@ N3d26cRxD99TPtm8uo2OuzKhSiq6EQ==
 
         // Assert the secp256k1 signature is valid.
         let digest = sha256(message);
-        let public_key = identity.public_key;
+        let public_key = identity._public_key;
         let success = ecdsa_sig
             .verify(&digest, &public_key)
             .expect("Cannot verify secp256k1 signature.");

ic-asset/Cargo.toml

@@ -2,7 +2,7 @@
 name = "ic-asset"
 version = "0.14.0"
 authors = ["DFINITY Stiftung <[email protected]>"]
-edition = "2018"
+edition = "2021"
 description = "Library for storing files in an asset canister."
 homepage = "https://docs.rs/ic-asset"
 documentation = "https://docs.rs/ic-asset"
@@ -11,6 +11,7 @@ readme = "README.md"
 categories = ["api-bindings", "data-structures"]
 keywords = ["internet-computer", "assets", "icp", "dfinity"]
 include = ["src", "Cargo.toml", "../LICENSE", "README.md"]
+rust-version = "1.58.1"
 
 [dependencies]
 anyhow = "1.0"

ic-identity-hsm/Cargo.toml

@@ -5,12 +5,13 @@ authors = ["DFINITY Stiftung <[email protected]>"]
 description = "Identity implementation for HSM for the ic-agent package."
 homepage = "https://docs.rs/ic-identity-hsm"
 documentation = "https://docs.rs/ic-identity-hsm"
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 readme = "README.md"
 categories = ["api-bindings", "data-structures", "no-std"]
 keywords = ["internet-computer", "agent", "utility", "icp", "dfinity"]
 include = ["src", "Cargo.toml", "../LICENSE", "README.md"]
+rust-version = "1.58.1"
 
 [dependencies]
 hex = "0.4.2"

ic-utils/Cargo.toml

@@ -2,7 +2,7 @@
 name = "ic-utils"
 version = "0.14.0"
 authors = ["DFINITY Stiftung <[email protected]>"]
-edition = "2018"
+edition = "2021"
 description = "Collection of utilities for Rust, on top of ic-agent, to communicate with the Internet Computer, following the Public Specification."
 homepage = "https://docs.rs/ic-utils"
 documentation = "https://docs.rs/ic-utils"
@@ -11,6 +11,7 @@ readme = "README.md"
 categories = ["api-bindings", "data-structures", "no-std"]
 keywords = ["internet-computer", "agent", "utility", "icp", "dfinity"]
 include = ["src", "Cargo.toml", "../LICENSE", "README.md"]
+rust-version = "1.58.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

icx-asset/Cargo.toml

@@ -2,7 +2,7 @@
 name = "icx-asset"
 version = "0.14.0"
 authors = ["DFINITY Stiftung <[email protected]>"]
-edition = "2018"
+edition = "2021"
 description = "CLI tool to manage assets on an asset canister on the Internet Computer."
 homepage = "https://docs.rs/icx-asset"
 documentation = "https://docs.rs/icx-asset"
@@ -11,6 +11,7 @@ readme = "README.md"
 categories = ["command-line-interface"]
 keywords = ["internet-computer", "agent", "icp", "dfinity", "asset"]
 include = ["src", "Cargo.toml", "../LICENSE", "README.md"]
+rust-version = "1.58.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

icx-cert/Cargo.toml

@@ -2,7 +2,7 @@
 name = "icx-cert"
 version = "0.14.0"
 authors = ["DFINITY Stiftung <[email protected]>"]
-edition = "2018"
+edition = "2021"
 description = "CLI tool to download a document from the Internet Computer and pretty-print the contents of its IC-Certificate header."
 homepage = "https://docs.rs/icx-cert"
 documentation = "https://docs.rs/icx-cert"
@@ -11,6 +11,7 @@ readme = "README.md"
 categories = ["command-line-interface"]
 keywords = ["internet-computer", "agent", "icp", "dfinity", "certificate"]
 include = ["src", "Cargo.toml", "../LICENSE", "README.md"]
+rust-version = "1.58.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

icx/Cargo.toml

@@ -2,7 +2,7 @@
 name = "icx"
 version = "0.14.0"
 authors = ["DFINITY Stiftung <[email protected]>"]
-edition = "2018"
+edition = "2021"
 description = "CLI tool to call canisters on the Internet Computer."
 homepage = "https://docs.rs/icx"
 documentation = "https://docs.rs/icx"
@@ -11,6 +11,7 @@ readme = "README.md"
 categories = ["command-line-interface", "web-programming::http-client"]
 keywords = ["internet-computer", "agent", "icp", "dfinity", "call"]
 include = ["src", "Cargo.toml", "../LICENSE", "README.md"]
+rust-version = "1.58.1"
 
 [[bin]]
 name = "icx"

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.55.0"
+channel = "1.58.1"
 components = ["rustfmt", "clippy"]