mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,900 Commits 2 Branches 0 Tags 1.4 GiB
943b97c3ae
Commit Graph

3070 Commits

Author SHA1 Message Date
Nikhil Benesch
e0e2f0db53 Don't panic on license check errors (#3655) 
Without this case, an ErrorKind::LicenseCheck results in a panic:

    thread 'main' panicked at 'internal error: entered unreachable code', src/tools/rustfmt/src/formatting.rs:320:18

N.B.: errors of this type are only raised when the configuration file
contains `license_tempate_path = "TEMPLATE_FILE"`.
 2019-06-26 10:51:11 +09:00
Caleb Cartwright
c955b5908e fix: run in sub dirs/workspace member dirs (#3652) 2019-06-25 23:15:33 +09:00
rChaser53
9986b9d011 fix internal error for long closure types (#3653) 2019-06-25 23:14:19 +09:00
Nootan Ghimire
561653326d Add newline after help text (#3650) 2019-06-25 11:44:14 +09:00
rChaser53
26d370e9e5 remove unreachable!() (#3646) 2019-06-23 16:24:40 +09:00
rChaser53
5b0ce0ed12 avoid not to truncate necessary chars (#3640) 2019-06-23 14:32:14 +09:00
Seiichi Uchida
1d19a08ed4
Format the last expression-statement as expression (#3631) 2019-06-17 08:53:39 +09:00
Stéphane Campinas
84c2356590 handle unicode chars in closures (#3632) 
The `NotUnicode` branch was unecessarily put on a new line, although it
was within max width:

```diff
 fn baz() {
     let our_error_b = result_b_from_func.or_else(|e| match e {
         NotPresent => Err(e).chain_err(|| "env var wasn't provided"),
-        NotUnicode(_) => Err(e).chain_err(|| "env var was very very very bork文字化ã"),
+        NotUnicode(_) => {
+            Err(e).chain_err(|| "env var was very very very bork文字化ã")
+        }
     });
 }
```
 2019-06-17 08:53:17 +09:00
Caleb Cartwright
944fc57e10 tests: ensure min number of system/idempotent tests ran (#3629) 2019-06-16 23:47:22 +09:00
Seiichi Uchida
a4eab17d7c
Fix is_subpath 2019-06-14 19:16:17 +09:00
Ruben Schmidmeister
dbac28b4b4 Use trait to abstract emit modes (#3616) 2019-06-13 06:59:20 +09:00
Stéphane Campinas
1cea171cef Improve handling of unicode characters (#3618) 2019-06-12 20:28:29 +09:00
Stéphane Campinas
04add0cd38 implement Display for enums with attribute config_type (#3621) 2019-06-12 20:20:42 +09:00
topecongiro
d33450247b
Rename config_proc_macro to rustfmt-config_proc_macro 2019-06-09 22:29:36 +09:00
Seiichi Uchida
0e3cf08ff1
Release 1.3.0 (#3611) 2019-06-09 21:28:57 +09:00
Seiichi Uchida
47a11cd516
Format modules defined in cfg_attr (#3604) 2019-06-09 09:20:39 +09:00
Seiichi Uchida
e71bffb008
Format modules defined inside cfg_if macro calls (#3600) 2019-06-08 18:47:18 +09:00
Stéphane Campinas
87565c42ce
Merge pull request #3607 from topecongiro/issue-3493 
Ignore sub-modules when skip-children is used
 2019-06-08 09:50:12 +02:00
topecongiro
dae63e98ce
Ignore sub-modules when skip-children is used 2019-06-07 14:55:41 +09:00
rChaser53
5607178d0a fix the bug add unwanted code to impl (#3601) (#3602) 2019-06-06 13:06:40 +09:00
Stéphane Campinas
e0459eb3fe inline the attribute with its item even with the macro_use attribute or when reorder_imports is disabled (#3598) 2019-06-05 00:14:12 +09:00
Seiichi Uchida
2244f326e6
Cargo update (#3559) 
Update `rustc-ap-*` crates to 486.0.0.
 2019-06-03 23:57:02 +09:00
Stéphane Campinas
e6b60a40d5 stabilise fn_args_density (#3581) 2019-06-03 22:26:48 +09:00
Stéphane Campinas
6d19a8c71d
Merge pull request #3586 from topecongiro/issue-3584 
Format trait aliases with where clauses
 2019-05-30 09:39:15 +02:00
rChaser53
fbd9f335f9 fix Erasing inner attributes in struct (#3593) 2019-05-30 07:31:48 +09:00
Stéphane Campinas
1c210eb3c6
Merge pull request #3589 from topecongiro/issue-3583 
Catch panics from the parser while rewriting macro calls
 2019-05-28 00:49:28 +02:00
topecongiro
36dd49ae5f Set macro_rewrite_failure to true on catching panic 2019-05-28 00:15:14 +09:00
topecongiro
f7cd789ebc Catch panics from the parser while rewriting macro calls 2019-05-28 00:03:50 +09:00
topecongiro
c1373b267b Format trait aliases with where clauses 2019-05-26 21:15:55 +09:00
topecongiro
95c2ad37e1 Refactor rewrite_where_clause 2019-05-26 21:15:38 +09:00
Ivan Veselov
8443262781 Use structopt for rustfmt-format-diff arguments parsing 2019-05-23 22:59:26 +01:00
Seiichi Uchida
a7d4ec92cb Implement Serialize on IgnoreList (#3565) 
* Implement Serialize on IgnoreList

* Add a test for #3536
 2019-05-22 09:41:57 +02:00
Seiichi Uchida
b5449ba785
Allow overflowing rhs of unit variant (#3566) 2019-05-22 10:51:19 +09:00
Seiichi Uchida
72ca0e5f2c
Merge pull request #3577 from topecongiro/issue-3575 
Insert an empty line when normalizing `#[doc = ""]`
 2019-05-22 10:49:12 +09:00
Seiichi Uchida
86dad6e3dd
Merge pull request #3576 from rchaser53/issue-3567 
add the handling for vec! with paren inside macro
 2019-05-22 07:00:07 +09:00
Ivan Veselov
a7afdeb9b8 Drop only the first occurrence of fmt while preparing CLI arguments 2019-05-21 16:36:53 +01:00
Ivan Veselov
32fbe75a4c Drop extra fmt command line argument provided by cargo 2019-05-21 16:36:53 +01:00
Ivan Veselov
ed073a9b7c Use structopt for command line arguments parsing in cargo-fmt 2019-05-21 16:36:53 +01:00
topecongiro
bdb72237a2 Insert an empty line when normalizing #[doc = ""] 2019-05-22 00:10:46 +09:00
rchaser53
bee1a32f26 add the handling for vec! with paren inside macro 2019-05-22 00:07:56 +09:00
rChaser53
0ef2144c82 not to avoid self (#3570) 2019-05-21 11:43:27 +09:00
Ruben Schmidmeister
1ba35fc9b5
Document DocCommentFormatter 2019-05-18 11:50:09 +02:00
Ruben Schmidmeister
11a68d313a
Pass string instead of Symbol to DocCommentFormatter 2019-05-18 11:47:54 +02:00
Ruben Schmidmeister
8d4cb6e783
Use peek() instead of checking indexes 2019-05-18 11:42:49 +02:00
Ruben Schmidmeister
9b98dd774e
Merge branch 'master' into normalize-multiline-doc-attributes 2019-05-18 11:27:35 +02:00
Ruben Schmidmeister
8b57668c33
Move macro to separate module 2019-05-17 16:13:46 +02:00
Ruben Schmidmeister
4745cec7f3
Re-use nightly channel macro 2019-05-17 16:07:49 +02:00
Ruben Schmidmeister
fd22c27c47
Allow tests to be run on nightly only 2019-05-17 15:58:01 +02:00
rchaser53
53142b486d use the span between the self_ty and left brace 2019-05-16 21:27:34 +09:00
rchaser53
bdf105245b fix Const generics are handled incorrectly 2019-05-16 13:22:25 +09:00
Seiichi Uchida
531b2d9136
Merge pull request #3535 from xiongmao86/issue3417 
Try to solve issue 3417.
 2019-05-16 11:12:56 +09:00
Ruben Schmidmeister
424193041f
Remove unnecessary comma 2019-05-15 18:29:04 +02:00
Ruben Schmidmeister
c84785d93c
Use raw strings 2019-05-15 18:17:48 +02:00
Ruben Schmidmeister
c724528bf9
Avoid unnecessary allocation 2019-05-15 17:39:43 +02:00
Ruben Schmidmeister
6a406a822d
Return iterator instead of collecting early 2019-05-14 20:38:28 +02:00
Ruben Schmidmeister
b875fe9485
Name field more verbosely 
This makes the comment above it obsolete
 2019-05-14 20:23:55 +02:00
Ruben Schmidmeister
3eb8e4d33c
Ignore unstable key when overriding config 2019-05-13 09:40:16 +02:00
Ruben Schmidmeister
4ac0d35ebb
Only run test on nightly 2019-05-12 23:03:48 +02:00
Ruben Schmidmeister
47a0f78b3b
Fix normalisation of multi-line doc attributes 2019-05-11 15:07:16 +02:00
xiongmao86
a956a20532 Revert "Revert "Change config option from format_doc_comments to format_code_in_doc_comments."" 
This reverts commit 97d7216cd4.
 2019-05-10 21:22:52 +08:00
Stéphane Campinas
cc97eaf9f9
Merge pull request #3546 from bash/unreachable-pub 
Enable unreachable_pub lint
 2019-05-10 09:59:07 +02:00
Stéphane Campinas
4bc5911348
Merge pull request #3526 from bash/refactor-apply-newline-style 
Refactor apply newline style
 2019-05-10 09:48:01 +02:00
Ruben Schmidmeister
d1c1f8e61e
Run rustfmt 2019-05-09 21:13:32 +02:00
Ruben Schmidmeister
618d092bf7
Enable unreachable_pub lint 2019-05-09 20:37:51 +02:00
Andy Russell
ee6f686cc9
use derive feature over serde_derive crate 2019-05-09 13:22:44 -04:00
Ruben Schmidmeister
821a370417
Add tests to cover more edge cases 2019-05-09 17:51:02 +02:00
Ruben Schmidmeister
1f09d94cbb
Make sure windows newlines don't gain an extra carriage return 2019-05-09 17:44:52 +02:00
Ruben Schmidmeister
f54fc2f2fc
Implement conversion to unix newlines 2019-05-09 17:22:16 +02:00
xiongmao86
97d7216cd4 Revert "Change config option from format_doc_comments to format_code_in_doc_comments." 
This reverts commit 6a6924c12b.
 2019-05-08 16:51:32 +08:00
Stéphane Campinas
da1e3c9635
Merge pull request #3540 from rchaser53/issue-3539 
correct to get wrong BytePos
 2019-05-06 22:31:38 +02:00
xiongmao86
6a6924c12b Change config option from format_doc_comments to format_code_in_doc_comments. 2019-05-06 19:45:34 +08:00
David Alber
bfe5e9c108 Fix condition typo 2019-05-05 11:55:11 -07:00
rchaser53
7a93a26aad correct to get wrong BytePos 2019-05-06 00:01:13 +09:00
xiongmao86
3300bb22a5 Isolate format_doc_comment with normalize_comments and wrap_comments. 2019-05-02 21:11:13 +08:00
Ruben Schmidmeister
703a2eab19
Merge remote-tracking branch 'origin/master' into refactor-apply-newline-style 2019-05-02 06:47:41 +02:00
rchaser53
2c58b205d5 fix Comma in comment causes no formatting 2019-04-29 21:38:38 +09:00
topecongiro
3dec18a681 Add doc comment 2019-04-27 18:56:04 +09:00
topecongiro
20bdb2fb9d Use config_type proc macro 2019-04-27 18:56:04 +09:00
Ruben Schmidmeister
7556c420ab
Use more descriptive names 2019-04-24 21:58:50 +02:00
Ruben Schmidmeister
19bd1a44ce
Preserve standalone carriage returns on windows also 2019-04-24 21:01:09 +02:00
Ruben Schmidmeister
2e77f2bca7
Split apply with auto detection tests into separate fns 2019-04-24 21:01:09 +02:00
Ruben Schmidmeister
0f1d5760ba
Fix auto detection of windows newlines for inputs with multibyte chars 2019-04-24 21:01:09 +02:00
Ruben Schmidmeister
20c8d8aabc
Split auto_detect tests into seperate fns 2019-04-24 21:01:09 +02:00
Ruben Schmidmeister
764cdf60fa
Extract conversion to windows newlines into fn 2019-04-24 21:01:09 +02:00
Ruben Schmidmeister
58d7b2cc66
Extract literals into constants 2019-04-24 21:01:09 +02:00
Ruben Schmidmeister
add473667a
Introduce effective newline style 2019-04-24 21:01:09 +02:00
Ruben Schmidmeister
8849273efb
Convert to free standing functions 2019-04-24 21:01:09 +02:00
Ruben Schmidmeister
ba5b2e9c9b
Extract applying of newline style into own mod 2019-04-24 21:01:09 +02:00
Seiichi Uchida
a6daccc229
Merge pull request #3523 from topecongiro/issue-3515 
Attempt to format attributes if only they exist
 2019-04-24 07:22:55 -07:00
Seiichi Uchida
aeb556ecb2
Merge pull request #3522 from topecongiro/issue-3521 
Add a path to the parent dir of rustfmt.toml as a prefix to paths in ignore
 2019-04-24 07:22:40 -07:00
topecongiro
f520f7e0f8 Suppress spurious parse error messages on skipped files 2019-04-24 20:46:29 +09:00
topecongiro
a20ffc6d52 Add a path to rustfmt.toml to GitIgnore as root path 2019-04-24 20:22:35 +09:00
rChaser53
05547d90b5 leave the comment in parentheses of argumentless Fn (#3518) 2019-04-23 16:21:04 -07:00
topecongiro
af3e940940 Attempt to format attributes if only they exist 2019-04-23 08:50:59 +09:00
topecongiro
f8d3aa5908 Add a path to the parent dir of rustfmt.toml as a prefix 
Paths users specify in `ignore` configuraiton option is relative to the
directory which contains the rustfmt.toml file. When processing the ignore paths
internally, rustfmt should add a path to the directory as a  prefix since
RealPath passed from libsyntax is a full path.
 2019-04-23 08:12:02 +09:00
Oliver Scherer
c60d6ddc02
"first" element check does nothing 2019-04-22 13:04:44 +02:00
Seiichi Uchida
5dd042c152
Merge pull request #3511 from topecongiro/issue3498 
Avoid overflowing item with attributes
 2019-04-17 11:40:00 -07:00
Seiichi Uchida
760ec07978
Merge pull request #3510 from topecongiro/issue3509 
Fix duplication of attributes on a match arm's body
 2019-04-17 11:39:44 -07:00
Ruben Schmidmeister
3dc625c661 Use annotate-snippets for emitting errors (#3507) 2019-04-17 05:33:36 -07:00
Seiichi Uchida
efa3a62b56
Merge pull request #3512 from scampi/issue-2724 
exit integration test successfully if the crate build failed before applying rustfmt
 2019-04-16 00:42:15 -07:00
Stéphane Campinas
d0df47fc58
Merge pull request #3506 from rchaser53/issue-3505 
fix not to emit version
 2019-04-16 07:29:26 +02:00
Stéphane Campinas
1c7202b2ee
fix test_ignore_path_set test when run on beta 
```
---- ignore_path::test::test_ignore_path_set stdout ----
Warning: can't set `ignore = IgnoreList({"foo.rs", "bar_dir/*"})`, unstable features are only available in nightly channel.
thread 'ignore_path::test::test_ignore_path_set' panicked at 'assertion failed: ignore_path_set.is_match(&FileName::Real(PathBuf::from("src/foo.rs")))', src/ignore_path.rs:51:9
note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
failures:
    ignore_path::test::test_ignore_path_set
```
 2019-04-15 14:00:11 +02:00
topecongiro
d3e578b131 Avoid overflowing item if it has attributes 2019-04-14 20:45:04 +09:00
rchaser53
15ab363508 not to use Vec 2019-04-14 20:37:29 +09:00
topecongiro
b57e0e2279 Disallow putting a body with attributes on the same line 2019-04-14 20:13:54 +09:00
topecongiro
3d80678e24 Do not include body's attributes in arrow_span 2019-04-14 20:13:07 +09:00
rChaser53
34bf13718a Allow specifying glob pattern to ignore config option (#3488) 2019-04-14 03:30:44 -07:00
rchaser53
3759a6695d add the error mapping 2019-04-14 17:34:53 +09:00
rchaser53
8a04ec6ec7 fix not to emit version 2019-04-14 00:23:10 +09:00
Matthias Krüger
4352681d62 fix clippy warnings 
clippy::needless_return
clippy::redundant_closure
clippy::or_fun_call
clippy::len_zero
clippy::expect_fun_call
clippy::assertions_on_constants
clippy::identity_conversion
clippy::chars_last_cmp
 2019-04-11 13:48:13 +02:00
Seiichi Uchida
378b28b06e
Merge pull request #3495 from scampi/issue-1096 
keep missed comments appearing after the struct/enum ident
 2019-04-10 06:00:51 +09:00
rchaser53
8ffe4146cc fix not to delete semicolon 2019-04-07 12:31:57 +09:00
Stéphane Campinas
bf383c4610
keep missed comments appearing after the struct/enum ident 2019-04-05 17:11:11 +02:00
Stéphane Campinas
8e068510a4 keep comment appearing between parameter's name and its type (#3491) 2019-04-03 18:16:54 +09:00
Christian Duerr
919bee8990
Enable overflow_delimited_expr for structs 
This fixes https://github.com/rust-lang/rustfmt/issues/3482.
 2019-03-30 18:37:37 +01:00
Seiichi Uchida
dfa94d1505
Merge pull request #3480 from sinkuu/cleanup 
Cleanups
 2019-03-29 22:07:19 +09:00
Seiichi Uchida
f70ce00305
Merge pull request #3479 from sinkuu/issue_2995 
Fix indexing panic on unicode whitespaces
 2019-03-29 22:03:42 +09:00
Shotaro Yamada
c0ff894a22 Fix indexing panic on unicode whitespaces 2019-03-29 20:12:45 +09:00
Shotaro Yamada
9fda937779 Remove redundant & 2019-03-29 19:17:50 +09:00
Shotaro Yamada
ff0683d666 Simplify iterators 2019-03-29 19:06:32 +09:00
Shotaro Yamada
8e4c20da80 Write seperator beforehand 2019-03-29 19:06:32 +09:00
Shotaro Yamada
6e288fdae0 Remove a write of empty string 2019-03-29 19:06:32 +09:00
Shotaro Yamada
a2d9b6d1b1 Remove redundant scopes 2019-03-29 19:06:32 +09:00
Shotaro Yamada
e3a4a03657 Use str::repeat 2019-03-29 19:06:32 +09:00
Seiichi Uchida
b4b80b6395
Merge pull request #3472 from devinalvaro/add-print-current-config 
Add option to print current config to stdout
 2019-03-29 17:35:02 +09:00
topecongiro
968d30f5d8 Run tests in a thread with larger stack size 2019-03-26 23:35:07 +09:00
Devin Alvaro
b473e65257 Add --print-config current 2019-03-26 06:49:20 +07:00
Stéphane Campinas
a373e73f5a
Merge pull request #3469 from topecongiro/cargo-fmt 
Fix cargo fmt inconsistency
 2019-03-25 12:33:25 +01:00
Seiichi Uchida
17ca7408f3 Do not add a space after empty impl 2019-03-25 11:21:14 +09:00
topecongiro
b4d4b5795e Use BTreeMap to guarantee consistent ordering 2019-03-25 07:54:52 +09:00
topecongiro
5f1f5aac05 Make sure that we run rustfmt against every edition 2019-03-25 07:54:31 +09:00
Seiichi Uchida
288d7db5a9
Merge pull request #3467 from topecongiro/issue-3465 
Fix bad performance on deeply nested binary expressions
 2019-03-25 07:26:04 +09:00
Seiichi Uchida
929d8a9494
Merge pull request #3459 from scampi/issue-3442 
fix line numbering in missed spans and handle file_lines in edge cases
 2019-03-25 07:25:28 +09:00
Seiichi Uchida
a5cc780c98
Merge pull request #3468 from topecongiro/refactor-create_config 
Move some code out of create_config
 2019-03-25 07:24:57 +09:00
Seiichi Uchida
9b4344161b
Merge pull request #3466 from topecongiro/discard-error-to-sink 
Discard error report in silent_emitter
 2019-03-25 07:24:42 +09:00
Stéphane Campinas
cc26c5eaca
Merge pull request #3454 from rchaser53/issue-3434 
add new attribute rustfmt::skip::macros
 2019-03-24 22:29:56 +01:00
topecongiro
0d67db4744 Move some code out of create_config 2019-03-24 23:36:07 +09:00
topecongiro
abfb381189 Avoid rewriting pairs mutiple times 2019-03-24 18:55:11 +09:00
topecongiro
037cf2c436 Discard every parsing error in silent_emitter 
`EmitterWriter` from rustc is wasting soooo much time constructing an error
message that will never be emitted, instead we just implement our own `Emitter`
that just discards every error message.
 2019-03-24 17:44:55 +09:00
rchaser53
1d9104bbae reflect scampi review 
- fix README.md
- fix BadAttr doc
- is_rustfmt_macro_error => is_unknown_rustfmt_attr
 2019-03-21 21:45:57 +09:00
rchaser53
bbbc1e86eb refrect topecongiro reviews 
- &Vec<syntax::ast::PathSegment> => &[ast::PathSegment]
    - remove unnecessary implements
    - transfer skip logic to inside rewrite_macro
    - fix test
    - use util methods in libsyntax
    - use meta_item_list directly
    - avoid no_entry.rs for test using module system
    - add logic to skip rustfmt::skip::macros only
    - remove base_skip_macro_names
    - remove Rc
    - use clone to append skip_macro_names
 2019-03-21 21:45:39 +09:00
Seiichi Uchida
94b381f1cc
Merge pull request #3464 from topecongiro/issue-3463 
Avoid duplication on the presence of spaces between macro name and !
 2019-03-21 20:32:29 +09:00
topecongiro
017e491a17 Avoid duplication on the presence of spaces between macro name and ! 2019-03-21 15:58:39 +09:00
Stjepan Glavina
1fa06ecf1e Fix formatting of async blocks 2019-03-20 18:18:02 +01:00
rchaser53
f493a59783 use RefCell and Rc 2019-03-21 00:19:52 +09:00
rchaser53
1f8553d66f add new attribute rustfmt::skip::macros 
add test for function not having attribute
 2019-03-21 00:18:51 +09:00
Stéphane Campinas
cdd08da27b
fix line numbering in missed spans and handle file_lines in edge cases 
- a leading/trailing newline character in missed spans was throwing off the
  start/end of ranges used to compare against file_lines
- fix handling of file_lines when closing a block

Close #3442
 2019-03-19 10:19:45 +01:00
Seiichi Uchida
c9479de9a7 Avoid panic on macro inside deeply nested block 
Closes #3457.
 2019-03-19 10:50:44 +09:00
Seiichi Uchida
f048fc0fde
Merge pull request #3448 from topecongiro/use-new_sub_parser_from_file 
Support path clarity module even when we start from internal module
 2019-03-17 14:04:11 +09:00
Seiichi Uchida
ad6d89842a
Merge pull request #3453 from scampi/issue-3423 
remove trailing whitespaces in missing spans
 2019-03-17 14:01:49 +09:00
Stéphane Campinas
be0ada27f4 Add comment which refers to an issue on nightly-only test 
Co-Authored-By: topecongiro <seuchida@gmail.com>
 2019-03-17 12:33:18 +09:00
topecongiro
7fc4e418bf Tweak test settings 2019-03-17 12:33:18 +09:00
topecongiro
d0e96ed331 Do not look for external modules when the input is from stdin 2019-03-17 12:33:18 +09:00
topecongiro
92f57211c1 Support path-clarity submodule 2019-03-17 12:33:13 +09:00
topecongiro
bde77714e6 Disable self_tests on beta channel 2019-03-17 12:21:57 +09:00
Stéphane Campinas
2d5bc69475
remove trailing whitespaces in missing spans 2019-03-16 12:23:02 +01:00
Seiichi Uchida
ce5cccc32c
Update rustc-ap-* crates to 407.0.0 (#3447) 2019-03-14 22:50:53 +09:00
Seiichi Uchida
331a0500ce
Merge pull request #3441 from rchaser53/const-generics 
implement for const generics
 2019-03-14 22:50:20 +09:00
rchaser53
f0c861bfa9 implement for const generics 2019-03-13 03:58:23 +09:00
Seiichi Uchida
5f3dfe6c51
Format the if expression at the end of the block in a single line (#3338) 2019-03-11 23:18:43 +09:00
rchaser53
40ff078abf fix 'Ident of macro+ident gets duplicated' error 2019-03-10 22:58:34 +09:00
Seiichi Uchida
06fc39f905
Merge pull request #3424 from Xanewok/modified-lines-for-stdin 
Support EmitMode::ModifiedLines with stdin input
 2019-03-05 20:54:50 +09:00
Igor Matuszewski
fbfda614be Remove redundant closure 2019-03-04 18:32:58 +01:00
Igor Matuszewski
6b993c8b8b Fix stdin_works... test on Windows 2019-03-04 18:28:25 +01:00
Igor Matuszewski
8aa0f44d15 Remove eprintln 2019-03-04 18:19:30 +01:00
Igor Matuszewski
b3c28dba83 Expose ModifiedLines and implement parsing data from the string output 
This moves `Modified{Chunks,Lines}` from `src/formatting.rs` to
`src/rustfmt_diff.rs` and reexports it in `src/lib.rs`.

With this, a conversion from `Vec<Mismatch>` to `ModifiedLines` was implemented
and now this implements complementary `Display` and `FromStr`, which
simplified the previously used `output_modified` function and which allows to
parse the raw data emitted with `EmitMode::ModifiedLines`.
 2019-03-04 18:19:30 +01:00
Igor Matuszewski
0437bf7a7d Allow for stdin input in EmitMode::ModifiedLines 2019-03-04 18:19:30 +01:00
rchaser53
8e3ef3e3a9 fix not to remove comment in the case of no arg 2019-03-05 00:18:33 +09:00
rchaser53
dec3902076 leave post comment for self 2019-03-02 17:33:43 +09:00
rchaser53
ae7330eea4 leave pre comment for self 2019-02-24 22:05:08 +09:00
rchaser53
be7b3ba2e2 apply inline_attribute_width for extern crate 2019-02-23 13:46:41 +09:00
rchaser53
0e408bf83c add config inline_attribute_width 
If the line width is width within config width, attribute is inline.
I don't want to change default rustfmt behavior, so config default value is 0.

- fix description
- fix test comment
- remove unnecessary clone
- remove unnecessary test file
- fix test for β version
- attributes => attribute
 2019-02-23 13:40:11 +09:00
Alexander Regueiro
7a3b7c9275 Various cosmetic improvements (#3403) 2019-02-19 11:56:42 +09:00
Stéphane Campinas
e5284b1377
Merge pull request #3334 from rchaser53/issue-3227 
fix Inconsistency between  loop  and while
 2019-02-15 13:12:42 +01:00
Seiichi Uchida
b58ba97780
Merge pull request #3401 from topecongiro/rustcap 
Cargo update
 2019-02-14 11:26:05 +09:00
topecongiro
9df1ed6ab4 Cargo update 
Update `rustc-ap-*` crates to 373.0.0.
 2019-02-14 11:08:05 +09:00
rchaser53
7d9a2ef96d version/2: Align loop and while formatting 
The loop and while formatting was diverting as  `loop`
was not being moved to a new, indented block, as `while`
was.

This commit fixes this inconsistency but pins it to version 2
to avoid changing existing code.
 2019-02-14 10:06:29 +09:00
topecongiro
96a3df3b5c Format visibility on trait alias 2019-02-12 10:16:12 +09:00
Seiichi Uchida
ce682bdabc
Merge pull request #3335 from h-michael/rust-2018 
Rust 2018 idioms
 2019-02-11 01:12:38 +09:00
topecongiro
9a7ea6aacb Handle a macro argument with a single keyword 
Closes #3331.
 2019-02-11 00:34:23 +09:00
Seiichi Uchida
c4611a0e6b
Merge pull request #3326 from scampi/issue-3302 
fix formatting of strings within a macro
 2019-02-11 00:32:06 +09:00
Stéphane Campinas
b86dd161df
remove unneeded Version import 2019-02-09 14:23:54 +01:00
Hirokazu Hata
8183b949c4 cargo fmt 2019-02-09 16:20:38 +09:00
Hirokazu Hata
4bb90f5cc8 Fix rust_2018_idioms warnings 2019-02-09 16:14:30 +09:00
Hirokazu Hata
e70e6eb273 deny rust_2018_idioms 2019-02-09 15:55:17 +09:00
Hirokazu Hata
c0f93a6ea3 cargo +nightly fix --edition-idioms 2019-02-09 15:53:12 +09:00
Seiichi Uchida
672f352c89
Merge pull request #3325 from topecongiro/rustcap 
Update rustc-ap-* crates to 366.0.0
 2019-02-08 00:24:57 +09:00
Evgenii
2502939b60 fix review comments 2019-02-07 10:55:55 +03:00
Stéphane Campinas
813aa79567
fix formatting of strings within a macro 2019-02-07 00:05:05 +01:00
Seiichi Uchida
6541f200c9 Fix how we get span of the PathSegment separator 2019-02-06 23:06:47 +09:00
topecongiro
f4f9502ea7 Cargo update 
- Update `rustc-ap-*` crates to 366.0.0
- Update the other crates to the latest stable
 2019-02-06 23:06:15 +09:00
Evgenii
da2d8a4c57 calculate statement first line properly 2019-02-06 10:05:51 +03:00
Seiichi Uchida
aec0a7c999
Merge pull request #3318 from rchaser53/issue-3314 
fix Removed indentation after nested comments error
 2019-02-05 14:03:05 +09:00
rchaser53
5fcb7507ca fix Removed indentation after nested comments error 2019-02-05 13:12:45 +09:00
Evgenii
ece629b1cc transition to Rust 2018 2019-02-04 13:30:43 +03:00
Seiichi Uchida
bfcfaf1743
Merge pull request #3308 from topecongiro/issue-2835 
Prioritize single_line_fn and empty_item_single_line over brace_style
 2019-02-04 00:11:01 +09:00
Seiichi Uchida
efd6fda43f
Merge pull request #3311 from rchaser53/issue-3295 
fix "internal error: left behind trailing whitespace" with long lines
 2019-02-04 00:10:42 +09:00
rchaser53
c2534f5324 fix "internal error: left behind trailing whitespace" with long lines 2019-02-01 19:58:38 +09:00
topecongiro
0142e961ad Prioritize single_line_fn and empty_item_single_line over brace_style 
When either one of these two options are set to `true`, each should take
precedence over the brace_style option.

This commit does not introduce any formatting change to the default
configuration, so no version gate is required.
 2019-02-01 00:22:47 +09:00
topecongiro
154ccf6a02 Do not force trailing comma when using mixed layout 2019-01-31 23:44:58 +09:00
Seiichi Uchida
923da60f72
Merge pull request #3298 from topecongiro/issue-3272 
Use the same rule between function and macro
 2019-01-30 00:36:55 +09:00
topecongiro
181ca427dc Use the same rule with macro and function calls with a single chain 2019-01-28 23:05:42 +09:00
topecongiro
5df0a18849 Avoid putting a long macro call in a single line 2019-01-28 23:05:39 +09:00
Seiichi Uchida
36c9dc646c
Merge pull request #3293 from scampi/issue-3241 
Keep leading colons for global paths
 2019-01-27 23:14:57 +09:00
Mara Bos
635a4cdcdc Also look in home directory for global config. 2019-01-27 13:22:25 +01:00
Mara Bos
24daa174ca Look for a global rustfmt.toml. 
If no rustfmt.toml is found in the usual way, the directory 'rustfmt' in
the user's config directory is checked.

 - $XDG_CONFIG_HOME/rustfmt/ (or $HOME/.config/rustfmt/), or
 - $HOME/Library/Preferences/rustfmt/ on Mac, or
 - %AppData%\rustfmt\ on Windows.
 2019-01-27 13:22:25 +01:00
Stéphane Campinas
2125ad272e
fix glob and nested global imports 2019-01-27 12:46:14 +01:00
Seiichi Uchida
203e6d265d
Merge pull request #3294 from rchaser53/issue-3278 
change new line point in the case of no args
 2019-01-27 16:28:28 +09:00
Seiichi Uchida
35d5ef7828
Apply rustfmt::skip on imports (#3289) 2019-01-27 16:26:09 +09:00
rchaser53
f92f3e3bda add the version gate to the code and test 2019-01-27 14:38:57 +09:00
Matthias Krüger
d44ee75438 update dependencies 
update itertools from 0.7 to 0.8
update env_logger from 0.5 to 0.6
update cargo_metadata from 0.6 to 0.7
update bytecount from 0.4 to 0.5
 2019-01-27 00:58:46 +01:00
rchaser53
7b996542cc change new line point in the case of no args 2019-01-26 00:16:51 +09:00
Stéphane Campinas
a2bfc026e5
keep leading double-colon to respect the 2018 edition of rust's paths 2019-01-23 00:01:53 +01:00
Nick Cameron
d2e91b5b68
Merge pull request #3284 from scampi/issue-3270 
recognize strings inside comments in order to avoid indenting them
 2019-01-17 20:22:36 +13:00
Stéphane Campinas
083a20fb1a
version-gate the formatting of commented strings 2019-01-16 23:06:28 +01:00
wada314
a01990c4d0 Use Unicode-standard char width to wrap comments or strings. (#3275) 2019-01-15 08:41:09 +09:00
Stéphane Campinas
503cddeb0f
Merge pull request #3225 from scampi/issue-3224 
rewrite_comment: fix block fallback when failing to rewrite an itemized block
 2019-01-14 14:41:00 +01:00
Stéphane Campinas
baa62c609e
recognize strings inside comments in order to avoid indenting them 
Close #3270
 2019-01-10 21:04:16 +01:00
Nick Cameron
2c204c11d1
Merge pull request #3260 from topecongiro/issue-3004 
Do not modify original source code inside macro call
 2019-01-07 17:39:05 +13:00
David Hewson
a8d2591f0c allow specifying package with -p 
currently `cargo fmt -p blah` is rejected but `cargo fmt --package blah` is allowed. both should be allowed
 2019-01-01 17:49:55 +00:00
Stéphane Campinas
3b18238009
simplify function to create a string from the itemized block 2018-12-25 23:15:52 +01:00
Seiichi Uchida
996d5e8d6c
Fix shape when formatting return or break expr on statement position (#3259) 2018-12-25 18:20:29 +09:00
wada314
09c9cd4125 Fix issue #3263 (#3264) 2018-12-25 18:03:48 +09:00
Seiichi Uchida
84702bc289
Merge pull request #3266 from wada314/fix-2973 
Fix issue #3265
 2018-12-25 18:00:45 +09:00
Shohei Wada
d504a66076 Remove a trivial redundant code. 
self.base.peek().is_none() case is already catched by the line above.
 2018-12-24 17:48:42 +09:00
Shohei Wada
e37f468b21 Change \r detection much simpler. 2018-12-24 07:25:15 +09:00
Shohei Wada
f3f511af1b Fix #2973 in Windows CRLF env. 2018-12-24 06:12:28 +09:00
topecongiro
49568d7f76 Do not modify original source code inside macro call 2018-12-20 01:14:14 +09:00
Stéphane Campinas
e305262493
clarify the version-gate used for the #3229 change 2018-12-19 09:36:47 +01:00
Seiichi Uchida
3f6ea7788b
Merge pull request #3240 from Xanewok/parser-panic 
Catch possible tokenizer panics
 2018-12-18 11:30:08 +09:00
Seiichi Uchida
d1c7afe080
Merge pull request #3250 from scampi/issue3229 
version-gate the trailing semicolon change of return statements inside a match arm
 2018-12-18 11:22:45 +09:00
Philipp Hansch
d0785954c8 Fix trim_right/trim_left deprecation warnings (#3252) 2018-12-18 11:21:31 +09:00
Andreas Jonson
653f3ae636 use the rustfmt function to find the bin 
makes it possible to execute the test after a release build
 2018-12-14 23:32:25 +01:00
Andreas Jonson
836562baf4 remove deprecated dependency assert_cli 2018-12-14 23:32:08 +01:00
Stéphane Campinas
b73a602d6e
version-gate the trailing semicolon change of return statements inside a match arm 2018-12-14 09:54:23 +01:00
Igor Matuszewski
c7ee2a2857 Don't ignore parse error when constructing report 2018-12-13 13:35:15 +01:00
Igor Matuszewski
a2042a6470 Use non-panicking maybe_parser_from_source_str 2018-12-13 13:35:15 +01:00
Igor Matuszewski
10b9afa906 Add test asserting we catch Rust parser panics 2018-12-13 13:35:15 +01:00
kngwyu
fd27eabbb7 Update rustc-ap-syntax to 306.0 2018-12-08 14:39:52 +09:00
Stéphane Campinas
ab7f4e19eb
rewrite_comment: fix block fallback when failing to rewrite an itemized block 
Close #3224
 2018-12-02 00:22:36 +01:00
Stéphane Campinas
d03d9a45ef
end expressions like return/continue/break with a semicolon 
Close #3213
 2018-11-29 20:39:07 +01:00
Stéphane Campinas
40174e9481
fix the visitor's starting position when visiting a labelled block 
Close #3217
 2018-11-28 22:50:17 +01:00
Nick Cameron
bbc380b1e6
Merge pull request #3221 from alexreg/cosmetic-1 
Cosmetic improvements
 2018-11-28 15:29:18 +13:00
Alexander Regueiro
7fb5c0b0c9 Cosmetic improvements 2018-11-27 23:03:09 +00:00
Nick Cameron
378994b858 Add a version option 2018-11-27 14:18:14 +13:00
Stéphane Campinas
a2da636ab3
allow to run a rustfmt command from cargo-fmt even when there is no target 2018-11-26 20:39:12 +01:00
Nick Cameron
b9f4624ca6 fixup minor bugs 2018-11-19 14:09:29 +13:00
Nick Cameron
3d01fc186a
Merge pull request #3177 from kestred/kstenerson/preserve-brace-leading-ws 
Format brace-delimited macros with a space after the name
 2018-11-19 13:35:09 +13:00
Seiichi Uchida
1dd54e67a1
Prefer to break arguments over putting output type on the next line (#3190) 2018-11-18 21:31:40 +09:00
Kevin Stenerson
bc5124e016 Always enforce exactly one space between macro! and braces ({}) 2018-11-17 11:53:11 -07:00