Skip to content

move wasip2 re-export under pub mod __internal #91

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

move wasip2 re-export under pub mod __internal #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions macro/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,10 @@ pub fn attr_macro_http_server(_attr: TokenStream, item: TokenStream) -> TokenStr
quote! {
struct TheServer;

impl ::wstd::wasip2::exports::http::incoming_handler::Guest for TheServer {
impl ::wstd::__internal::wasip2::exports::http::incoming_handler::Guest for TheServer {
fn handle(
request: ::wstd::wasip2::http::types::IncomingRequest,
response_out: ::wstd::wasip2::http::types::ResponseOutparam
request: ::wstd::__internal::wasip2::http::types::IncomingRequest,
response_out: ::wstd::__internal::wasip2::http::types::ResponseOutparam
) {
#(#attrs)*
#vis async fn __run(#inputs) #output {
Expand All @@ -146,7 +146,7 @@ pub fn attr_macro_http_server(_attr: TokenStream, item: TokenStream) -> TokenStr
}
}

::wstd::wasip2::http::proxy::export!(TheServer with_types_in ::wstd::wasip2);
::wstd::__internal::wasip2::http::proxy::export!(TheServer with_types_in ::wstd::__internal::wasip2);

// Provide an actual function named `main`.
//
Expand Down
9 changes: 7 additions & 2 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,14 @@ pub use wstd_macro::attr_macro_http_server as http_server;
pub use wstd_macro::attr_macro_main as main;
pub use wstd_macro::attr_macro_test as test;

// Re-export the wasi crate for use by the `http_server` macro.
// Re-export the wasip2 crate for use only by `wstd-macro` macros. The proc
// macros need to generate code that uses these definitions, but we don't want
// to treat it as part of our public API with regards to semver, so we keep it
// under `__internal` as well as doc(hidden) to indicate it is private.
#[doc(hidden)]
pub use wasip2;
pub mod __internal {
pub use wasip2;
}

pub mod prelude {
pub use crate::future::FutureExt as _;
Expand Down
Loading