Skip to content

Switch to rustc's in_external_macro function #2952

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
Merged
merged 2 commits into from
Jul 24, 2018
Merged

Switch to rustc's in_external_macro function #2952

merged 2 commits into from
Jul 24, 2018

Conversation

dwijnand
Copy link
Member

Fixes #2929

@mati865
Copy link
Contributor

mati865 commented Jul 24, 2018

You will have to run git pull --rebase <remote_name> master to solve conflicts.

@Manishearth Manishearth merged commit b2caf66 into rust-lang:master Jul 24, 2018
@Manishearth
Copy link
Member

Thanks!

@dwijnand dwijnand deleted the upstream-in_external_macro branch July 24, 2018 15:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dwijnand @mati865 @Manishearth