From b6f6fdbc9a01ce3b37823fdc10212d807c8ed8fe Mon Sep 17 00:00:00 2001 From: Jon C Date: Wed, 6 Mar 2024 15:32:05 +0100 Subject: [PATCH] frozen-abi: Remove proc_macro_hygiene featurization (#109) --- frozen-abi/build.rs | 5 ----- frozen-abi/src/lib.rs | 1 - perf/build.rs | 5 ----- programs/address-lookup-table/src/lib.rs | 1 - sdk/program/src/lib.rs | 1 - sdk/src/lib.rs | 1 - 6 files changed, 14 deletions(-) diff --git a/frozen-abi/build.rs b/frozen-abi/build.rs index c9550c1c5c4f22..e17ca70cb4718b 100644 --- a/frozen-abi/build.rs +++ b/frozen-abi/build.rs @@ -17,11 +17,6 @@ fn main() { } Channel::Dev => { println!("cargo:rustc-cfg=RUSTC_WITH_SPECIALIZATION"); - // See https://github.com/solana-labs/solana/issues/11055 - // We may be running the custom `rust-bpf-builder` toolchain, - // which currently needs `#![feature(proc_macro_hygiene)]` to - // be applied. - println!("cargo:rustc-cfg=RUSTC_NEEDS_PROC_MACRO_HYGIENE"); } } } diff --git a/frozen-abi/src/lib.rs b/frozen-abi/src/lib.rs index 189535ccddaa74..4747cf64b9e50f 100644 --- a/frozen-abi/src/lib.rs +++ b/frozen-abi/src/lib.rs @@ -1,6 +1,5 @@ #![allow(incomplete_features)] #![cfg_attr(RUSTC_WITH_SPECIALIZATION, feature(specialization))] -#![cfg_attr(RUSTC_NEEDS_PROC_MACRO_HYGIENE, feature(proc_macro_hygiene))] // Allows macro expansion of `use ::solana_frozen_abi::*` to work within this crate extern crate self as solana_frozen_abi; diff --git a/perf/build.rs b/perf/build.rs index 4925ee898eb612..eef20dd887bc42 100644 --- a/perf/build.rs +++ b/perf/build.rs @@ -27,11 +27,6 @@ fn main() { } Channel::Dev => { println!("cargo:rustc-cfg=RUSTC_WITH_SPECIALIZATION"); - // See https://github.com/solana-labs/solana/issues/11055 - // We may be running the custom `rust-bpf-builder` toolchain, - // which currently needs `#![feature(proc_macro_hygiene)]` to - // be applied. - println!("cargo:rustc-cfg=RUSTC_NEEDS_PROC_MACRO_HYGIENE"); } } } diff --git a/programs/address-lookup-table/src/lib.rs b/programs/address-lookup-table/src/lib.rs index 737ec32c8f6782..737c35e4c4b2f4 100644 --- a/programs/address-lookup-table/src/lib.rs +++ b/programs/address-lookup-table/src/lib.rs @@ -1,6 +1,5 @@ #![allow(incomplete_features)] #![cfg_attr(RUSTC_WITH_SPECIALIZATION, feature(specialization))] -#![cfg_attr(RUSTC_NEEDS_PROC_MACRO_HYGIENE, feature(proc_macro_hygiene))] #[cfg(not(target_os = "solana"))] pub mod processor; diff --git a/sdk/program/src/lib.rs b/sdk/program/src/lib.rs index 54de9d817205a8..4d623524772ccb 100644 --- a/sdk/program/src/lib.rs +++ b/sdk/program/src/lib.rs @@ -465,7 +465,6 @@ #![allow(incomplete_features)] #![cfg_attr(RUSTC_WITH_SPECIALIZATION, feature(specialization))] -#![cfg_attr(RUSTC_NEEDS_PROC_MACRO_HYGIENE, feature(proc_macro_hygiene))] // Allows macro expansion of `use ::solana_program::*` to work within this crate extern crate self as solana_program; diff --git a/sdk/src/lib.rs b/sdk/src/lib.rs index 7c6b643884e449..ecc186f0494191 100644 --- a/sdk/src/lib.rs +++ b/sdk/src/lib.rs @@ -31,7 +31,6 @@ #![allow(incomplete_features)] #![cfg_attr(RUSTC_WITH_SPECIALIZATION, feature(specialization))] -#![cfg_attr(RUSTC_NEEDS_PROC_MACRO_HYGIENE, feature(proc_macro_hygiene))] // Allows macro expansion of `use ::solana_sdk::*` to work within this crate extern crate self as solana_sdk;