Skip to content

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

Merged
bors merged 2 commits into
rust-lang:masterfrom
jseyfried:fix_include_path
Jun 27, 2016
Merged

Revert a change to the relative path for macro-expanded include!s#34450
bors merged 2 commits into
rust-lang:masterfrom
jseyfried:fix_include_path

Conversation

@jseyfried

Copy link
Copy Markdown
Contributor

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

@jseyfried

Copy link
Copy Markdown
Contributor Author

cc @TimNN

@nrc

nrc commented Jun 26, 2016

Copy link
Copy Markdown
Member

@bors: r+ p=1

@bors

bors commented Jun 26, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit e488556 has been approved by nrc

@bors

bors commented Jun 26, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit e488556 with merge 3059bb9...

bors added a commit that referenced this pull request Jun 26, 2016
Revert a change to the relative path for macro-expanded `include!`s

Fixes #34431 (c.f. discussion in that issue).
r? @nrc
@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
bors added a commit that referenced this pull request Jul 16, 2016
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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants