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

use 'invalid argument' for vxWorks #65187

Merged
merged 1 commit into from
Oct 8, 2019

Conversation

BaoshanPang
Copy link
Contributor

vxWorks is using "invalid argument" instead of "Invalid argument" in reporting invalid options

r? @rkruppe

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 7, 2019
@hanna-kruppe
Copy link
Contributor

cc #65185

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Oct 7, 2019

📌 Commit 45f7186 has been approved by rkruppe

@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 Oct 7, 2019
@BaoshanPang
Copy link
Contributor Author

cc @n-salim

Centril added a commit to Centril/rust that referenced this pull request Oct 8, 2019
…kruppe

use 'invalid argument' for vxWorks

vxWorks is using "invalid argument" instead of "Invalid argument" in reporting invalid options

r? @rkruppe
@bors bors added the rollup A PR which is a rollup label Oct 8, 2019
bors added a commit that referenced this pull request Oct 8, 2019
Rollup of 8 pull requests

Successful merges:

 - #64726 (rewrite documentation for unimplemented! to clarify use)
 - #65040 (syntax: more cleanups in item and function signature parsing)
 - #65046 (Make `Cell::new` method come first in documentation)
 - #65098 (Add long error explanation for E0561)
 - #65150 (Suggest dereferencing boolean reference when used in 'if' or 'while')
 - #65154 (Fix const generic arguments not displaying in types mismatch diagnostic)
 - #65181 (fix bug in folding for constants)
 - #65187 (use 'invalid argument' for vxWorks)

Failed merges:

 - #65179 (Add long error explanation for E0567)

r? @ghost
@Centril Centril removed the rollup A PR which is a rollup label Oct 8, 2019
@bors bors merged commit 45f7186 into rust-lang:master Oct 8, 2019
@bors
Copy link
Contributor

bors commented Oct 8, 2019

☔ The latest upstream changes (presumably #65196) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 8, 2019
@hanna-kruppe
Copy link
Contributor

bors, what are you doing? cc @rust-lang/infra

@pietroalbini
Copy link
Member

Heh, bors is weird when rollup merges are involved.

@BaoshanPang BaoshanPang deleted the master_before_merge branch November 11, 2019 22:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants