Skip to content

Bump toolchain version #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Bump toolchain version #250

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33c42e3
Bump toolchain version
febo Sep 12, 2025
5674bd8
Fix lint
febo Sep 12, 2025
5b45a92
Update rust-version
febo Sep 13, 2025
707de26
Update align pointer macro
febo Sep 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ members = [
edition = "2021"
license = "Apache-2.0"
repository = "https://github.com/anza-xyz/pinocchio"
rust-version = "1.79"
rust-version = "1.84"

[workspace.dependencies]
five8_const = "0.1.4"
Expand All @@ -28,12 +28,12 @@ regex = "1"
syn = "1.0"

[workspace.metadata.cli]
solana = "2.2.0"
solana = "2.3.0"

[workspace.metadata.toolchains]
build = "1.84.1"
format = "nightly-2024-11-22"
lint = "nightly-2024-11-22"
format = "nightly-2025-02-16"
lint = "nightly-2025-02-16"
test = "1.84.1"

[workspace.metadata.release]
Expand Down
2 changes: 1 addition & 1 deletion sdk/pinocchio/src/account_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ pub(crate) struct Account {
/// - `7 6 5 4 3 2 1 0`
/// - `. x x x . . . .`: number of immutable borrows that can still be
/// allocated, for the lamports field. Ranges from 7 (`111`) to
/// 0 (`000`).
/// 0 (`000`).
///
/// * data mutable borrow flag
/// - `7 6 5 4 3 2 1 0`
Expand Down
2 changes: 1 addition & 1 deletion sdk/pinocchio/src/entrypoint/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ macro_rules! align_pointer {
($ptr:ident) => {
// integer-to-pointer cast: the resulting pointer will have the same provenance as
// the original pointer and it follows the alignment requirement for the input.
(($ptr as usize + (BPF_ALIGN_OF_U128 - 1)) & !(BPF_ALIGN_OF_U128 - 1)) as *mut u8
$ptr.with_addr((($ptr.addr() + (BPF_ALIGN_OF_U128 - 1)) & !(BPF_ALIGN_OF_U128 - 1)))
};
}

Expand Down
2 changes: 1 addition & 1 deletion sdk/pinocchio/src/sysvars/slot_hashes/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ fn test_from_account_info_constructor() {
unsafe {
let header_size = core::mem::size_of::<AccountLayout>();
let total_size = header_size + data.len();
let word_len = (total_size + 7) / 8;
let word_len = total_size.div_ceil(8);
aligned_backing = std::vec![0u64; word_len];
let base_ptr = aligned_backing.as_mut_ptr() as *mut u8;

Expand Down
2 changes: 1 addition & 1 deletion sdk/pinocchio/src/sysvars/slot_hashes/test_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ pub unsafe fn make_account_info(
) -> (AccountInfo, Vec<u64>) {
let hdr_size = mem::size_of::<AccountLayout>();
let total = hdr_size + data.len();
let words = (total + 7) / 8;
let words = total.div_ceil(8);
let mut backing: Vec<u64> = std::vec![0u64; words];
assert!(
mem::align_of::<u64>() >= mem::align_of::<AccountLayout>(),
Expand Down