Skip to content

Ignore proc-macro feature on wasm-target #111

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

Merged
merged 1 commit into from
Aug 12, 2018
Merged

Ignore proc-macro feature on wasm-target #111

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 src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
#![doc(html_root_url = "https://docs.rs/proc-macro2/0.4.9")]
#![cfg_attr(feature = "nightly", feature(proc_macro_raw_ident, proc_macro_span))]

#[cfg(feature = "proc-macro")]
#[cfg(all(not(all(target_arch = "wasm32", target_os = "unknown")), feature = "proc-macro"))]
extern crate proc_macro;
extern crate unicode_xid;

Expand Down Expand Up @@ -146,14 +146,14 @@ impl FromStr for TokenStream {
}
}

#[cfg(feature = "proc-macro")]
#[cfg(all(not(all(target_arch = "wasm32", target_os = "unknown")), feature = "proc-macro"))]
impl From<proc_macro::TokenStream> for TokenStream {
fn from(inner: proc_macro::TokenStream) -> TokenStream {
TokenStream::_new(inner.into())
}
}

#[cfg(feature = "proc-macro")]
#[cfg(all(not(all(target_arch = "wasm32", target_os = "unknown")), feature = "proc-macro"))]
impl From<TokenStream> for proc_macro::TokenStream {
fn from(inner: TokenStream) -> proc_macro::TokenStream {
inner.inner.into()
Expand Down Expand Up @@ -318,7 +318,7 @@ impl Span {
}

/// This method is only available when the `"nightly"` feature is enabled.
#[cfg(all(feature = "nightly", feature = "proc-macro"))]
#[cfg(all(not(all(target_arch = "wasm32", target_os = "unknown")), feature = "nightly", feature = "proc-macro"))]
pub fn unstable(self) -> proc_macro::Span {
self.inner.unstable()
}
Expand Down
4 changes: 2 additions & 2 deletions src/stable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ impl fmt::Debug for TokenStream {
}
}

#[cfg(feature = "proc-macro")]
#[cfg(all(not(all(target_arch = "wasm32", target_os = "unknown")), feature = "proc-macro"))]
impl From<::proc_macro::TokenStream> for TokenStream {
fn from(inner: ::proc_macro::TokenStream) -> TokenStream {
inner
Expand All @@ -126,7 +126,7 @@ impl From<::proc_macro::TokenStream> for TokenStream {
}
}

#[cfg(feature = "proc-macro")]
#[cfg(all(not(all(target_arch = "wasm32", target_os = "unknown")), feature = "proc-macro"))]
impl From<TokenStream> for ::proc_macro::TokenStream {
fn from(inner: TokenStream) -> ::proc_macro::TokenStream {
inner
Expand Down