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

Revert a change to the relative path for macro-expanded include!s #34450

Merged
merged 2 commits into from
Jun 27, 2016
Merged

Revert a change to the relative path for macro-expanded include!s #34450

merged 2 commits into from
Jun 27, 2016

Conversation

jseyfried
Copy link
Contributor

Fixes #34431 (c.f. discussion in that issue).
r? @nrc

@jseyfried
Copy link
Contributor Author

cc @TimNN

@nrc
Copy link
Member

nrc commented Jun 26, 2016

@bors: r+ p=1

@bors
Copy link
Contributor

bors commented Jun 26, 2016

📌 Commit e488556 has been approved by nrc

@bors
Copy link
Contributor

bors commented Jun 26, 2016

⌛ Testing commit e488556 with merge 3059bb9...

bors added a commit that referenced this pull request Jun 26, 2016
@bors
Auto merge of #34450 - jseyfried:fix_include_path, r=nrc
3059bb9 
Revert a change to the relative path for macro-expanded `include!`s

Fixes #34431 (c.f. discussion in that issue).
r? @nrc
@bors
Copy link
Contributor

bors commented Jun 27, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-mir, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-mir, auto-win-msvc-64-opt-rustbuild

@bors bors merged commit e488556 into rust-lang:master Jun 27, 2016
@jseyfried jseyfried deleted the fix_include_path branch July 14, 2016 08:27
@jseyfried jseyfried mentioned this pull request Jul 14, 2016
Merged
bors added a commit that referenced this pull request Jul 16, 2016
@bors
Auto merge of #34816 - jseyfried:fix_include_path, r=nrc
eb196dc 
Fix `include!()`s inside `asm!()` invocations

Fixes #34812, a regression caused by #33749 that was not fixed in #34450.
r? @nrc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nrc nrc

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jseyfried @nrc @bors