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

Rollup of 6 pull requests #62723

Merged
merged 13 commits into from
Jul 16, 2019
Merged

Conversation

Mark-Simulacrum
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

estebank and others added 13 commits July 13, 2019 16:04
Now that we've fully moved to Azure Pipelines and bors has been updated
to only gate on Azure this commit removes the remaining Travis/AppVeyor
support contained in this repository. Most of the deletions here are
related to producing better output on Travis by folding certain
sections. This isn't supported by Azure so there's no need to keep it
around, and if Azure ever adds support we can always add it back!
This should give it enough time to finish instead of being killed after
an hour.
Cancel unemitted diagnostics during error recovery

Follow up to rust-lang#62604. Use @eddyb's preferred style and catch other case of the same problem.

r? @eddyb
Chapter for `param_attrs`

Most the information was taken from the RFC.

cc rust-lang#60406
…Mark-Simulacrum

ci: Remove Travis/AppVeyor configuration

Now that we've fully moved to Azure Pipelines and bors has been updated
to only gate on Azure this commit removes the remaining Travis/AppVeyor
support contained in this repository. Most of the deletions here are
related to producing better output on Travis by folding certain
sections. This isn't supported by Azure so there's no need to keep it
around, and if Azure ever adds support we can always add it back!
…_compiler_messages_p5, r=Centril

normalize use of backticks in compiler messages for libsyntax_ext

rust-lang#60532
…_compiler_messages_p6, r=eddyb

normalize use of backticks in compiler messages for libsyntax/parse

rust-lang#60532
…oalbini

ci: Bump time limit of tools builder on PRs

This should give it enough time to finish instead of being killed after
an hour.
@Mark-Simulacrum
Copy link
Member Author

@bors r+ p=55

@bors
Copy link
Contributor

bors commented Jul 16, 2019

📌 Commit 51ca50e has been approved by Mark-Simulacrum

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 16, 2019
@bors
Copy link
Contributor

bors commented Jul 16, 2019

⌛ Testing commit 51ca50e with merge 96234d5...

bors added a commit that referenced this pull request Jul 16, 2019
Rollup of 6 pull requests

Successful merges:

 - #62666 (Cancel unemitted diagnostics during error recovery)
 - #62683 (Chapter for `param_attrs`)
 - #62693 (ci: Remove Travis/AppVeyor configuration)
 - #62702 (normalize use of backticks in compiler messages for libsyntax_ext)
 - #62703 (normalize use of backticks in compiler messages for libsyntax/parse)
 - #62722 (ci: Bump time limit of tools builder on PRs)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Jul 16, 2019

☀️ Test successful - checks-azure
Approved by: Mark-Simulacrum
Pushing 96234d5 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 16, 2019
@bors bors mentioned this pull request Jul 16, 2019
@bors bors merged commit 51ca50e into rust-lang:master Jul 16, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #62723!

Tested on commit 96234d5.
Direct link to PR: #62723

🎉 rls on linux: test-fail → test-pass (cc @Xanewok, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jul 16, 2019
Tested on commit rust-lang/rust@96234d5.
Direct link to PR: <rust-lang/rust#62723>

🎉 rls on linux: test-fail → test-pass (cc @Xanewok, @rust-lang/infra).
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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.

7 participants