Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RES: Macro from local import should shadow macro from crate root #5864

Merged
merged 1 commit into from Aug 20, 2020
Merged

RES: Macro from local import should shadow macro from crate root #5864

merged 1 commit into from Aug 20, 2020

Conversation

dima74
Copy link
Member

@dima74 dima74 commented Aug 4, 2020

Changes order in which macros are processed: macros from imports first, then macros from crate root scope

@dima74 dima74 added the fix Pull requests that fix some bug(s) label Aug 4, 2020
@dima74 dima74 force-pushed the diralik/resolve-macros-imports-first branch from bc8fe6c to 0f79f4c Compare August 19, 2020 18:41
@vlad20012
Copy link
Member

bors r+

bors bot added a commit that referenced this pull request Aug 19, 2020
@bors @dima74
Merge #5864
eff0b80 
5864: RES: Macro from local import should shadow macro from crate root r=vlad20012 a=dima74

Changes order in which macros are processed: macros from imports first, then macros from crate root scope

Co-authored-by: Dmitry Murzin <diralik@yandex.ru>
@Undin Undin added this to the v130 milestone Aug 19, 2020
@bors
Copy link
Contributor

bors bot commented Aug 19, 2020

Build failed:

  • check

@dima74
Copy link
Member Author

dima74 commented Aug 20, 2020

bors retry

bors bot added a commit that referenced this pull request Aug 20, 2020
@bors @dima74
Merge #5864
aff8511 
5864: RES: Macro from local import should shadow macro from crate root r=vlad20012 a=dima74

Changes order in which macros are processed: macros from imports first, then macros from crate root scope

Co-authored-by: Dmitry Murzin <diralik@yandex.ru>
@bors
Copy link
Contributor

bors bot commented Aug 20, 2020

Build failed:

  • check

@dima74
Copy link
Member Author

dima74 commented Aug 20, 2020

bors retry

@bors
Copy link
Contributor

bors bot commented Aug 20, 2020

Build succeeded:

@bors bors bot merged commit 9882b88 into master Aug 20, 2020
@bors bors bot deleted the diralik/resolve-macros-imports-first branch August 20, 2020 07:59
@Undin Undin added this to In Progress in To test via automation Aug 20, 2020
@Undin Undin moved this from In Progress to Test in To test Aug 20, 2020
@lancelote lancelote moved this from Test to Done in To test Aug 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@vlad20012 vlad20012

Labels
fix Pull requests that fix some bug(s)
Projects
To test
  
Done
Milestone
v130
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@dima74 @vlad20012 @Undin