Skip to content

Commit 609e4b2

Browse files
committed
Bump Rust nightly to 2020-07-31 and remove ::solana_sdk hack
Fixes solana-labs#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 update to a nightly build containing this PR, and stop using `::solana_sdk` to refer to the `respan!` macro.
1 parent 9bcfc51 commit 609e4b2

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

ci/rust-version.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ fi
2424
if [[ -n $RUST_NIGHTLY_VERSION ]]; then
2525
nightly_version="$RUST_NIGHTLY_VERSION"
2626
else
27-
nightly_version=2020-07-12
27+
nightly_version=2020-07-31
2828
fi
2929

3030

sdk/src/entrypoint_native.rs

Lines changed: 1 addition & 5 deletions
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!($name).to_string(),
70-
::solana_sdk::respan!($crate::id, $name)(),
66+
$crate::respan!($crate::id, $name)(),
7167
)
7268
};
7369
}

0 commit comments

Comments
 (0)