Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Commit c099b29

Browse files
authored
Remove ::solana_sdk hack (#11326)
Fixes #10933 Now that rust-lang/rust#72121 has been merged, using a `$crate` path from a nested `macro_rules!` will work properly across multiple crates. This allows us to stop using `::solana_sdk` to reference to the `respan!` macro.
1 parent 55ce2eb commit c099b29

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

sdk/src/entrypoint_native.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,12 @@ macro_rules! declare_name {
5858
// `declare_name(foo)`
5959
//
6060
// See the `respan!` macro for more details.
61-
// This should use `crate::respan!` once
62-
// https://github.com/rust-lang/rust/pull/72121 is merged:
63-
// see https://github.com/solana-labs/solana/issues/10933.
64-
// For now, we need to use `::solana_sdk`
6561
//
6662
// `respan!` respans the path `$crate::id`, which we then call (hence the extra
6763
// parens)
6864
(
6965
stringify!($filename).to_string(),
70-
::solana_sdk::respan!($crate::$id, $name)(),
66+
$crate::respan!($crate::$id, $name)(),
7167
)
7268
};
7369
}

0 commit comments

Comments
 (0)