Use newer, mainline rust

.github/workflows/build_and_release.yml

@@ -1,6 +1,7 @@
 name: Build and release artifacts
 
 on:
+  workflow_dispatch:
   push:
     branches:
       #- main
@@ -64,8 +65,6 @@ jobs:
         run: ./build.sh
 
       # Push in the Github environment variable the name of the artifact
-      # Doing this now because in the following step the rust folder will
-      # be delated to save some space before installing the toolchain
       - run: ./config.sh -artifact_name
 
       - name: Package toolchain

.github/workflows/ci.yml

@@ -42,13 +42,6 @@ jobs:
           submodules: recursive
           path: toolchain
 
-      - name: Check out succinctlabs/rust
-        uses: actions/checkout@v3
-        with:
-          repository: succinctlabs/rust
-          path: toolchain/rust
-          fetch-depth: 0
-
       - name: Check out athenavm/athena
         uses: actions/checkout@v3
         with:

.github/workflows/release.yml

@@ -1,5 +1,6 @@
 name: Release
 on:
+  workflow_dispatch:
   push:
     tags:
       - "*"

clone.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 
 source config.sh -rust_commit
 
-git clone "https://github.com/succinctlabs/rust.git" --depth 1 --single-branch --branch succinct
+git clone "https://github.com/rust-lang/rust.git" --depth 1
 cd rust
 git fetch --depth 1 origin $RUST_COMMIT
 git checkout FETCH_HEAD

config.sh

@@ -2,7 +2,7 @@
 
 param1=${1:-}
 
-export RUST_COMMIT=295b693dfe72d0ac2d0924eb84af39e364d9c3e3
+export RUST_COMMIT=9b00956e56009bab2aa15d7bff10916599e3d6d6
 
 # If -rust_commit specified then only export the rust commit variable
 if [ "$param1" == "-rust_commit" ]; then

patch.sh

@@ -5,7 +5,3 @@ set -euo pipefail
 cd rust
 patch -p1 < ../patches/rust.patch
 cp ../patches/config.toml ./
-
-cd src/llvm-project
-patch -p1 < ../../../patches/llvm-D70401.patch
-patch -p1 < ../../../patches/compiler-rt.patch

patches/config.ci.toml

@@ -0,0 +1,16 @@
+change-id = 121754
+
+[build]
+target = ["riscv32em-athena-zkvm-elf"]
+extended = true
+tools = ["cargo", "cargo-clippy", "clippy", "rustfmt"]
+configure-args = []
+cargo-native-static = true
+
+[rust]
+lld = true
+llvm-tools = true
+channel = "nightly"
+
+[llvm]
+targets = "AArch64;RISCV;X86"

patches/config.toml

@@ -1,4 +1,4 @@
-change-id = 116881
+change-id = 121754
 
 [build]
 target = ["riscv32em-athena-zkvm-elf"]
@@ -12,4 +12,4 @@ llvm-tools = true
 channel = "nightly"
 
 [llvm]
-download-ci-llvm = false
+targets = "AArch64;RISCV;X86"