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.

Sign up for GitHub

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

Jump to bottom

librustc error_reporting.rs cleanup. #39977

Merged
merged 8 commits into from
Feb 28, 2017
Merged

librustc error_reporting.rs cleanup. #39977

merged 8 commits into from
Feb 28, 2017

Conversation

frewsxcv
Copy link
Member

@frewsxcv frewsxcv commented Feb 20, 2017 •
edited
Loading

Read some code in librustc, mainly in error_reporting.rs, and cleaned up some things along the way. I recommend looking at each commit individually or looking at the whitespace insensitive diff.

@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 @arielb1 (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.

@frewsxcv frewsxcv force-pushed the error-reporting-cleanup branch from c63f833 to a754ea6 Compare February 20, 2017 16:40
@frewsxcv frewsxcv requested a review from eddyb February 25, 2017 18:45
@eddyb
Copy link
Member

eddyb commented Feb 25, 2017

I'm not sure on the style changes. I know there's a style team but I can't figure out how to ping them.
cc @nrc @solson @nikomatsakis

@solson
Copy link
Member

solson commented Feb 25, 2017

@eddyb My approach to style in the rust repo is generally "I'm not going to worry about minor inconsistencies now because we're going to automate it all with rustfmt later".

but I can't figure out how to ping them

You can't ping us here becase we're under the rust-lang-nursery org. We would need to be moved over here.

eddyb
eddyb approved these changes Feb 25, 2017
View reviewed changes
Copy link
Member

@eddyb eddyb left a comment

Choose a reason for hiding this comment

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

Commit-by-commit makes a lot more sense!

src/librustc/traits/error_reporting.rs
err: &mut DiagnosticBuilder)
{
let simp = fast_reject::simplify_type(self.tcx,
Copy link
Member

Choose a reason for hiding this comment

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

Was all of this duplicated from find_similar_impl_candidates? 😆

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeeeppppppp

@eddyb
Copy link
Member

eddyb commented Feb 25, 2017

@bors r+

@bors
Copy link
Contributor

bors commented Feb 25, 2017

📌 Commit a754ea6 has been approved by eddyb

@frewsxcv frewsxcv mentioned this pull request Feb 25, 2017
Closed
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Feb 25, 2017
@frewsxcv
Rollup merge of rust-lang#39977 - frewsxcv:error-reporting-cleanup, r…
c842a2f 
…=eddyb

librustc error_reporting.rs cleanup.

Read some code in librustc, mainly in error_reporting.rs, and cleaned up some things along the way. I recommend looking at each commit individually or looking at the [whitespace insensitive diff](https://github.com/rust-lang/rust/pull/39977/files?w=1).
@frewsxcv frewsxcv mentioned this pull request Feb 25, 2017
Closed
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Feb 26, 2017
@frewsxcv
Rollup merge of rust-lang#39977 - frewsxcv:error-reporting-cleanup, r…
ad8adac 
…=eddyb

librustc error_reporting.rs cleanup.

Read some code in librustc, mainly in error_reporting.rs, and cleaned up some things along the way. I recommend looking at each commit individually or looking at the [whitespace insensitive diff](https://github.com/rust-lang/rust/pull/39977/files?w=1).
@frewsxcv frewsxcv mentioned this pull request Feb 26, 2017
Closed
@bors
Copy link
Contributor

bors commented Feb 26, 2017

⌛ Testing commit a754ea6 with merge 8b55091...

@bors
Copy link
Contributor

bors commented Feb 26, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

alexcrichton commented Feb 26, 2017 via email

@alexcrichton
Copy link
Member

alexcrichton commented Feb 26, 2017 via email

@frewsxcv
Copy link
Member Author

@bors retry

@bors
Copy link
Contributor

bors commented Feb 27, 2017

⌛ Testing commit a754ea6 with merge 57bd173...

@bors
Copy link
Contributor

bors commented Feb 27, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

alexcrichton commented Feb 27, 2017 via email

@bors
Copy link
Contributor

bors commented Feb 27, 2017

⌛ Testing commit a754ea6 with merge 80a738a...

@bors bors mentioned this pull request Feb 28, 2017
Merged
@bors
Copy link
Contributor

bors commented Feb 28, 2017

💔 Test failed - status-appveyor

@alexcrichton
Copy link
Member

alexcrichton commented Feb 28, 2017 via email

@frewsxcv frewsxcv mentioned this pull request Feb 28, 2017
Closed
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Feb 28, 2017
@frewsxcv
Rollup merge of rust-lang#39977 - frewsxcv:error-reporting-cleanup, r…
211cf7d 
…=eddyb

librustc error_reporting.rs cleanup.

Read some code in librustc, mainly in error_reporting.rs, and cleaned up some things along the way. I recommend looking at each commit individually or looking at the [whitespace insensitive diff](https://github.com/rust-lang/rust/pull/39977/files?w=1).
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Feb 28, 2017
@frewsxcv
Rollup merge of rust-lang#39977 - frewsxcv:error-reporting-cleanup, r…
0eba1b5 
…=eddyb

librustc error_reporting.rs cleanup.

Read some code in librustc, mainly in error_reporting.rs, and cleaned up some things along the way. I recommend looking at each commit individually or looking at the [whitespace insensitive diff](https://github.com/rust-lang/rust/pull/39977/files?w=1).
@frewsxcv frewsxcv mentioned this pull request Feb 28, 2017
Closed
@eddyb eddyb mentioned this pull request Feb 28, 2017
Closed
eddyb added a commit to eddyb/rust that referenced this pull request Feb 28, 2017
@eddyb
Rollup merge of rust-lang#39977 - frewsxcv:error-reporting-cleanup, r…
8796283 
…=eddyb

librustc error_reporting.rs cleanup.

Read some code in librustc, mainly in error_reporting.rs, and cleaned up some things along the way. I recommend looking at each commit individually or looking at the [whitespace insensitive diff](https://github.com/rust-lang/rust/pull/39977/files?w=1).
@eddyb eddyb mentioned this pull request Feb 28, 2017
Closed
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Feb 28, 2017
@frewsxcv
Rollup merge of rust-lang#39977 - frewsxcv:error-reporting-cleanup, r…
227285f 
…=eddyb

librustc error_reporting.rs cleanup.

Read some code in librustc, mainly in error_reporting.rs, and cleaned up some things along the way. I recommend looking at each commit individually or looking at the [whitespace insensitive diff](https://github.com/rust-lang/rust/pull/39977/files?w=1).
@frewsxcv frewsxcv mentioned this pull request Feb 28, 2017
Merged
@bors
Copy link
Contributor

bors commented Feb 28, 2017

⌛ Testing commit a754ea6 with merge 2eae5e6...

@eddyb
Copy link
Member

eddyb commented Feb 28, 2017

@bors retry

bors added a commit that referenced this pull request Feb 28, 2017
@bors
Auto merge of #40148 - frewsxcv:rollup, r=frewsxcv
be76056 
Rollup of 9 pull requests

- Successful merges: #39977, #40033, #40047, #40056, #40057, #40122, #40124, #40126, #40131
- Failed merges: #40101
@bors bors merged commit a754ea6 into rust-lang:master Feb 28, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eddyb eddyb eddyb approved these changes

Assignees

@arielb1 arielb1

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@frewsxcv @rust-highfive @eddyb @solson @bors @alexcrichton @arielb1