Upgade rust-toolchain to 1.75.0

.github/workflows/ci_aarch64_build_ubuntu.yaml

@@ -45,7 +45,7 @@ jobs:
     - uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.71.1
+        toolchain: 1.75.0
     - uses: actions/checkout@v3
     - run: rustup component add rustfmt
     - run: sudo apt-get update && sudo apt-get install libssl-dev pkg-config libclang-dev -y && sudo apt-get install -y gcc-multilib

.github/workflows/ci_benchmarks_ubuntu.yaml

@@ -52,7 +52,7 @@ jobs:
     - uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.71.1
+        toolchain: 1.75.0
     - run: rustup component add rustfmt
     - run: rustup component add clippy
     - run: sudo apt-get update && sudo apt-get install -y libssl-dev pkg-config libclang-dev

.github/workflows/ci_integration_tests_ubuntu.yaml

@@ -57,7 +57,7 @@ jobs:
     - uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.71.1
+        toolchain: 1.75.0
     - run: rustup component add rustfmt
     - run: rustup component add clippy
     - run: sudo apt-get update && sudo apt-get install -y libssl-dev pkg-config libclang-dev
@@ -86,7 +86,7 @@ jobs:
     - uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.71.1
+        toolchain: 1.75.0
     - run: rustup component add rustfmt
     - run: rustup component add clippy
     - run: sudo apt-get update && sudo apt-get install -y libssl-dev pkg-config libclang-dev

.github/workflows/ci_linters_ubuntu.yaml

@@ -53,7 +53,7 @@ jobs:
     - uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.71.1
+        toolchain: 1.75.0
     - uses: actions/checkout@v3
     - run: rustup component add rustfmt
     - run: cargo fmt --all -- --check

.github/workflows/ci_quick_checks_ubuntu.yaml

@@ -53,7 +53,7 @@ jobs:
     - uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.71.1
+        toolchain: 1.75.0
     - run: rustup component add rustfmt
     - uses: actions/checkout@v3
     - run: cargo fmt --all -- --check

.github/workflows/ci_unit_tests_ubuntu.yaml

@@ -53,7 +53,7 @@ jobs:
     - uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.71.1
+        toolchain: 1.75.0
     - run: sudo apt-get update && sudo apt-get install -y libssl-dev pkg-config libclang-dev
     - name: Install nextest
       uses: taiki-e/install-action@nextest

.github/workflows/package.yaml

@@ -78,7 +78,7 @@ jobs:
         name: ckb_${{env.GIT_TAG_NAME }}_${{env.REL_PKG }}.asc
         path: ckb_${{env.GIT_TAG_NAME }}_${{env.REL_PKG }}.asc
     env:
-      BUILDER_IMAGE: nervos/ckb-docker-builder:bionic-rust-1.71.1-openssl-3.1.3
+      BUILDER_IMAGE: nervos/ckb-docker-builder:bionic-rust-1.75.0
       REL_PKG: ${{ matrix.rel_pkg }}
 
   package-for-linux-aarch64:
@@ -163,7 +163,7 @@ jobs:
         name: ckb_${{env.GIT_TAG_NAME }}_${{env.REL_PKG }}.asc
         path: ckb_${{env.GIT_TAG_NAME }}_${{env.REL_PKG }}.asc
     env:
-      BUILDER_IMAGE: nervos/ckb-docker-builder:centos-7-rust-1.71.1-openssl-3.1.3
+      BUILDER_IMAGE: nervos/ckb-docker-builder:centos-7-rust-1.75.0
       REL_PKG: ${{ matrix.rel_pkg }}
 
   package-for-mac:

Cargo.toml

@@ -8,7 +8,7 @@ build = "build.rs"
 description = "CKB is the layer 1 of Nervos Network, a public/permissionless blockchain."
 homepage = "https://github.com/nervosnetwork/ckb"
 repository = "https://github.com/nervosnetwork/ckb"
-rust-version = "1.71.1"
+rust-version = "1.75.0"
 
 [build-dependencies]
 ckb-build-info = { path = "util/build-info", version = "= 0.115.0-pre" }

chain/src/tests/block_assembler.rs

@@ -175,7 +175,7 @@ fn test_block_template_message() {
             .cellbase
             .data
             .witnesses
-            .get(0)
+            .first()
             .unwrap()
             .as_bytes(),
     )

ckb-bin/Cargo.toml

@@ -9,7 +9,7 @@ homepage = "https://github.com/nervosnetwork/ckb"
 repository = "https://github.com/nervosnetwork/ckb"
 
 [dependencies]
-clap = { version = "4" }
+clap = { version = "=4.4" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0" }
 serde_plain = "0.3.0"

ckb-bin/src/subcommand/list_hashes.rs

@@ -64,7 +64,7 @@ impl TryFrom<ChainSpec> for SpecHashes {
                 cellbase
                     .outputs()
                     .into_iter()
-                    .zip(cellbase.outputs_data().into_iter())
+                    .zip(cellbase.outputs_data())
                     .skip(1),
             )
             .enumerate()

devtools/doc/rpc-gen/src/syn.rs

@@ -106,7 +106,7 @@ pub(crate) fn visit_for_types() -> Vec<(String, String)> {
     let mut finder = CommentFinder {
         type_comments: Default::default(),
         current_type: None,
-        types: vec!["JsonBytes", "IndexerRange", "PoolTransactionReject"]
+        types: ["JsonBytes", "IndexerRange", "PoolTransactionReject"]
             .iter()
             .map(|&s| s.to_owned())
             .collect(),

docker/hub/Dockerfile

@@ -1,4 +1,4 @@
-FROM nervos/ckb-docker-builder:bionic-rust-1.71.1-openssl-3.1.3 as ckb-docker-builder
+FROM nervos/ckb-docker-builder:bionic-rust-1.75.0 as ckb-docker-builder
 
 WORKDIR /ckb
 COPY ./ .

docker/hub/Dockerfile-aarch64

@@ -1,4 +1,4 @@
-FROM nervos/ckb-docker-builder:aarch64-rust-1.71.1-openssl-3.1.3 as ckb-docker-builder
+FROM nervos/ckb-docker-builder:aarch64-rust-1.75.0 as ckb-docker-builder
 
 WORKDIR /ckb
 COPY ./ .

network/src/network.rs

@@ -1124,25 +1124,20 @@ impl NetworkService {
                 }
                 start_sender.send(Ok(())).unwrap();
                 tokio::spawn(async move { p2p_service.run().await });
-                loop {
-                    tokio::select! {
-                        _ = receiver.cancelled() => {
-                            info!("NetworkService receive exit signal, start shutdown...");
-                            let _ = p2p_control.shutdown().await;
-                            // Drop senders to stop all corresponding background task
-                            drop(bg_signals);
-
-                            info!("NetworkService shutdown now");
-                            break;
-                        },
-                        else => {
-                            let _ = p2p_control.shutdown().await;
-                            // Drop senders to stop all corresponding background task
-                            drop(bg_signals);
-
-                            break;
-                        },
-                    }
+                tokio::select! {
+                    _ = receiver.cancelled() => {
+                        info!("NetworkService receive exit signal, start shutdown...");
+                        let _ = p2p_control.shutdown().await;
+                        // Drop senders to stop all corresponding background task
+                        drop(bg_signals);
+
+                        info!("NetworkService shutdown now");
+                    },
+                    else => {
+                        let _ = p2p_control.shutdown().await;
+                        // Drop senders to stop all corresponding background task
+                        drop(bg_signals);
+                    },
                 }
             });
         }

network/src/peer_registry.rs

@@ -1,4 +1,5 @@
 //! Peer registry
+use crate::network_group::Group;
 use crate::peer_store::PeerStore;
 use crate::{
     errors::{Error, PeerError},
@@ -166,13 +167,13 @@ impl PeerRegistry {
         // Group peers by network group
         let evict_group = candidate_peers
             .into_iter()
-            .fold(HashMap::new(), |mut groups, peer| {
-                groups
-                    .entry(peer.network_group())
-                    .or_insert_with(Vec::new)
-                    .push(peer);
-                groups
-            })
+            .fold(
+                HashMap::new(),
+                |mut groups: HashMap<Group, Vec<&Peer>>, peer| {
+                    groups.entry(peer.network_group()).or_default().push(peer);
+                    groups
+                },
+            )
             .values()
             .max_by_key(|group| group.len())
             .cloned()

network/src/services/dns_seeding/seed_record.rs

@@ -151,10 +151,10 @@ impl SeedRecord {
         peer_id: Option<&PeerId>,
         valid_until: u64,
     ) -> String {
-        vec![
+        [
             ip.to_string(),
             port.to_string(),
-            peer_id.map(PeerId::to_base58).unwrap_or_else(String::new),
+            peer_id.map(PeerId::to_base58).unwrap_or_default(),
             valid_until.to_string(),
         ]
         .join(&SEP.to_string())

network/src/services/dns_seeding/tests.rs

@@ -65,7 +65,7 @@ impl SeedRecord {
         sig[0..64].copy_from_slice(&signed_data[0..64]);
         sig[64] = recid.to_i32() as u8;
         let signature_string = bs58::encode(&sig[..]).into_string();
-        Ok(vec![data, signature_string].join(&SEP.to_string()))
+        Ok([data, signature_string].join(&SEP.to_string()))
     }
 }