Skip to content
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 .github/workflows/check-wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
with:
target: wasm32-unknown-unknown
components: rust-src
toolchain: nightly-2024-01-01
toolchain: nightly-2024-07-25
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cargo-stylus refused to compile on nightly-2024-01-01 this time. There won't be a problem, when we will merge these changes after pr with nightly fix


- uses: Swatinem/rust-cache@v2

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
with:
target: wasm32-unknown-unknown
components: rust-src
toolchain: nightly-2024-01-01
toolchain: nightly-2024-07-25

- uses: Swatinem/rust-cache@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gas-bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
with:
target: wasm32-unknown-unknown
components: rust-src
toolchain: nightly-2024-01-01
toolchain: nightly-2024-07-25

- uses: Swatinem/rust-cache@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion contracts/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ rand.workspace = true
std = []

[lib]
crate-type = ["lib", "cdylib"]
crate-type = ["lib"]

[lints]
workspace = true
6 changes: 0 additions & 6 deletions contracts/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,3 @@ extern crate alloc;
pub mod access;
pub mod token;
pub mod utils;

#[cfg(all(target_arch = "wasm32", not(feature = "std")))]
#[panic_handler]
fn panic(_info: &core::panic::PanicInfo) -> ! {
loop {}
}
2 changes: 1 addition & 1 deletion examples/access-control/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![cfg_attr(not(test), no_std, no_main)]
#![cfg_attr(not(test), no_main)]
extern crate alloc;

use alloc::vec::Vec;
Expand Down
2 changes: 1 addition & 1 deletion examples/basic/token/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![cfg_attr(not(test), no_main, no_std)]
#![cfg_attr(not(test), no_main)]
extern crate alloc;

use alloc::vec::Vec;
Expand Down
2 changes: 1 addition & 1 deletion examples/ecdsa/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![cfg_attr(not(test), no_std, no_main)]
#![cfg_attr(not(test), no_main)]
extern crate alloc;

use alloc::vec::Vec;
Expand Down
2 changes: 1 addition & 1 deletion examples/erc20-permit/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![cfg_attr(not(test), no_main, no_std)]
#![cfg_attr(not(test), no_main)]
extern crate alloc;

use alloc::vec::Vec;
Expand Down
2 changes: 1 addition & 1 deletion examples/erc20/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![cfg_attr(not(test), no_main, no_std)]
#![cfg_attr(not(test), no_main)]
extern crate alloc;

use alloc::vec::Vec;
Expand Down
2 changes: 1 addition & 1 deletion examples/erc721-consecutive/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![cfg_attr(not(test), no_main, no_std)]
#![cfg_attr(not(test), no_main)]
extern crate alloc;

use alloy_primitives::{Address, U256};
Expand Down
2 changes: 1 addition & 1 deletion examples/erc721-metadata/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![cfg_attr(not(test), no_main, no_std)]
#![cfg_attr(not(test), no_main)]
extern crate alloc;

use alloc::{string::String, vec::Vec};
Expand Down
2 changes: 1 addition & 1 deletion examples/erc721/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![cfg_attr(not(test), no_main, no_std)]
#![cfg_attr(not(test), no_main)]
extern crate alloc;

use alloc::vec::Vec;
Expand Down
8 changes: 1 addition & 7 deletions examples/merkle-proofs/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![cfg_attr(not(feature = "std"), no_std, no_main)]
#![cfg_attr(not(feature = "std"), no_main)]
extern crate alloc;

use alloc::vec::Vec;
Expand All @@ -14,12 +14,6 @@ use stylus_sdk::{
prelude::{entrypoint, public, sol_storage},
};

#[cfg(target_arch = "wasm32")]
#[panic_handler]
fn panic(_info: &core::panic::PanicInfo) -> ! {
loop {}
}

sol! {
error MerkleProofInvalidMultiProofLength();
error MerkleProofInvalidRootChild();
Expand Down
2 changes: 1 addition & 1 deletion examples/ownable/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![cfg_attr(not(test), no_std, no_main)]
#![cfg_attr(not(test), no_main)]
extern crate alloc;

use alloc::vec::Vec;
Expand Down
Loading