Skip to content
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.

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

Point to updated toolchain #443

Merged
merged 3 commits into from
Aug 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .jolt.rust.toolchain-tag
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-3c5f0ec3f4f98a2d211061a83bade8d62c6a6135
nightly-e1f7f2bced08d7f582e0fe747372dca74310f346
2 changes: 1 addition & 1 deletion jolt-core/src/host/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ impl Program {
"-C",
&format!("link-arg=-T{}", self.linker_path()),
"-C",
"passes=loweratomic",
"passes=lower-atomic",
"-C",
"panic=abort",
];
Expand Down
3 changes: 0 additions & 3 deletions jolt-core/src/poly/commitment/kzg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ use rand_core::{CryptoRng, RngCore};
use std::marker::PhantomData;
use std::sync::Arc;

#[cfg(feature = "ark-msm")]
use ark_ec::VariableBaseMSM;

#[derive(Clone, Debug)]
pub struct SRS<P: Pairing> {
pub g1_powers: Vec<P::G1Affine>,
Expand Down
2 changes: 1 addition & 1 deletion jolt-core/src/poly/structured_poly.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pub trait StructuredOpeningProof<F, C, Polynomials>:
where
F: JoltField,
C: CommitmentScheme<Field = F>,
Polynomials: StructuredCommitment<C> + ?Sized,
Polynomials: StructuredCommitment<C>,
{
type Preprocessing = NoPreprocessing;
type Proof: Sync + CanonicalSerialize + CanonicalDeserialize;
Expand Down
3 changes: 1 addition & 2 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
[toolchain]
channel = "nightly-2024-04-20"
channel = "nightly-2024-08-01"
targets = ["riscv32i-unknown-none-elf"]

2 changes: 1 addition & 1 deletion tracer/src/emulator/cpu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -902,7 +902,7 @@ impl Cpu {
((halfword >> 1) & 0x3c0) | // nzuimm{9:6] <= [10:7]
((halfword >> 4) & 0x4) | // nzuimm[2] <= [6]
((halfword >> 2) & 0x8); // nzuimm[3] <= [5]
// nzuimm == 0 is reserved instruction
// nzuimm == 0 is reserved instruction
if nzuimm != 0 {
return (nzuimm << 20) | (2 << 15) | ((rd + 8) << 7) | 0x13;
}
Expand Down
Loading