project-serum
/
anchor
mirror of https://github.com/project-serum/anchor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Unpin `nightly` version (#2893)

This commit is contained in:
acheron 2024-04-07 13:47:50 +02:00 committed by GitHub
parent da2d9a4045
commit cbf9b0a090
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/actions/setup/action.yaml vendored
View File

@ -9,12 +9,3 @@ runs:
shell: bash
- run: git submodule update --init --recursive --depth 1
shell: bash
# `nightly` toolchain is currently required for building the IDL.
#
# Pinning the toolchain to an older date in order to fix
# `error[E0635]: unknown feature stdsimd` error from `ahash`.
# See: https://github.com/tkaitchuck/aHash/issues/200
#
# TODO: Unpin `nightly` release after upgrading Solana to `1.18`.
- run: rustup toolchain install nightly-2024-01-30
shell: bash

13
idl/src/build.rs
View File

@ -67,19 +67,10 @@ pub fn build_idl(
Ok(idl)
}
// Build IDL.
/// Build IDL.
fn build(program_path: &Path, resolution: bool, no_docs: bool) -> Result<Idl> {
// `nightly` toolchain is currently required for building the IDL.
//
// Pinning the toolchain to an older date in order to fix
// `error[E0635]: unknown feature stdsimd` error from `ahash`.
// See: https://github.com/tkaitchuck/aHash/issues/200
//
// There is also another error when using a date after 2024-01-30
// `error[E0412]: cannot find type `T` in this scope``
//
// TODO: Unpin `nightly` release after upgrading Solana to `1.18`.
const TOOLCHAIN: &str = "+nightly-2024-01-30";
const TOOLCHAIN: &str = "+nightly";
install_toolchain_if_needed(TOOLCHAIN)?;
let output = Command::new("cargo")

7
lang/syn/src/idl/defined.rs
View File

@ -543,9 +543,12 @@ pub fn gen_idl_type(
.enumerate()
.fold(outer, |acc, (i, cur)| {
let inner = &inners[i];
acc.replace(&format!(" {cur}"), &format!(" {inner} "))
// The spacing of the `outer` variable can differ between
// versions, e.g. `[T; N]` and `[T ; N]`
acc.replace(&format!(" {cur} "), &format!(" {inner} "))
.replace(&format!(" {cur},"), &format!(" {inner},"))
.replace(&format!("[{cur} "), &format!("[{inner} ",))
.replace(&format!("[{cur} "), &format!("[{inner} "))
.replace(&format!("[{cur};"), &format!("[{inner};"))
.replace(&format!(" {cur}]"), &format!(" {inner}]"))
});
if let Ok(ty) = syn::parse_str(&resolved_alias) {