Skip to content

Pass edition to rustdoc. - #5299

Merged
bors merged 3 commits into
rust-lang:masterfrom
ehuss:rustdoc-edition
Apr 5, 2018
Merged

bors merged 3 commits into
rust-lang:masterfrom
ehuss:rustdoc-edition

Conversation

@ehuss

@ehuss ehuss commented Apr 5, 2018

Copy link
Copy Markdown
Contributor

Fixes #5279.

Comment thread tests/testsuite/doc.rs Outdated
.build();

assert_that(
p.cargo("doc").arg("-v").masquerade_as_nightly_cargo(),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can write this compactly as p.cargo("doc -v").masquerade_as_nightly_cargo(), cargo function does simple argument splitting.

@matklad

matklad commented Apr 5, 2018

Copy link
Copy Markdown
Contributor

@bors r+

Thanks!

@bors

bors commented Apr 5, 2018

Copy link
Copy Markdown
Contributor

📌 Commit 187bb0a has been approved by matklad

@bors

bors commented Apr 5, 2018

Copy link
Copy Markdown
Contributor

⌛ Testing commit 187bb0a with merge f81a1fa633620cde1d93467714a06498d33e568f...

@bors

bors commented Apr 5, 2018

Copy link
Copy Markdown
Contributor

💔 Test failed - status-travis

@matklad

matklad commented Apr 5, 2018

Copy link
Copy Markdown
Contributor

Test failure seems legit. Perhaps the nightly at travis is too old?

@ehuss

ehuss commented Apr 5, 2018

Copy link
Copy Markdown
Contributor Author

Test failure seems legit. Perhaps the nightly at travis is too old?

Indeed it is too old. Perhaps now that rust-lang/rust#49033 is fixed we can switch back to regular "nightly" channel?

@matklad

matklad commented Apr 5, 2018

Copy link
Copy Markdown
Contributor

@ehuss probably! I have no time to actually investigate this, could you perhaps just try to change CI configuration in this PR?

Removes temporary workaround for rust-lang/rust#49033.
@ehuss

ehuss commented Apr 5, 2018

Copy link
Copy Markdown
Contributor Author

@matklad Looks like everything is passing now. Let me know if you want the CI changes in a separate PR, or if it's OK to ride on this one.

@matklad

matklad commented Apr 5, 2018

Copy link
Copy Markdown
Contributor

@bors r+

:)

@bors

bors commented Apr 5, 2018

Copy link
Copy Markdown
Contributor

📌 Commit 4eb42cd has been approved by matklad

bors added a commit that referenced this pull request Apr 5, 2018
@bors

bors commented Apr 5, 2018

Copy link
Copy Markdown
Contributor

⌛ Testing commit 4eb42cd with merge b9aa315...

@bors

bors commented Apr 5, 2018

Copy link
Copy Markdown
Contributor

☀️ Test successful - status-appveyor, status-travis
Approved by: matklad
Pushing b9aa315 to master...

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.

Pass --edition to rustdoc when an edition is configured

3 participants