Skip to content

Commit d0dcbca

Browse files
authored
Upgrade rust-toolchain from 1.85.0 to 1.92.0 (#4993)
<!-- Thank you for contributing to nervosnetwork/ckb! If you haven't already, please read [CONTRIBUTING](https://github.com/nervosnetwork/ckb/blob/develop/CONTRIBUTING.md) document. If you're unsure about anything, just ask; somebody should be along to answer within a day or two. PR Title Format: 1. module [, module2, module3]: what's changed 2. *: what's changed --> ### What problem does this PR solve? Wait nervosnetwork/ckb-docker-builder#34 ### Related changes - Upgrade rust toolchain from 1.85.0 to 1.91.0 ### Check List <!--REMOVE the items that are not applicable--> Tests <!-- At least one of them must be included. --> - Unit test - Integration test - Manual test (add detailed scripts or steps below) - No code ci-runs-only: [ quick_checks,linters ] Side effects - Performance regression - Breaking backward compatibility ### Release note <!-- Choose from None, Title Only and Note. Bugfixes or new features need a release note. --> ```release-note Title Only: Include only the PR title in the release note. ``` --------- Signed-off-by: Eval EXEC <execvy@gmail.com>
1 parent ab8798f commit d0dcbca

File tree

111 files changed

+815
-826
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+815
-826
lines changed

.github/workflows/ci_aarch64_build_ubuntu.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
ci-aarch64-cargo-
3939
- uses: dtolnay/rust-toolchain@master
4040
with:
41-
toolchain: 1.85.0
41+
toolchain: 1.92.0
4242
components: rustfmt
4343
- run: sudo apt-get update && sudo apt-get install -y libssl-dev pkg-config libclang-dev build-essential
4444
- name: Build for aarch64

.github/workflows/ci_benchmarks_ubuntu.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
sudo docker image prune --all --force
2929
- uses: dtolnay/rust-toolchain@master
3030
with:
31-
toolchain: 1.85.0
31+
toolchain: 1.92.0
3232
components: rustfmt, clippy
3333
- run: sudo apt-get update && sudo apt-get install -y libssl-dev pkg-config libclang-dev build-essential
3434
- uses: actions/checkout@v4

.github/workflows/ci_integration_tests_ubuntu.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
sudo docker image prune --all --force
3232
- uses: dtolnay/rust-toolchain@master
3333
with:
34-
toolchain: 1.85.0
34+
toolchain: 1.92.0
3535
components: rustfmt, clippy
3636
- run: sudo apt-get update && sudo apt-get install -y libssl-dev pkg-config libclang-dev build-essential tor
3737
- uses: actions/setup-go@v6
@@ -84,7 +84,7 @@ jobs:
8484
sudo docker image prune --all --force
8585
- uses: dtolnay/rust-toolchain@master
8686
with:
87-
toolchain: 1.85.0
87+
toolchain: 1.92.0
8888
components: rustfmt, clippy
8989
- run: sudo apt-get update && sudo apt-get install -y libssl-dev pkg-config libclang-dev build-essential procps wget
9090
- uses: actions/checkout@v4

.github/workflows/ci_linters_ubuntu.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- uses: actions/checkout@v4
3131
- uses: dtolnay/rust-toolchain@master
3232
with:
33-
toolchain: 1.85.0
33+
toolchain: 1.92.0
3434
components: rustfmt, clippy
3535
- uses: actions/setup-go@v6
3636
with:

.github/workflows/ci_quick_checks_ubuntu.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
sudo docker image prune --all --force
3030
- uses: dtolnay/rust-toolchain@master
3131
with:
32-
toolchain: 1.85.0
32+
toolchain: 1.92.0
3333
components: rustfmt, clippy
3434
- uses: actions/setup-go@v6
3535
with:

.github/workflows/ci_unit_tests_ubuntu.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
sudo docker image prune --all --force
3030
- uses: dtolnay/rust-toolchain@master
3131
with:
32-
toolchain: 1.85.0
32+
toolchain: 1.92.0
3333
- run: sudo apt-get update && sudo apt-get install -y libssl-dev pkg-config libclang-dev build-essential
3434
- name: Install nextest
3535
uses: taiki-e/install-action@nextest

.github/workflows/coverage_report.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@v4
1717
- uses: dtolnay/rust-toolchain@master
1818
with:
19-
toolchain: 1.85.0
19+
toolchain: 1.92.0
2020
components: rustfmt,llvm-tools-preview
2121
- run: sudo apt-get update && sudo apt-get install libssl-dev pkg-config libclang-dev -y && sudo apt-get install -y gcc-multilib build-essential
2222
- name: unit coverage

.github/workflows/package.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
name: ckb_${{env.GIT_TAG_NAME }}_${{env.REL_PKG }}.asc
9494
path: ckb_${{env.GIT_TAG_NAME }}_${{env.REL_PKG }}.asc
9595
env:
96-
BUILDER_IMAGE: nervos/ckb-docker-builder:bionic-rust-1.85.0
96+
BUILDER_IMAGE: nervos/ckb-docker-builder:bionic-rust-1.92.0
9797
REL_PKG: ${{ matrix.rel_pkg }}
9898
CKB_CLI_VERSION: ${{ needs.get-ckb-cli-version.outputs.version }}
9999

@@ -181,7 +181,7 @@ jobs:
181181
name: ckb_${{env.GIT_TAG_NAME }}_${{env.REL_PKG }}.asc
182182
path: ckb_${{env.GIT_TAG_NAME }}_${{env.REL_PKG }}.asc
183183
env:
184-
BUILDER_IMAGE: nervos/ckb-docker-builder:centos-7-rust-1.85.0
184+
BUILDER_IMAGE: nervos/ckb-docker-builder:centos-7-rust-1.92.0
185185
REL_PKG: ${{ matrix.rel_pkg }}
186186
CKB_CLI_VERSION: ${{ needs.get-ckb-cli-version.outputs.version }}
187187

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ build = "build.rs"
88
description = "CKB is the layer 1 of Nervos Network, a public/permissionless blockchain"
99
homepage = "https://github.com/nervosnetwork/ckb"
1010
repository = "https://github.com/nervosnetwork/ckb"
11-
rust-version = "1.85.0"
11+
rust-version = "1.92.0"
1212
default-run = "ckb"
1313

1414
[[bin]]

chain/src/chain_controller.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! CKB chain controller.
22
#![allow(missing_docs)]
3-
#![allow(elided_named_lifetimes)]
3+
#![allow(mismatched_lifetime_syntaxes)]
44

55
use crate::utils::orphan_block_pool::OrphanBlockPool;
66
use crate::{LonelyBlock, ProcessBlockRequest, RemoteBlock, TruncateRequest, VerifyResult};

0 commit comments

Comments
 (0)