Skip to content
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.

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

Use proc_macro::is_available() on rust 1.57+ #300

Merged
merged 2 commits into from Oct 12, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions build.rs
Expand Up @@ -33,6 +33,12 @@
// location of a token. Enabled by procmacro2_semver_exempt or the
// "span-locations" Cargo cfg. This is behind a cfg because tracking
// location inside spans is a performance hit.
//
// "is_available"
// Use `proc_macro::is_available()` to detect if the proc macro API is
// available or needs to be polyfilled instead of trying to use the proc
// macro API and catching a panic if it isn't available.
// Enabled on Rust 1.57+

use std::env;
use std::iter;
Expand Down Expand Up @@ -82,6 +88,10 @@ fn main() {
println!("cargo:rustc-cfg=literal_from_str");
}

if version.minor >= 57 {
println!("cargo:rustc-cfg=is_available");
}

let target = env::var("TARGET").unwrap();
if !enable_use_proc_macro(&target) {
return;
Expand Down
14 changes: 11 additions & 3 deletions src/detection.rs
Expand Up @@ -12,16 +12,24 @@ pub(crate) fn inside_proc_macro() -> bool {
_ => {}
}

INIT.call_once(initialize);
inside_proc_macro()
#[cfg(feature = "is_available")]
{
proc_macro::is_available()
}

#[cfg(not(feature = "is_available"))]
{
INIT.call_once(initialize);
inside_proc_macro()
}
}

pub(crate) fn force_fallback() {
WORKS.store(1, Ordering::SeqCst);
}

pub(crate) fn unforce_fallback() {
initialize();
WORKS.store(0, Ordering::SeqCst);
bjorn3 marked this conversation as resolved.
Show resolved Hide resolved
}

// Swap in a null panic hook to avoid printing "thread panicked" to stderr,
Expand Down