Skip to content

Fix include! in doc tests #43782

New issue

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

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

Already on GitHub? # to your account

Merged
merged 2 commits into from
Aug 13, 2017
Merged

Fix include! in doc tests #43782

merged 2 commits into from
Aug 13, 2017

Conversation

nrc
Copy link
Member

@nrc nrc commented Aug 10, 2017

By making the path relative to the current file.

Fixes #43153

[breaking-change] - if you use include! inside a doc test, you'll need to change the path to be relative to the current file rather than relative to the working directory.

@rust-highfive
Copy link
Contributor

r? @frewsxcv

(rust_highfive has picked a reviewer for you, use r? to override)

@nrc nrc added A-libtest Area: `#[test]` / the `test` library T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Aug 10, 2017
@Mark-Simulacrum Mark-Simulacrum added the T-dev-tools Relevant to the dev-tools subteam, which will review and decide on the PR/issue. label Aug 10, 2017
@alexcrichton alexcrichton added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 10, 2017
@frewsxcv
Copy link
Member

Reassigning to someone on devtools

@frewsxcv frewsxcv assigned GuillaumeGomez and unassigned frewsxcv Aug 11, 2017
@nrc
Copy link
Member Author

nrc commented Aug 11, 2017

r? @GuillaumeGomez

@GuillaumeGomez
Copy link
Member

Thanks!

@bors: r+

@bors
Copy link
Collaborator

bors commented Aug 13, 2017

📌 Commit 6d736df has been approved by GuillaumeGomez

@GuillaumeGomez
Copy link
Member

@bors: rollup

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Aug 13, 2017
Fix include! in doc tests

By making the path relative to the current file.

Fixes rust-lang#43153

[breaking-change] - if you use `include!` inside a doc test, you'll need to change the path to be relative to the current file rather than relative to the working directory.
bors added a commit that referenced this pull request Aug 13, 2017
Rollup of 8 pull requests

- Successful merges: #43782, #43803, #43814, #43819, #43821, #43822, #43824, #43833
- Failed merges:
@bors bors merged commit 6d736df into rust-lang:master Aug 13, 2017
@nrc nrc added beta-accepted Accepted for backporting to the compiler in the beta channel. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 14, 2017
@alexcrichton alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 17, 2017
bors added a commit that referenced this pull request Aug 19, 2017
Uplift fix for include! in doc tests to beta

Uplift #43782 to beta. Fixes #43153.

r? @alexcrichton

(approved by @rust-lang/dev-tools )
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-libtest Area: `#[test]` / the `test` library beta-accepted Accepted for backporting to the compiler in the beta channel. T-dev-tools Relevant to the dev-tools subteam, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants