[SOL] Adjustments for Rust 1.79 upgrade

anza-xyz · Jul 23, 2024 · ed6293e · ed6293e
1 parent ab11ba6
commit ed6293e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -100,7 +100,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - run: rustup toolchain install 1.75.0 && rustup default 1.75.0
+      - run: rustup toolchain install 1.79.0 && rustup default 1.79.0
       - name: Install cargo-semver-checks
         run: |
           mkdir installed-bins
@@ -123,7 +123,7 @@ jobs:
         include:
         - name: Linux x86_64 stable
           os: ubuntu-latest
-          rust: 1.75.0
+          rust: 1.79.0
           other: i686-unknown-linux-gnu
 #        - name: Linux x86_64 beta
 #          os: ubuntu-latest
@@ -143,7 +143,7 @@ jobs:
 #          other: x86_64-apple-ios
         - name: Windows x86_64 MSVC stable
           os: windows-latest
-          rust: 1.75.0-msvc
+          rust: 1.79.0-msvc
           other: i686-pc-windows-msvc
 #        - name: Windows x86_64 gnu nightly # runs out of space while trying to link the test suite
 #          os: windows-latest
@@ -213,7 +213,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: rustup toolchain install 1.75.0 && rustup default 1.75.0
+      - run: rustup toolchain install 1.79.0 && rustup default 1.79.0
       - run: rustup target add i686-unknown-linux-gnu
       - run: sudo apt update -y && sudo apt install gcc-multilib libsecret-1-0 libsecret-1-dev -y
       - run: rustup component add rustfmt || echo "rustfmt not available"

diff --git a/src/cargo/core/compiler/standard_lib.rs b/src/cargo/core/compiler/standard_lib.rs
@@ -91,8 +91,8 @@ pub fn resolve_std<'gctx>(
         "compiler_builtins",
         None,
         SourceId::for_git(
-            &("https://github.com/solana-labs/compiler-builtins".parse()).unwrap(),
-            GitReference::Tag("solana-tools-v1.40".to_string()),
+            &("https://github.com/LucasSte/compiler-builtins".parse()).unwrap(),
+            GitReference::Tag("lucas-v1.42".to_string()),
         )?,
     )?);
     let crates_io_url = crate::sources::CRATES_IO_INDEX.parse().unwrap();

diff --git a/tests/testsuite/rust_version.rs b/tests/testsuite/rust_version.rs
@@ -107,6 +107,10 @@ fn lint_self_incompatible_with_rust_version() {
         .with_stderr(
             "\
 [ERROR] rustc [..] is not supported by the following package:
+
+                 Note that this is the rustc version that ships with Solana tools and \
+                 not your system's rustc version. Use `solana-install update` or head \
+                 over to https://docs.solanalabs.com/cli/install to install a newer version.
   [email protected] requires rustc 1.9876.0
 
 ",
@@ -166,6 +170,11 @@ fn lint_dep_incompatible_with_rust_version() {
 [DOWNLOADED] too_new_child v0.0.1 (registry `[..]`)
 [DOWNLOADED] rustc_compatible v0.0.1 (registry `[..]`)
 [ERROR] rustc [..] is not supported by the following packages:
+
+                 Note that this is the rustc version that ships with Solana \
+                 tools and not your system's rustc version. Use `solana-install \
+                 update` or head over to https://docs.solanalabs.com/cli/install \
+                 to install a newer version.
   [email protected] requires rustc 1.2345.0
   [email protected] requires rustc 1.2345.0
 Either upgrade rustc or select compatible dependency versions with