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

A couple minor improvements for tidy error handling. #40653

Merged
merged 2 commits into from
Apr 10, 2017

Conversation

frewsxcv
Copy link
Member

No description provided.

@@ -62,7 +62,7 @@ pub fn check(path: &Path, bad: &mut bool) {
});
let path_bytes = rel_path.as_os_str().as_bytes();
if output.status.success() && output.stdout.starts_with(path_bytes) {
println!("binary checked into source: {}", file.display());
tidy_error!("binary checked into source: {}", file.display());
*bad = true;
Copy link
Contributor

Choose a reason for hiding this comment

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

*bad = true should probably a part of tidy_error

@alexcrichton
Copy link
Member

r=me with @petrochenkov's comment

@frewsxcv
Copy link
Member Author

Going to wait for #40694 to merge.

@bors
Copy link
Contributor

bors commented Mar 31, 2017

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

Otherwise we get the standard Rust panic message alongside "some tidy
checks failed" which seems unnecessary.
@frewsxcv
Copy link
Member Author

frewsxcv commented Apr 2, 2017

Comments have been addressed.

@frewsxcv frewsxcv added A-docs Area: documentation for any part of the project, including the compiler, standard library, and tools and removed A-docs Area: documentation for any part of the project, including the compiler, standard library, and tools labels Apr 2, 2017
@frewsxcv
Copy link
Member Author

frewsxcv commented Apr 9, 2017

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Apr 9, 2017

📌 Commit f789d89 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Apr 9, 2017

⌛ Testing commit f789d89 with merge 6719895...

@bors
Copy link
Contributor

bors commented Apr 9, 2017

💔 Test failed - status-appveyor

@frewsxcv
Copy link
Member Author

frewsxcv commented Apr 9, 2017

#40546

@bors retry

@bors
Copy link
Contributor

bors commented Apr 9, 2017

⌛ Testing commit f789d89 with merge 683fa74...

bors added a commit that referenced this pull request Apr 9, 2017
A couple minor improvements for tidy error handling.

None
@bors
Copy link
Contributor

bors commented Apr 10, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 683fa74 to master...

@bors bors merged commit f789d89 into rust-lang:master Apr 10, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants