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 a minor grammar nit, update UI tests #64591

Merged
merged 2 commits into from
Sep 19, 2019
Merged

Conversation

jamesmunns
Copy link
Member

Minor fix, but I noticed it while debugging some code

@rust-highfive
Copy link
Collaborator

r? @eddyb

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 18, 2019
@varkor
Copy link
Member

varkor commented Sep 18, 2019

r? @varkor @bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 18, 2019

📌 Commit f233a4c has been approved by varkor

@rust-highfive rust-highfive assigned varkor and unassigned eddyb Sep 18, 2019
@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 Sep 18, 2019
@@ -3,11 +3,11 @@ error[E0119]: conflicting implementations of trait `Foo<i32>` for type `i32`:
|
LL | impl Foo<i32> for i32 { }
| --------------------- first implementation here
LL |
LL |
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just checked locally, this whitespace is significant

@jonas-schievink
Copy link
Contributor

@bors r-

@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 Sep 18, 2019
@jamesmunns
Copy link
Member Author

I think this whitespace is a mistake itself (calling draw_col_separator() instead of draw_col_separator_no_space() for these lines, but I don't immediately know how to fix this on a wider scale. Restored the whitespace for now.

@jonas-schievink
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Sep 18, 2019

📌 Commit 333230f has been approved by jonas-schievink

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 18, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 18, 2019
…ievink

Fix a minor grammar nit, update UI tests

Minor fix, but I noticed it while debugging some code
Centril added a commit to Centril/rust that referenced this pull request Sep 19, 2019
…ievink

Fix a minor grammar nit, update UI tests

Minor fix, but I noticed it while debugging some code
Centril added a commit to Centril/rust that referenced this pull request Sep 19, 2019
…ievink

Fix a minor grammar nit, update UI tests

Minor fix, but I noticed it while debugging some code
bors added a commit that referenced this pull request Sep 19, 2019
Rollup of 5 pull requests

Successful merges:

 - #63630 (Update installed compiler dependencies)
 - #64536 (Update Cargo)
 - #64554 (Polonius: more `ui` test suite fixes)
 - #64566 (A more generic interface for dataflow analysis)
 - #64591 (Fix a minor grammar nit, update UI tests)

Failed merges:

r? @ghost
@bors bors merged commit 333230f into rust-lang:master Sep 19, 2019
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.

6 participants