Skip to content

Rollup of 4 pull requests - #64293

Merged
bors merged 12 commits into
rust-lang:masterfrom
Centril:rollup-blnhxwl
Sep 9, 2019
Merged

Rollup of 4 pull requests#64293
bors merged 12 commits into
rust-lang:masterfrom
Centril:rollup-blnhxwl

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

Mark-Simulacrumand others added 12 commits September 7, 2019 19:27
Adress issue rust-lang#64238. Create a macro to be used for pluralisation check
throughout rustc codebase.
Modify files performing pluralisation checks to incorporate the
dedicated macro located in `syntax::errors`.
…used, r=petrochenkov
compiletest: disable -Aunused for run-pass tests
Disabled the flag, but that led to quite a bit of fall out -- I think most of it is benign but I've not investigated thoroughly.
r? @petrochenkov
…enkov
Replace "feature gated" wording with "unstable".
Factor out pluralisation into syntax::errors
Fixesrust-lang#64238.
…crum
use 'get_toml' instead of regular expression
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=4 rollup=never

@bors

bors commented Sep 8, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 51b110f has been approved by Centril

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 8, 2019
@bors

bors commented Sep 8, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 51b110f with merge a6624ed...

bors added a commit that referenced this pull request Sep 8, 2019
Rollup of 4 pull requests
Successful merges:
- #64078 (compiletest: disable -Aunused for run-pass tests)
- #64263 (Replace "feature gated" wording with "unstable".)
- #64280 (Factor out pluralisation into syntax::errors)
- #64288 (use 'get_toml' instead of regular expression)
Failed merges:
r? @ghost
@bors

bors commented Sep 9, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: Centril
Pushing a6624ed to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Sep 9, 2019
@bors
bors merged commit 51b110f into rust-lang:masterSep 9, 2019
@Centril
Centril deleted the rollup-blnhxwl branch September 9, 2019 01:00
@CentrilCentril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: 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

@Centril@bors@Mark-Simulacrum@crlf0710@V1shvesh