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

Change error count messages #42150

Merged
merged 1 commit into from
May 25, 2017

Conversation

citizen428
Copy link
Contributor

See #33525 for details. r? @Mark-Simulacrum

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Mark-Simulacrum (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 22, 2017

📌 Commit 2aa69f3 has been approved by Mark-Simulacrum

@bors
Copy link
Contributor

bors commented May 22, 2017

⌛ Testing commit 2aa69f3 with merge a90475c...

@bors
Copy link
Contributor

bors commented May 22, 2017

💔 Test failed - status-travis

_ => {
s = format!("aborting due to {} previous errors", self.err_count.get());
s = format!("aborting due to previous error(s)".to_string);
Copy link
Member

Choose a reason for hiding this comment

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

The call to to_string should just be removed (or made into a call and the format! removed.

@Mark-Simulacrum Mark-Simulacrum added the relnotes Marks issues that should be documented in the release notes of the next release. label May 22, 2017
@citizen428 citizen428 force-pushed the feature/error-count-messages branch 2 times, most recently from 74453cd to 82a04d7 Compare May 22, 2017 15:31
@carols10cents carols10cents added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 22, 2017
@citizen428 citizen428 force-pushed the feature/error-count-messages branch 3 times, most recently from f530838 to 800d73b Compare May 23, 2017 17:01
@arielb1 arielb1 added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 23, 2017
@arielb1
Copy link
Contributor

arielb1 commented May 23, 2017

Looks like you need to update the UI tests:

[01:04:45] ---- [ui] ui/suggestions/confuse-field-and-method/private-field.rs stdout ----
[01:04:45] 	ui: /checkout/src/test/ui/suggestions/confuse-field-and-method/private-field.rs
[01:04:45] normalized stderr:
[01:04:45] error: no method named `dog_age` found for type `animal::Dog` in the current scope
[01:04:45]   --> $DIR/private-field.rs:26:23
[01:04:45]    |
[01:04:45] 26 |     let dog_age = dog.dog_age();
[01:04:45]    |                       ^^^^^^^ private field, not a method
[01:04:45] 
[01:04:45] error: aborting due to previous error(s)
[01:04:45] 
[01:04:45] 
[01:04:45] 
[01:04:45] expected stderr:
[01:04:45] error: no method named `dog_age` found for type `animal::Dog` in the current scope
[01:04:45]   --> $DIR/private-field.rs:26:23
[01:04:45]    |
[01:04:45] 26 |     let dog_age = dog.dog_age();
[01:04:45]    |                       ^^^^^^^ private field, not a method
[01:04:45] 
[01:04:45] error: aborting due to previous error
[01:04:45] 
[01:04:45] 
[01:04:45] 
[01:04:45] diff of stderr:
[01:04:45] 
[01:04:45]  error: no method named `dog_age` found for type `animal::Dog` in the current scope
[01:04:45]    --> $DIR/private-field.rs:26:23
[01:04:45]     |
[01:04:45]  26 |     let dog_age = dog.dog_age();
[01:04:45]     |                       ^^^^^^^ private field, not a method
[01:04:45]  
[01:04:45] -error: aborting due to previous error
[01:04:45] +error: aborting due to previous error(s)

There's some command that updates the tests automatically, but I don't remember what it is. @Mark-Simulacrum do you remember how to run it?

@citizen428
Copy link
Contributor Author

citizen428 commented May 24, 2017

@arielb1 I was wondering if there's a command, the ones I already updated I used sed for. Clearly I missed some, will look into it.

@citizen428 citizen428 force-pushed the feature/error-count-messages branch from 800d73b to 25099b7 Compare May 24, 2017 01:43
@Mark-Simulacrum
Copy link
Member

Wasn't able to find or get someone to answer me about the potential script, but looks like Travis failed with on ui/codemap_tests/two_files.rs.

@citizen428 citizen428 force-pushed the feature/error-count-messages branch from 25099b7 to 89468b3 Compare May 24, 2017 04:06
@citizen428
Copy link
Contributor Author

@Mark-Simulacrum Yes, I fixed that already, that's the build that's currently running (I had a previous commit where I fixed almost all of the others, but this one slipped through). Fingers crossed this will finally be green. I just wish tests would run faster on my local machine, I feel bad always tying uo Travis.

@citizen428 citizen428 force-pushed the feature/error-count-messages branch from 89468b3 to 4c84f7d Compare May 24, 2017 06:47
@citizen428 citizen428 force-pushed the feature/error-count-messages branch from 4c84f7d to 5558c64 Compare May 24, 2017 09:14
@Mark-Simulacrum
Copy link
Member

No problem! Just to check, in case you weren't aware, ./x.py test -i --stage 1 src/test/ui is probably the best way to run them locally today.

@bors r+

@bors
Copy link
Contributor

bors commented May 24, 2017

📌 Commit 5558c64 has been approved by Mark-Simulacrum

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 24, 2017
…ages, r=Mark-Simulacrum

Change error count messages

See rust-lang#33525 for details. r? @Mark-Simulacrum
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 24, 2017
…ages, r=Mark-Simulacrum

Change error count messages

See rust-lang#33525 for details. r? @Mark-Simulacrum
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 24, 2017
…ages, r=Mark-Simulacrum

Change error count messages

See rust-lang#33525 for details. r? @Mark-Simulacrum
bors added a commit that referenced this pull request May 24, 2017
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 25, 2017
…ages, r=Mark-Simulacrum

Change error count messages

See rust-lang#33525 for details. r? @Mark-Simulacrum
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 25, 2017
…ages, r=Mark-Simulacrum

Change error count messages

See rust-lang#33525 for details. r? @Mark-Simulacrum
bors added a commit that referenced this pull request May 25, 2017
@bors bors merged commit 5558c64 into rust-lang:master May 25, 2017
@citizen428 citizen428 deleted the feature/error-count-messages branch May 25, 2017 04:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
relnotes Marks issues that should be documented in the release notes of the next release. 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