Skip to content

Commit 63ab333

Browse files
LucasSteLucasSte
committed
[SOL] Adjustments for Rust 1.89.0
1 parent 3a6f630 commit 63ab333

File tree

10 files changed

+72
-38
lines changed

10 files changed

+72
-38
lines changed

‎.github/workflows/main.yaml‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,18 @@ jobs:
9494
test_verbatim: 1
9595
- target: i686-pc-windows-gnu
9696
os: windows-2025
97-
channel: nightly-i686-gnu
97+
channel: nightly-2025-04-29-i686-gnu
9898
- target: x86_64-pc-windows-gnu
9999
os: windows-2025
100-
channel: nightly-x86_64-gnu
100+
channel: nightly-2025-04-29-x86_64-gnu
101+
- target: sbpf-solana-solana
102+
os: ubuntu-24.04
103+
- target: sbpfv1-solana-solana
104+
os: ubuntu-24.04
105+
- target: sbpfv2-solana-solana
106+
os: ubuntu-24.04
107+
- target: sbpfv3-solana-solana
108+
os: ubuntu-24.04
101109
runs-on: ${{ matrix.os }}
102110
needs: [calculate_vars]
103111
env:
@@ -111,14 +119,22 @@ jobs:
111119
with:
112120
submodules: true
113121
- name: Install Rust (rustup)
122+
if: ${{ !startsWith(matrix.target, 'sbpf') }}
114123
shell: bash
115124
run: |
116-
channel="nightly"
125+
channel="nightly-2025-04-29"
117126
# Account for channels that have required components (MinGW)
118127
[ -n "${{ matrix.channel }}" ] && channel="${{ matrix.channel }}"
119128
rustup update "$channel" --no-self-update
120129
rustup default "$channel"
121130
rustup target add "${{ matrix.target }}"
131+
- name: Install Rust (rustup)
132+
if: ${{ startsWith(matrix.target, 'sbpf') }}
133+
shell: bash
134+
run: |
135+
channel="nightly-2025-04-29"
136+
rustup update "$channel" --no-self-update
137+
rustup default "$channel"
122138
- uses: taiki-e/install-action@nextest
123139
- uses: Swatinem/rust-cache@v2
124140
with:
@@ -188,7 +204,7 @@ jobs:
188204
- name: Install nightly `clippy`
189205
run: |
190206
rustup set profile minimal
191-
rustup default nightly
207+
rustup default nightly-2025-04-29
192208
rustup component add clippy
193209
- uses: Swatinem/rust-cache@v2
194210
- run: cargo clippy --workspace --all-targets
@@ -259,7 +275,7 @@ jobs:
259275
with:
260276
submodules: true
261277
- name: Install Rust (rustup)
262-
run: rustup update nightly --no-self-update && rustup default nightly
278+
run: rustup update nightly-2025-04-29 --no-self-update && rustup default nightly-2025-04-29
263279
shell: bash
264280
- run: rustup component add miri
265281
- run: cargo miri setup

‎Cargo.toml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,3 @@ lto = "fat"
4949
[profile.bench]
5050
# Required for iai-callgrind
5151
debug = true
52-
53-
[lints.rust]
54-
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(target_family, values("solana"))', 'cfg(target_feature, values("static-syscalls"))', 'cfg(target_os, values("solana"))'] }

‎builtins-test-intrinsics/Cargo.toml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,10 @@ panic = "abort"
1717

1818
[profile.dev]
1919
panic = "abort"
20+
21+
[lints.rust]
22+
unexpected_cfgs = { level = "warn", check-cfg = [
23+
'cfg(target_family, values("solana"))',
24+
'cfg(target_feature, values("static-syscalls"))',
25+
'cfg(target_os, values("solana"))'
26+
] }

‎builtins-test/Cargo.toml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,11 @@ harness = false
100100
name = "mem_icount"
101101
harness = false
102102
required-features = ["icount"]
103+
104+
[lints.rust]
105+
unexpected_cfgs = { level = "warn", check-cfg = [
106+
'cfg(target_family, values("solana"))',
107+
'cfg(target_feature, values("static-syscalls"))',
108+
'cfg(target_os, values("solana"))'
109+
] }
110+

‎builtins-test/src/lib.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
//! Some floating point tests are disabled for specific architectures, because they do not have
1414
//! correct rounding.
1515
#![no_std]
16-
#![feature(isqrt)]
1716
#![cfg_attr(f128_enabled, feature(f128))]
1817
#![cfg_attr(f16_enabled, feature(f16))]
1918

‎ci/docker/sbpf-solana-solana/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -v -
1010
RUN cp ${HOME}/.cargo/bin/* /usr/local/bin/
1111

1212
RUN cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
13-
--rev 2ff58e81919c5c6580620f4b1f0e37777ef6787f \
13+
--rev ccfb0a3f5f967f3cf52fef0c95e283c7cab1836e \
1414
--bin cargo-run-solana-tests --root /usr/local
1515

16-
RUN mkdir -p /tmp/.cache/solana/v1.50/platform-tools
17-
RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.50/platform-tools-linux-x86_64.tar.bz2
18-
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.50/platform-tools
19-
RUN rustup toolchain link solana /tmp/.cache/solana/v1.50/platform-tools/rust
16+
RUN mkdir -p /tmp/.cache/solana/v1.51/platform-tools
17+
RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.51/platform-tools-linux-x86_64.tar.bz2
18+
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.51/platform-tools
19+
RUN rustup toolchain link solana /tmp/.cache/solana/v1.51/platform-tools/rust
2020
RUN cp -R ${HOME}/.rustup /tmp/
2121

2222
ENV CARGO_TARGET_SBPF_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600"
23-
ENV LLVM_HOME="/tmp/.cache/solana/v1.50/platform-tools/llvm"
24-
ENV CC="/tmp/.cache/solana/v1.50/platform-tools/llvm/bin/clang"
23+
ENV LLVM_HOME="/tmp/.cache/solana/v1.51/platform-tools/llvm"
24+
ENV CC="/tmp/.cache/solana/v1.51/platform-tools/llvm/bin/clang"
2525
ENV RUSTUP_TOOLCHAIN="solana"

‎ci/docker/sbpfv1-solana-solana/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -v -
1010
RUN cp ${HOME}/.cargo/bin/* /usr/local/bin/
1111

1212
RUN cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
13-
--rev 2ff58e81919c5c6580620f4b1f0e37777ef6787f \
13+
--rev ccfb0a3f5f967f3cf52fef0c95e283c7cab1836e \
1414
--bin cargo-run-solana-tests --root /usr/local
1515

16-
RUN mkdir -p /tmp/.cache/solana/v1.50/platform-tools
17-
RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.50/platform-tools-linux-x86_64.tar.bz2
18-
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.50/platform-tools
19-
RUN rustup toolchain link solana /tmp/.cache/solana/v1.50/platform-tools/rust
16+
RUN mkdir -p /tmp/.cache/solana/v1.51/platform-tools
17+
RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.51/platform-tools-linux-x86_64.tar.bz2
18+
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.51/platform-tools
19+
RUN rustup toolchain link solana /tmp/.cache/solana/v1.51/platform-tools/rust
2020
RUN cp -R ${HOME}/.rustup /tmp/
2121

2222
ENV CARGO_TARGET_SBPFV1_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600"
23-
ENV LLVM_HOME="/tmp/.cache/solana/v1.50/platform-tools/llvm"
24-
ENV CC="/tmp/.cache/solana/v1.50/platform-tools/llvm/bin/clang"
23+
ENV LLVM_HOME="/tmp/.cache/solana/v1.51/platform-tools/llvm"
24+
ENV CC="/tmp/.cache/solana/v1.51/platform-tools/llvm/bin/clang"
2525
ENV RUSTUP_TOOLCHAIN="solana"

‎ci/docker/sbpfv2-solana-solana/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -v -
1010
RUN cp ${HOME}/.cargo/bin/* /usr/local/bin/
1111

1212
RUN cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
13-
--rev 2ff58e81919c5c6580620f4b1f0e37777ef6787f \
13+
--rev ccfb0a3f5f967f3cf52fef0c95e283c7cab1836e \
1414
--bin cargo-run-solana-tests --root /usr/local
1515

16-
RUN mkdir -p /tmp/.cache/solana/v1.50/platform-tools
17-
RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.50/platform-tools-linux-x86_64.tar.bz2
18-
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.50/platform-tools
19-
RUN rustup toolchain link solana /tmp/.cache/solana/v1.50/platform-tools/rust
16+
RUN mkdir -p /tmp/.cache/solana/v1.51/platform-tools
17+
RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.51/platform-tools-linux-x86_64.tar.bz2
18+
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.51/platform-tools
19+
RUN rustup toolchain link solana /tmp/.cache/solana/v1.51/platform-tools/rust
2020
RUN cp -R ${HOME}/.rustup /tmp/
2121

2222
ENV CARGO_TARGET_SBPFV2_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600"
23-
ENV LLVM_HOME="/tmp/.cache/solana/v1.50/platform-tools/llvm"
24-
ENV CC="/tmp/.cache/solana/v1.50/platform-tools/llvm/bin/clang"
23+
ENV LLVM_HOME="/tmp/.cache/solana/v1.51/platform-tools/llvm"
24+
ENV CC="/tmp/.cache/solana/v1.51/platform-tools/llvm/bin/clang"
2525
ENV RUSTUP_TOOLCHAIN="solana"

‎ci/docker/sbpfv3-solana-solana/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -v -
1010
RUN cp ${HOME}/.cargo/bin/* /usr/local/bin/
1111

1212
RUN cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
13-
--rev 2ff58e81919c5c6580620f4b1f0e37777ef6787f \
13+
--rev ccfb0a3f5f967f3cf52fef0c95e283c7cab1836e \
1414
--bin cargo-run-solana-tests --root /usr/local
1515

16-
RUN mkdir -p /tmp/.cache/solana/v1.50/platform-tools
17-
RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.50/platform-tools-linux-x86_64.tar.bz2
18-
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.50/platform-tools
19-
RUN rustup toolchain link solana /tmp/.cache/solana/v1.50/platform-tools/rust
16+
RUN mkdir -p /tmp/.cache/solana/v1.51/platform-tools
17+
RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.51/platform-tools-linux-x86_64.tar.bz2
18+
RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.51/platform-tools
19+
RUN rustup toolchain link solana /tmp/.cache/solana/v1.51/platform-tools/rust
2020
RUN cp -R ${HOME}/.rustup /tmp/
2121

2222
ENV CARGO_TARGET_SBPFV3_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600"
23-
ENV LLVM_HOME="/tmp/.cache/solana/v1.50/platform-tools/llvm"
24-
ENV CC="/tmp/.cache/solana/v1.50/platform-tools/llvm/bin/clang"
23+
ENV LLVM_HOME="/tmp/.cache/solana/v1.51/platform-tools/llvm"
24+
ENV CC="/tmp/.cache/solana/v1.51/platform-tools/llvm/bin/clang"
2525
ENV RUSTUP_TOOLCHAIN="solana"

‎compiler-builtins/Cargo.toml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,11 @@ unstable-public-internals = []
6161

6262
[lints.rust]
6363
# The cygwin config can be dropped after our benchmark toolchain is bumped
64-
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(bootstrap)', 'cfg(target_os, values("cygwin"))'] }
64+
unexpected_cfgs = { level = "warn", check-cfg = [
65+
'cfg(bootstrap)',
66+
'cfg(target_os, values("cygwin"))',
67+
'cfg(target_family, values("solana"))',
68+
'cfg(target_feature, values("static-syscalls"))',
69+
'cfg(target_os, values("solana"))'
70+
] }
71+

0 commit comments

Comments
 (0)