Group imports and exports in exports module

Author: webmaster128

packages/std/src/exports.rs renamed to packages/std/src/exports/exports.rs

@@ -12,6 +12,9 @@ use core::{marker::PhantomData, ptr};
 
 use serde::de::DeserializeOwned;
 
+use super::imports::{ExternalApi, ExternalQuerier, ExternalStorage};
+use super::memory::{Owned, Region};
+use super::panic::install_panic_handler;
 use crate::deps::OwnedDeps;
 #[cfg(any(feature = "stargate", feature = "ibc2"))]
 use crate::ibc::IbcReceiveResponse;
@@ -24,9 +27,6 @@ use crate::ibc::{
 use crate::ibc::{IbcChannelOpenMsg, IbcChannelOpenResponse};
 #[cfg(feature = "ibc2")]
 use crate::ibc2::{Ibc2PacketReceiveMsg, Ibc2PacketTimeoutMsg};
-use crate::imports::{ExternalApi, ExternalQuerier, ExternalStorage};
-use crate::memory::{Owned, Region};
-use crate::panic::install_panic_handler;
 use crate::query::CustomQuery;
 use crate::results::{ContractResult, QueryResponse, Reply, Response};
 use crate::serde::{from_json, to_json_vec};

packages/std/src/imports.rs renamed to packages/std/src/exports/imports.rs

@@ -1,19 +1,18 @@
 use alloc::vec::Vec;
 use core::ptr;
 
+#[cfg(feature = "iterator")]
+use super::memory::get_optional_region_address;
+use super::memory::{Owned, Region};
 use crate::import_helpers::{from_high_half, from_low_half};
-use crate::memory::{Owned, Region};
+#[cfg(feature = "iterator")]
+use crate::iterator::{Order, Record};
 use crate::results::SystemResult;
 #[cfg(feature = "iterator")]
 use crate::sections::decode_sections2;
 use crate::sections::encode_sections;
 use crate::serde::from_json;
 use crate::traits::{Api, Querier, QuerierResult, Storage};
-#[cfg(feature = "iterator")]
-use crate::{
-    iterator::{Order, Record},
-    memory::get_optional_region_address,
-};
 use crate::{Addr, CanonicalAddr};
 #[cfg(feature = "cosmwasm_2_1")]
 use crate::{AggregationError, HashFunction, PairingEqualityError};

packages/std/src/memory.rs renamed to packages/std/src/exports/memory.rs

@@ -0,0 +1,18 @@
+mod exports;
+mod imports;
+mod memory; // Used by exports and imports only. This assumes pointers are 32 bit long, which makes it untestable on dev machines.
+mod panic;
+
+#[cfg(feature = "cosmwasm_2_2")]
+pub use exports::do_migrate_with_info;
+pub use exports::{
+    do_execute, do_ibc_destination_callback, do_ibc_source_callback, do_instantiate, do_migrate,
+    do_query, do_reply, do_sudo,
+};
+#[cfg(feature = "ibc2")]
+pub use exports::{do_ibc2_packet_receive, do_ibc2_packet_timeout};
+#[cfg(feature = "stargate")]
+pub use exports::{
+    do_ibc_channel_close, do_ibc_channel_connect, do_ibc_channel_open, do_ibc_packet_ack,
+    do_ibc_packet_receive, do_ibc_packet_timeout,
+};

packages/std/src/exports/mod.rs

@@ -3,7 +3,6 @@
 ///
 /// This overrides any previous panic handler. See <https://doc.rust-lang.org/std/panic/fn.set_hook.html>
 /// for details.
-#[cfg(target_arch = "wasm32")]
 pub fn install_panic_handler() {
     use super::imports::handle_panic;
     std::panic::set_hook(Box::new(|info| {

packages/std/src/panic.rs renamed to packages/std/src/exports/panic.rs

@@ -33,7 +33,6 @@ mod metadata;
 mod msgpack;
 mod never;
 mod pagination;
-mod panic;
 mod query;
 mod results;
 mod sections;
@@ -115,13 +114,8 @@ pub use crate::timestamp::Timestamp;
 pub use crate::traits::{Api, HashFunction, Querier, QuerierResult, QuerierWrapper, Storage};
 pub use crate::types::{BlockInfo, ContractInfo, Env, MessageInfo, MigrateInfo, TransactionInfo};
 
-// Exposed in wasm build only
 #[cfg(target_arch = "wasm32")]
 mod exports;
-#[cfg(target_arch = "wasm32")]
-mod imports;
-#[cfg(target_arch = "wasm32")]
-mod memory; // Used by exports and imports only. This assumes pointers are 32 bit long, which makes it untestable on dev machines.
 
 #[cfg(all(feature = "cosmwasm_2_2", target_arch = "wasm32"))]
 pub use crate::exports::do_migrate_with_info;