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.

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

relax rustdoc output assertion #6559

Merged
merged 1 commit into from
Jan 17, 2019
Merged

Conversation

euclio
Copy link
Contributor

@euclio euclio commented Jan 17, 2019

The output of this rustdoc error is changing in rust-lang/rust#56884. This PR relaxes an assertion on the output so that the test will still pass once the rustdoc PR is merged.

@rust-highfive
Copy link

r? @alexcrichton

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

@ehuss
Copy link
Contributor

ehuss commented Jan 17, 2019

@bors r+

Do you need an update to Cargo to unblock your PR? I can post one if you'd like.

@bors
Copy link
Collaborator

bors commented Jan 17, 2019

📌 Commit eda10a4 has been approved by ehuss

@bors
Copy link
Collaborator

bors commented Jan 17, 2019

⌛ Testing commit eda10a4 with merge 081032284daffb9df7b29d1ed5faef77276f7d22...

@euclio
Copy link
Contributor Author

euclio commented Jan 17, 2019

@ehuss Yeah, I think so, thanks. Unless it'll just break toolstate? I only saw it fail in the rollup attempt. Cargo isn't considered a tool, I see.

@ehuss
Copy link
Contributor

ehuss commented Jan 17, 2019

Cargo and rustdoc must pass all tests at all times, so they aren't allowed to be broken. I'll post an update soon and cc you.

@bors
Copy link
Collaborator

bors commented Jan 17, 2019

💥 Test timed out

@ehuss
Copy link
Contributor

ehuss commented Jan 17, 2019

@bors retry

@bors
Copy link
Collaborator

bors commented Jan 17, 2019

⌛ Testing commit eda10a4 with merge 10e3230...

bors added a commit that referenced this pull request Jan 17, 2019
relax rustdoc output assertion

The output of this rustdoc error is changing in rust-lang/rust#56884. This PR relaxes an assertion on the output so that the test will still pass once the rustdoc PR is merged.
@bors
Copy link
Collaborator

bors commented Jan 17, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: ehuss
Pushing 10e3230 to master...

@bors bors merged commit eda10a4 into rust-lang:master Jan 17, 2019
@euclio euclio deleted the relax-rustdoc-output branch January 17, 2019 21:52
bors added a commit to rust-lang/rust that referenced this pull request Jan 19, 2019
Update cargo

Unblocks #56884  cc @euclio

6 commits in 2b4a5f1f0bb6e13759e88ea9512527b0beba154f..ffe65875fd05018599ad07e7389e99050c7915be
2019-01-12 04:13:12 +0000 to 2019-01-17 23:57:50 +0000
- Better error message for bad manifest with `cargo install`. (rust-lang/cargo#6560)
- relax rustdoc output assertion (rust-lang/cargo#6559)
- touch some files when we use them (rust-lang/cargo#6477)
- Add documentation for new package/publish feature flags. (rust-lang/cargo#6553)
- Update chat link to Discord. (rust-lang/cargo#6554)
- Fix typo (rust-lang/cargo#6552)

r? @alexcrichton
bors added a commit that referenced this pull request Feb 4, 2019
[BETA] backports to appease CI

- #6559 — relax rustdoc output assertion
- #6600 — Remove deprecated ATOMIC initializers.

Required to get the rust-1.33.0 branch passing again.
@ehuss ehuss modified the milestones: 1.34.0, 1.33.0 Feb 6, 2022
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.

5 participants