Skip to content

Commit 3cb849b

Browse files
committed
Depend on rust 1.65.0
scale-info v2.4.0 fails to compile with: error[E0658]: `let...else` statements are unstable --> /Users/runner/.cargo/registry/src/github.com-1ecc6299db9ec823/scale-info-2.4.0/src/portable.rs:124:17 | 124 | / let Some(ty) = param.ty() else { 125 | | continue 126 | | }; | |__________________^ | = note: see issue #87335 <rust-lang/rust#87335> for more information Signed-off-by: Sean Young <[email protected]>
1 parent 5d0fe58 commit 3cb849b

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
with:
1717
submodules: recursive
1818
- name: Rust stable
19-
run: rustup default 1.64.0
19+
run: rustup default 1.65.0
2020
- name: Build
2121
run: cargo build --verbose --release
2222
- name: Run tests
@@ -40,7 +40,7 @@ jobs:
4040
with:
4141
submodules: recursive
4242
- name: Rust stable
43-
run: rustup default 1.64.0
43+
run: rustup default 1.65.0
4444
- name: Build
4545
run: cargo build --verbose --release
4646
- name: Run tests
@@ -67,7 +67,7 @@ jobs:
6767
run: unzip c:\llvm.zip -d c:/
6868
- name: Add LLVM to Path
6969
run: echo "c:\llvm15.0\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8
70-
- uses: dtolnay/rust-toolchain@1.64.0
70+
- uses: dtolnay/rust-toolchain@1.65.0
7171
with:
7272
components: clippy
7373
- name: Build
@@ -91,7 +91,7 @@ jobs:
9191
uses: actions/checkout@v3
9292
with:
9393
submodules: recursive
94-
- uses: dtolnay/rust-toolchain@1.64.0
94+
- uses: dtolnay/rust-toolchain@1.65.0
9595
- name: Get LLVM
9696
run: curl -L --output llvm15.0-mac-arm.tar.xz https://github.com/hyperledger/solang-llvm/releases/download/llvm15-0/llvm15.0-mac-arm.tar.xz
9797
- name: Extract LLVM
@@ -121,7 +121,7 @@ jobs:
121121
uses: actions/checkout@v3
122122
with:
123123
submodules: recursive
124-
- uses: dtolnay/rust-toolchain@1.64.0
124+
- uses: dtolnay/rust-toolchain@1.65.0
125125
- name: Get LLVM
126126
run: wget -q -O llvm15.0-mac-intel.tar.xz https://github.com/hyperledger/solang-llvm/releases/download/llvm15-0/llvm15.0-mac-intel.tar.xz
127127
- name: Extract LLVM

.github/workflows/test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
with:
6767
submodules: recursive
6868
- name: Rust stable
69-
run: rustup default 1.64.0
69+
run: rustup default 1.65.0
7070
- name: Build
7171
run: cargo build --verbose
7272
- name: Run tests
@@ -87,7 +87,7 @@ jobs:
8787
with:
8888
submodules: recursive
8989
- name: Rust stable
90-
run: rustup default 1.64.0
90+
run: rustup default 1.65.0
9191
- name: Build
9292
run: cargo build --verbose
9393
- name: Run tests
@@ -111,7 +111,7 @@ jobs:
111111
run: unzip c:\llvm.zip -d c:/
112112
- name: Add LLVM to Path
113113
run: echo "c:\llvm15.0\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8
114-
- uses: dtolnay/rust-toolchain@1.64.0
114+
- uses: dtolnay/rust-toolchain@1.65.0
115115
with:
116116
components: clippy
117117
# We run clippy on Linux in the lint job above, but this does not check #[cfg(windows)] items
@@ -135,7 +135,7 @@ jobs:
135135
uses: actions/checkout@v3
136136
with:
137137
submodules: recursive
138-
- uses: dtolnay/rust-toolchain@1.64.0
138+
- uses: dtolnay/rust-toolchain@1.65.0
139139
- name: Get LLVM
140140
run: curl -L --output llvm15.0-mac-arm.tar.xz https://github.com/hyperledger/solang-llvm/releases/download/llvm15-0/llvm15.0-mac-arm.tar.xz
141141
- name: Extract LLVM
@@ -159,7 +159,7 @@ jobs:
159159
uses: actions/checkout@v3
160160
with:
161161
submodules: recursive
162-
- uses: dtolnay/rust-toolchain@1.64.0
162+
- uses: dtolnay/rust-toolchain@1.65.0
163163
- name: Get LLVM
164164
run: wget -q -O llvm15.0-mac-intel.tar.xz https://github.com/hyperledger/solang-llvm/releases/download/llvm15-0/llvm15.0-mac-intel.tar.xz
165165
- name: Extract LLVM

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ license = "Apache-2.0"
88
build = "build.rs"
99
description = "Solang Solidity Compiler"
1010
keywords = [ "solidity", "compiler", "solana", "substrate" ]
11-
rust-version = "1.64.0"
11+
rust-version = "1.65.0"
1212
edition = "2021"
1313
exclude = [ "/.*", "/docs", "/examples", "/solana-library", "/tests", "/integration", "/vscode" ]
1414

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ COPY . src
44
WORKDIR /src/stdlib/
55
RUN make
66

7-
RUN rustup default 1.64.0
7+
RUN rustup default 1.65.0
88

99
WORKDIR /src
1010
RUN cargo build --release

docs/installing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Then you can build the image using:
8787
Option 5: Build Solang from source
8888
----------------------------------
8989

90-
In order to build Solang from source, you will need rust 1.64.0 or higher,
90+
In order to build Solang from source, you will need rust 1.65.0 or higher,
9191
and a build of LLVM based on the Solana LLVM tree. There are a few LLVM patches required that are not upstream yet.
9292
First, follow the steps below for installing LLVM and then proceed from there.
9393

0 commit comments

Comments
 (0)