diff --git a/ci/rust-version.sh b/ci/rust-version.sh index e7f6c7eb0044dd..d36c555722f9c5 100644 --- a/ci/rust-version.sh +++ b/ci/rust-version.sh @@ -24,7 +24,7 @@ fi if [[ -n $RUST_NIGHTLY_VERSION ]]; then nightly_version="$RUST_NIGHTLY_VERSION" else - nightly_version=2020-07-12 + nightly_version=2020-07-31 fi diff --git a/sdk/src/entrypoint_native.rs b/sdk/src/entrypoint_native.rs index 931c32dc810d2c..760cfd4ed63377 100644 --- a/sdk/src/entrypoint_native.rs +++ b/sdk/src/entrypoint_native.rs @@ -58,16 +58,12 @@ macro_rules! declare_name { // `declare_name(foo)` // // See the `respan!` macro for more details. - // This should use `crate::respan!` once - // https://github.com/rust-lang/rust/pull/72121 is merged: - // see https://github.com/solana-labs/solana/issues/10933. - // For now, we need to use `::solana_sdk` // // `respan!` respans the path `$crate::id`, which we then call (hence the extra // parens) ( stringify!($name).to_string(), - ::solana_sdk::respan!($crate::id, $name)(), + $crate::respan!($crate::id, $name)(), ) }; }