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

Remove ::solana_sdk hack #11326

Merged
merged 1 commit into from
Aug 18, 2020
Merged

Remove ::solana_sdk hack #11326

merged 1 commit into from
Aug 18, 2020

Conversation

Aaron1011
Copy link
Contributor

@Aaron1011 Aaron1011 commented Aug 1, 2020 •
edited
Loading

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.

@mvines mvines added CI Pull Request is ready to enter CI and removed CI Pull Request is ready to enter CI labels Aug 1, 2020
@solana-grimes solana-grimes removed the CI Pull Request is ready to enter CI label Aug 1, 2020
@mvines
Copy link
Contributor

mvines commented Aug 1, 2020

rustfmt is missing from 2020-07-31, https://rust-lang.github.io/rustup-components-history/, so we'll need to wait until a nightly pops out that has it ⌛

@mvines
Copy link
Contributor

mvines commented Aug 1, 2020

Depends-on: #11328

@mvines
Copy link
Contributor

mvines commented Aug 4, 2020

@Aaron1011 - hey if you rebase this PR it should pass CI

@Aaron1011 Aaron1011 force-pushed the fix/macro-path-hack branch from 609e4b2 to 3a8af68 Compare August 4, 2020 02:41
@Aaron1011 Aaron1011 changed the title Bump Rust nightly to 2020-07-31 and remove ::solana_sdk hack Remove ::solana_sdk hack Aug 4, 2020
@Aaron1011
Copy link
Contributor Author

@mvines: It looks like nightly-2020-07-27 is a day too early - we need a nightly at least one day older in order to pull in my hygiene serialization change. I think we'll need to wait for rustfmt to become available on a newer nightly.

@Aaron1011 Aaron1011 mentioned this pull request Aug 5, 2020
Merged
@stale
Copy link

stale bot commented Aug 11, 2020

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.

@stale stale bot added stale [bot only] Added to stale content; results in auto-close after a week. and removed stale [bot only] Added to stale content; results in auto-close after a week. labels Aug 11, 2020
@mvines mvines mentioned this pull request Aug 14, 2020
Merged
@mvines
Copy link
Contributor

mvines commented Aug 18, 2020

I think we're finally unblocked here!

@Aaron1011
Remove ::solana_sdk hack
0ee7e2a 
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 stop using `::solana_sdk`
to reference to the `respan!` macro.
@Aaron1011 Aaron1011 force-pushed the fix/macro-path-hack branch from e2458dd to 0ee7e2a Compare August 18, 2020 16:19
@Aaron1011
Copy link
Contributor Author

@mvines: Rebased

@mvines mvines added the automerge Merge this Pull Request automatically once CI passes label Aug 18, 2020
@codecov
Copy link

codecov bot commented Aug 18, 2020

Codecov Report

Merging #11326 into master will decrease coverage by 0.0%.
The diff coverage is n/a.

@@            Coverage Diff            @@
##           master   #11326     +/-   ##
=========================================
- Coverage    82.0%    82.0%   -0.1%     
=========================================
  Files         330      330             
  Lines       76718    76716      -2     
=========================================
- Hits        62960    62951      -9     
- Misses      13758    13765      +7

@mergify mergify bot merged commit c099b29 into solana-labs:master Aug 18, 2020
@mvines
Copy link
Contributor

mvines commented Aug 18, 2020

\o/ Thanks again @Aaron1011

mvines added a commit to mvines/solana that referenced this pull request Sep 1, 2020
@mvines
Revert "Remove ::solana_sdk hack (solana-labs#11326)"
0608fe5 
This reverts commit c099b29.
mvines added a commit to mvines/solana that referenced this pull request Sep 2, 2020
@mvines
Revert "Remove ::solana_sdk hack (solana-labs#11326)"
43ec6ae 
This reverts commit c099b29.
mvines added a commit that referenced this pull request Sep 2, 2020
@mvines
Revert "Remove ::solana_sdk hack (#11326)"
29cfbce 
This reverts commit c099b29.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
automerge Merge this Pull Request automatically once CI passes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Use $crate instead of ::solana_sdk in declare_name! macro
3 participants
@Aaron1011 @mvines @solana-grimes