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

Various cosmetic improvements #3403

Merged
merged 6 commits into from
Feb 19, 2019
Merged

Conversation

alexreg
Copy link
Contributor

@alexreg alexreg commented Feb 16, 2019

Related to the larger effort of rust-lang/rust#58036.

Copy link
Contributor

@scampi scampi left a comment

Choose a reason for hiding this comment

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

Thanks! LGTM

src/comment.rs Outdated Show resolved Hide resolved
@scampi
Copy link
Contributor

scampi commented Feb 17, 2019

There are some test failures:

Mismatch at tests/source/itemized-blocks/wrap.rs:52:
 /// All the parameters ***except for
 /// `from_theater`*** should be inserted as sent
 /// by the remote theater, i.e., as passed to
-/// [`Theater::send`] on the remote actor.
+/// [`Theater::send`] on the remote actor
 fn func1() {}
 
 /// All the parameters ***except for
test test::self_tests ... FAILED
test test::verify_check_works ... ok
test test::verify_config_test_names ... ok
test unit_tests::test_format_code_block ... ok
test unit_tests::test_format_code_block_fail ... ok
test unit_tests::test_format_snippet ... ok
test unit_tests::test_no_panic_on_format_snippet_and_format_code_block ... ok
test utils::test::test_remove_trailing_white_spaces ... ok
test utils::test::test_trim_left_preserve_layout ... ok
test test::system_tests ... FAILED
failures:
---- test::self_tests stdout ----
internal error: line formatted, but exceeded maximum width (maximum: 100 (see `max_width` option), found: 102)
  --> src/matches.rs:28
   |
28 |     /// `true` if the arm is the last one in match expression. Used to decide on whether we should add
   |                                                                                                     ^^
   note= set `error_on_unformatted = false` to suppress the warning against comments or string literals
internal error: line formatted, but exceeded maximum width (maximum: 100 (see `max_width` option), found: 144)
    --> src/comment.rs:1813
     |
1813 |     // This is probably intended to be a non-test fn, but it is not used. We should keep this around unless it helps us test stuff to remove it.
     |                                                                                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     note= set `error_on_unformatted = false` to suppress the warning against comments or string literals
internal error: line formatted, but exceeded maximum width (maximum: 100 (see `max_width` option), found: 101)
   --> src/config/file_lines.rs:214
    |
214 |     /// Returns `true` if `self` includes all lines in all files. Otherwise runs `f` on all ranges in
    |                                                                                                     ^
    note= set `error_on_unformatted = false` to suppress the warning against comments or string literals
internal error: line formatted, but exceeded maximum width (maximum: 100 (see `max_width` option), found: 102)
  --> src/patterns.rs:22
   |
22 | /// Returns `true` if the given pattern is short. A short pattern is defined by the following grammar:
   |                                                                                                     ^^
   note= set `error_on_unformatted = false` to suppress the warning against comments or string literals
warning: rustfmt may have failed to format. See previous 4 errors.
Ran 5 self tests.
thread 'test::self_tests' panicked at 'assertion failed: `(left == right)`
  left: `1`,
 right: `0`: 1 self tests failed', src/test/mod.rs:249:5
note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
---- test::system_tests stdout ----
Ran 346 system tests.
thread 'test::system_tests' panicked at 'assertion failed: `(left == right)`
  left: `1`,
 right: `0`: 1 system tests failed', src/test/mod.rs:109:5

@alexreg
Copy link
Contributor Author

alexreg commented Feb 17, 2019

@scampi Thanks for the review. I think I've fixed them now, but we'll see soon...

tests/source/fn-simple.rs Outdated Show resolved Hide resolved
src/rustfmt_diff.rs Outdated Show resolved Hide resolved
@topecongiro topecongiro merged commit 7a3b7c9 into rust-lang:master Feb 19, 2019
@topecongiro
Copy link
Contributor

Thanks!

@alexreg
Copy link
Contributor Author

alexreg commented Feb 19, 2019

No problem. Appreciate the quick review & merge.

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.

3 participants