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

Apply indent in causes on each new line #54

Merged

dtolnay merged 16 commits into dtolnay:master from yaahc:indent

Dec 24, 2019

Contributor

yaahc commented Dec 11, 2019

No description provided.


          Apply indent in causes on each new line

a1b8cbd

This comment has been minimized.

Sign in to view

yaahc added 4 commits

December 11, 2019 11:04


          split terminator instead of chars and dont indent last newline

76a3636


          remove debug prints from tests

6eff351


          remove extra newline before backtrace print

228b44a


          switch std::fmt::Write to core::fmt::Write

bd1bb8d

This comment has been minimized.

Sign in to view

This comment has been minimized.

Sign in to view


          handle the fact that write_str is called many times gracefully

226ba72

This comment has been minimized.

Sign in to view

yaahc added 3 commits

December 11, 2019 11:58


          Fix test to match new debug output

70da4cc

Prior to this change, the debug format always printed 4 spaces and then
the index of the error in the chain. Previous changes made it so that in
the cause chain we indent each new line to line up with the first line.
Together these two changes mean that if the index is longer than 1
character the first line will become misaligned. This was fixed by using
a left pad to 4 characters so the : is always on the 5th character and
all lines line up consistently.


          Tidy up the code to be consistent with existing style

47a7459


          switch from split to lines

a8865bb

This comment has been minimized.

Sign in to view

yaahc added 3 commits

December 11, 2019 13:28


          Make debug format more consistent throughout

3045aa5


          Remove special casing for errors with leading whitespace

3c279f5


          Fix alignment

a5031ad

This comment has been minimized.

Sign in to view

Owner

dtolnay commented Dec 11, 2019

I think I would prefer to keep the first error on the same line as the "Error:" printed by main.

I'd have to figure out a way to either format differently if I'm being called from anyhow vs main (maybe some method of the Formatter?)

Maybe you would be interested in writing an RFC for https://www.reddit.com/r/rust/comments/dzq42h/error_handling_survey/f89icon/ ?

Contributor Author

yaahc commented Dec 11, 2019 •

edited

Loading

Fuck yes I'd be interested. If I'm removing the newline for the error, can I leave in the special casing for handling whitespace in source errors?

yaahc added 4 commits

December 11, 2019 15:40


          Revert "Remove special casing for errors with leading whitespace"

cb1eac4

This reverts commit 3c279f5.


          Revert "Make debug format more consistent throughout"

6534df0

This reverts commit 3045aa5.


          Fix newlines mistake

6228f67


          Clean up interface to indented wrapper

b13a994

dtolnay approved these changes

View reviewed changes

Owner

dtolnay left a comment

Thanks! This is great.

I am merging this with a few minor changes noted below.

src/fmt.rs Show resolved Hide resolved

src/fmt.rs Show resolved Hide resolved

dtolnay merged commit ba0f8c9 into dtolnay:master

Owner

dtolnay commented Dec 24, 2019

Published in 1.0.26.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet