Skip to content

rustdoc: Don't run Markdown tests twice - #43068

Merged
bors merged 1 commit into
rust-lang:masterfrom
ollie27:rustdoc_markdown_tests
Jul 7, 2017
Merged

rustdoc: Don't run Markdown tests twice#43068
bors merged 1 commit into
rust-lang:masterfrom
ollie27:rustdoc_markdown_tests

Conversation

@ollie27

Copy link
Copy Markdown
Contributor

This matches the behaviour for finding tests in Rust files.

This was a regression from 1.17 to 1.18 so it would be a good idea to backport this to beta so at least 1.19 won't also be affected.

Fixes#42726

r? @GuillaumeGomez

@Mark-SimulacrumMark-Simulacrum added beta-nominated Nominated 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. labels Jul 5, 2017
@aidanhsaidanhs added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 5, 2017
@GuillaumeGomez

Copy link
Copy Markdown
Member

Good catch, thanks!

@bors: r+

@bors

bors commented Jul 6, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit dec01f8 has been approved by GuillaumeGomez

@bors

bors commented Jul 6, 2017

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

This matches the behaviour for finding tests in Rust files.
@ollie27
ollie27force-pushed the rustdoc_markdown_tests branch from dec01f8 to 1966a67CompareJuly 6, 2017 15:49
@ollie27

Copy link
Copy Markdown
ContributorAuthor

rebased

@GuillaumeGomez

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Jul 6, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 1966a67 has been approved by GuillaumeGomez

@bors

bors commented Jul 7, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 1966a67 with merge 24fc541...

bors added a commit that referenced this pull request Jul 7, 2017
rustdoc: Don't run Markdown tests twice
This matches the behaviour for finding tests in Rust files.
This was a regression from 1.17 to 1.18 so it would be a good idea to backport this to beta so at least 1.19 won't also be affected.
Fixes#42726
r? @GuillaumeGomez
@bors

bors commented Jul 7, 2017

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: GuillaumeGomez
Pushing 24fc541 to master...

@bors
bors merged commit 1966a67 into rust-lang:masterJul 7, 2017
@ollie27
ollie27 deleted the rustdoc_markdown_tests branch July 7, 2017 15:04
@brsonbrson added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jul 8, 2017
@brsonbrson mentioned this pull request Jul 8, 2017
@brsonbrson removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 13, 2017
bors added a commit that referenced this pull request Jul 13, 2017
[beta] backports
- #43068
- #43043
- #42745
The pick of 143206d in cfa3b58 was not clean and needed a fair bit of surgery. It should probably be looked at closely.
Still testing locally.
bors added a commit that referenced this pull request Jul 13, 2017
[beta] backports
- #43068
- #43043
- #42745
The pick of 143206d in cfa3b58 was not clean and needed a fair bit of surgery. It should probably be looked at closely.
Still testing locally.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.T-dev-toolsRelevant to the dev-tools subteam, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@ollie27@GuillaumeGomez@bors@brson@aidanhs@Mark-Simulacrum