Skip to content

Commit

Permalink
Merge branch 'master' into refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
dr-orlovsky committed Oct 31, 2024
2 parents fa12b0b + b671b88 commit 60cbdab
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
strategy:
fail-fast: false
matrix:
toolchain: [ nightly, beta, stable, 1.76.0 ]
toolchain: [ nightly, beta, stable, 1.77.0 ]
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
Expand Down
44 changes: 22 additions & 22 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ ascii-armor = { version = "0.7.2", optional = true }
baid64 = "0.2.2"
commit_verify = "0.11.0-beta.8"
paste = "1"
strict_encoding = { version = "2.7.0", default-features = false, features = ["float", "derive"] }
strict_types = { version = "2.7.1", optional = true }
strict_encoding = { version = "2.7.0", default-features = false, features = ["derive"] }
strict_types = { version = "2.7.2", optional = true }
serde = { version = "1", optional = true }

[features]
Expand Down
2 changes: 1 addition & 1 deletion MANIFEST.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Type: Library
Kind: Free software
License: Apache-2.0
Language: Rust
Compiler: 1.76
Compiler: 1.78
Author: Maxim Orlovsky
Maintained: UBIDECO Labs, Institute for Deterministic and Cognitive Computing, Switzerland
Maintainers:
Expand Down
7 changes: 7 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,17 @@
//!
//! [AluVM]: https://github.com/AluVM/aluvm-spec
#![allow(clippy::bool_assert_comparison)]

// TODO: Extend the list of features not compatible with zk-aluvm as they appear.
#[cfg(all(feature = "zk-aluvm", any(feature = "A64", feature = "STR")))]
compile_error!("zk-AluVM is incompatible with any ISA extensions other then GFA");

#[macro_use]
extern crate alloc;
#[cfg(all(feature = "alloc", not(feature = "std")))]
extern crate alloc as std;

#[macro_use]
extern crate amplify;
#[macro_use]
Expand Down

0 comments on commit 60cbdab

Please sign in to comment.