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

Fix ordering of auto-generated trait bounds in rustdoc output #49196

Merged
merged 2 commits into from
Mar 21, 2018

Conversation

Phlosioneer
Copy link
Contributor

While the order of the where clauses was deterministic, the
ordering of bounds and lifetimes was not. This made the order flip-
flop randomly when new traits and impls were added to libstd.

This PR makes the ordering of bounds and lifetimes deterministic,
and re-enables the test that was causing the issue.

Fixes #49123

While the order of the where clauses was deterministic, the
ordering of bounds and lifetimes was not. This made the order flip-
flop randomly when new traits and impls were added to libstd.

This PR makes the ordering of bounds and lifetimes deterministic,
and re-enables the test that was causing the issue.

Fixes rust-lang#49123
@Phlosioneer
Copy link
Contributor Author

r? @QuietMisdreavus

@pietroalbini pietroalbini added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 20, 2018
@QuietMisdreavus
Copy link
Member

Great! Thanks for getting this set up!

@bors r+ p=1 (fixes a flaky test)

@bors
Copy link
Contributor

bors commented Mar 20, 2018

📌 Commit 7daf3f9 has been approved by QuietMisdreavus

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 20, 2018
@bors
Copy link
Contributor

bors commented Mar 20, 2018

⌛ Testing commit 7daf3f9 with merge eb725bb...

bors added a commit that referenced this pull request Mar 20, 2018
…etMisdreavus

Fix ordering of auto-generated trait bounds in rustdoc output

While the order of the where clauses was deterministic, the
ordering of bounds and lifetimes was not. This made the order flip-
flop randomly when new traits and impls were added to libstd.

This PR makes the ordering of bounds and lifetimes deterministic,
and re-enables the test that was causing the issue.

Fixes #49123
@bors
Copy link
Contributor

bors commented Mar 20, 2018

💔 Test failed - status-travis

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 20, 2018
@kennytm
Copy link
Member

kennytm commented Mar 20, 2018

@bors retry

/home/travis/.rvm/gems/ruby-2.2.7/gems/dpl-s3-1.9.4/lib/dpl/provider/s3.rb:12:in `api': uninitialized constant Aws::S3::Resource (NameError)

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 20, 2018
@bors
Copy link
Contributor

bors commented Mar 20, 2018

⌛ Testing commit 7daf3f9 with merge 72da16c27ea66d734b4fd058ef03acfa41b1cadb...

@bors
Copy link
Contributor

bors commented Mar 20, 2018

💔 Test failed - status-travis

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 20, 2018
@QuietMisdreavus
Copy link
Member

/home/travis/.rvm/gems/ruby-2.2.7/gems/dpl-s3-1.9.4/lib/dpl/provider/s3.rb:108:in `rescue in deploy': uninitialized constant Aws::S3::Errors (NameError)

Currently waiting on #49217 or some other resolution to travis-ci/dpl#788...

@kennytm
Copy link
Member

kennytm commented Mar 20, 2018

@bors retry travis-ci/dpl#788

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 20, 2018
@bors
Copy link
Contributor

bors commented Mar 20, 2018

⌛ Testing commit 7daf3f9 with merge 33a0ca2a3c6574e258f184b237ee301e4c9948f2...

kennytm added a commit to kennytm/rust that referenced this pull request Mar 20, 2018
…ions, r=QuietMisdreavus

Fix ordering of auto-generated trait bounds in rustdoc output

While the order of the where clauses was deterministic, the
ordering of bounds and lifetimes was not. This made the order flip-
flop randomly when new traits and impls were added to libstd.

This PR makes the ordering of bounds and lifetimes deterministic,
and re-enables the test that was causing the issue.

Fixes rust-lang#49123
@kennytm
Copy link
Member

kennytm commented Mar 20, 2018

@bors retry

Prioritize #49221.

bors added a commit that referenced this pull request Mar 20, 2018
Rollup of 3 pull requests

- Successful merges: #49182, #49196, #49217
- Failed merges:
@bors bors merged commit 7daf3f9 into rust-lang:master Mar 21, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants