Skip to content

Commit

Permalink
Bump Rust nightly to 2020-07-31 and remove ::solana_sdk hack
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Aaron1011 committed Aug 1, 2020
1 parent 9bcfc51 commit 609e4b2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ci/rust-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
6 changes: 1 addition & 5 deletions sdk/src/entrypoint_native.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)(),
)
};
}
Expand Down

0 comments on commit 609e4b2

Please sign in to comment.