remove panic handlers

OpenZeppelin · Oct 23, 2024 · 3ace35d · 3ace35d
1 parent 5e14313
commit 3ace35d
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 23 deletions.
diff --git a/contracts/Cargo.toml b/contracts/Cargo.toml
@@ -31,7 +31,7 @@ rand.workspace = true
 std = []
 
 [lib]
-crate-type = ["lib", "cdylib"]
+crate-type = ["lib"]
 
 [lints]
 workspace = true
diff --git a/contracts/src/lib.rs b/contracts/src/lib.rs
@@ -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 {}
-}
diff --git a/examples/access-control/src/lib.rs b/examples/access-control/src/lib.rs
@@ -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;

diff --git a/examples/basic/token/src/lib.rs b/examples/basic/token/src/lib.rs
@@ -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;

diff --git a/examples/ecdsa/src/lib.rs b/examples/ecdsa/src/lib.rs
@@ -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;

diff --git a/examples/erc20-permit/src/lib.rs b/examples/erc20-permit/src/lib.rs
@@ -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;

diff --git a/examples/erc20/src/lib.rs b/examples/erc20/src/lib.rs
@@ -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;

diff --git a/examples/erc721-consecutive/src/lib.rs b/examples/erc721-consecutive/src/lib.rs
@@ -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};

diff --git a/examples/erc721-metadata/src/lib.rs b/examples/erc721-metadata/src/lib.rs
@@ -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};

diff --git a/examples/erc721/src/lib.rs b/examples/erc721/src/lib.rs
@@ -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;

diff --git a/examples/merkle-proofs/src/lib.rs b/examples/merkle-proofs/src/lib.rs
@@ -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;
@@ -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();

diff --git a/examples/ownable/src/lib.rs b/examples/ownable/src/lib.rs
@@ -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;