From 609e4b2eaca2b90260476e2c7434226053b956f0 Mon Sep 17 00:00:00 2001
From: Aaron Hill <aa1ronham@gmail.com>
Date: Sat, 1 Aug 2020 10:21:17 -0400
Subject: [PATCH] Bump Rust nightly to 2020-07-31 and remove ::solana_sdk hack

Fixes #10933

Now that https://github.com/rust-lang/rust/pull/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.
---
 ci/rust-version.sh           | 2 +-
 sdk/src/entrypoint_native.rs | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

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)(),
                 )
             };
         }