]> git.lizzy.rs Git - rust.git/log
rust.git
5 years agoshow the HEAD of the integration branch to faciliate reproducing an error with rustfmt
Stéphane Campinas [Wed, 20 Mar 2019 09:16:41 +0000 (10:16 +0100)]
show the HEAD of the integration branch to faciliate reproducing an error with rustfmt

5 years agoMerge pull request #3458 from topecongiro/issue-3457
Stéphane Campinas [Tue, 19 Mar 2019 21:13:08 +0000 (22:13 +0100)]
Merge pull request #3458 from topecongiro/issue-3457

Avoid panic on macro inside deeply nested block

5 years agofix line numbering in missed spans and handle file_lines in edge cases
Stéphane Campinas [Tue, 19 Mar 2019 09:19:45 +0000 (10:19 +0100)]
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

5 years agoAvoid panic on macro inside deeply nested block
Seiichi Uchida [Tue, 19 Mar 2019 01:50:44 +0000 (10:50 +0900)]
Avoid panic on macro inside deeply nested block

Closes #3457.

5 years agoRelease 1.1.0
topecongiro [Sun, 17 Mar 2019 05:05:02 +0000 (14:05 +0900)]
Release 1.1.0

5 years agoMerge pull request #3448 from topecongiro/use-new_sub_parser_from_file
Seiichi Uchida [Sun, 17 Mar 2019 05:04:11 +0000 (14:04 +0900)]
Merge pull request #3448 from topecongiro/use-new_sub_parser_from_file

Support path clarity module even when we start from internal module

5 years agoMerge pull request #3453 from scampi/issue-3423
Seiichi Uchida [Sun, 17 Mar 2019 05:01:49 +0000 (14:01 +0900)]
Merge pull request #3453 from scampi/issue-3423

remove trailing whitespaces in missing spans

5 years agoAdd comment which refers to an issue on nightly-only test
Stéphane Campinas [Sun, 17 Mar 2019 03:30:06 +0000 (12:30 +0900)]
Add comment which refers to an issue on nightly-only test

Co-Authored-By: topecongiro <seuchida@gmail.com>
5 years agoTweak test settings
topecongiro [Sun, 17 Mar 2019 03:27:24 +0000 (12:27 +0900)]
Tweak test settings

5 years agoDo not look for external modules when the input is from stdin
topecongiro [Sun, 17 Mar 2019 03:26:45 +0000 (12:26 +0900)]
Do not look for external modules when the input is from stdin

5 years agoSupport path-clarity submodule
topecongiro [Sun, 17 Mar 2019 03:25:59 +0000 (12:25 +0900)]
Support path-clarity submodule

5 years agoDisable self_tests on beta channel
topecongiro [Sun, 17 Mar 2019 03:21:57 +0000 (12:21 +0900)]
Disable self_tests on beta channel

5 years agoAdd a test for #3427
topecongiro [Sun, 17 Mar 2019 03:21:21 +0000 (12:21 +0900)]
Add a test for #3427

5 years agoremove trailing whitespaces in missing spans
Stéphane Campinas [Sat, 16 Mar 2019 11:23:02 +0000 (12:23 +0100)]
remove trailing whitespaces in missing spans

5 years agoUpdate rustc-ap-* crates to 407.0.0 (#3447)
Seiichi Uchida [Thu, 14 Mar 2019 13:50:53 +0000 (22:50 +0900)]
Update rustc-ap-* crates to 407.0.0 (#3447)

5 years agoMerge pull request #3441 from rchaser53/const-generics
Seiichi Uchida [Thu, 14 Mar 2019 13:50:20 +0000 (22:50 +0900)]
Merge pull request #3441 from rchaser53/const-generics

implement for const generics

5 years agoMerge pull request #3444 from daxpedda/patch-1
Stéphane Campinas [Wed, 13 Mar 2019 20:42:41 +0000 (21:42 +0100)]
Merge pull request #3444 from daxpedda/patch-1

Additional info to default value of edition.

5 years agoAdditional info to default value of edition.
daxpedda [Wed, 13 Mar 2019 14:46:34 +0000 (15:46 +0100)]
Additional info to default value of edition.

5 years agoimplement for const generics
rchaser53 [Mon, 11 Mar 2019 13:24:49 +0000 (22:24 +0900)]
implement for const generics

5 years agoFormat the if expression at the end of the block in a single line (#3338)
Seiichi Uchida [Mon, 11 Mar 2019 14:18:43 +0000 (23:18 +0900)]
Format the if expression at the end of the block in a single line (#3338)

5 years agoMerge pull request #3440 from rchaser53/issue-3439
Seiichi Uchida [Sun, 10 Mar 2019 14:29:29 +0000 (23:29 +0900)]
Merge pull request #3440 from rchaser53/issue-3439

fix 'Ident of macro+ident gets duplicated' error

5 years agofix 'Ident of macro+ident gets duplicated' error
rchaser53 [Sun, 10 Mar 2019 13:58:34 +0000 (22:58 +0900)]
fix 'Ident of macro+ident gets duplicated' error

5 years agoMerge pull request #3424 from Xanewok/modified-lines-for-stdin
Seiichi Uchida [Tue, 5 Mar 2019 11:54:50 +0000 (20:54 +0900)]
Merge pull request #3424 from Xanewok/modified-lines-for-stdin

Support EmitMode::ModifiedLines with stdin input

5 years agoMerge pull request #3430 from rchaser53/no-arg-with-comment
Seiichi Uchida [Tue, 5 Mar 2019 11:43:11 +0000 (20:43 +0900)]
Merge pull request #3430 from rchaser53/no-arg-with-comment

fix not to remove comment in the case of no arg

5 years agoRemove redundant closure
Igor Matuszewski [Mon, 4 Mar 2019 17:32:58 +0000 (18:32 +0100)]
Remove redundant closure

5 years agoFix stdin_works... test on Windows
Igor Matuszewski [Mon, 4 Mar 2019 17:28:25 +0000 (18:28 +0100)]
Fix stdin_works... test on Windows

5 years agoRemove eprintln
Igor Matuszewski [Sat, 2 Mar 2019 22:21:47 +0000 (23:21 +0100)]
Remove eprintln

5 years agoExpose ModifiedLines and implement parsing data from the string output
Igor Matuszewski [Fri, 1 Mar 2019 18:20:57 +0000 (19:20 +0100)]
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`.

5 years agoAllow for stdin input in EmitMode::ModifiedLines
Igor Matuszewski [Fri, 1 Mar 2019 16:59:38 +0000 (17:59 +0100)]
Allow for stdin input in EmitMode::ModifiedLines

5 years agofix not to remove comment in the case of no arg
rchaser53 [Mon, 4 Mar 2019 15:18:33 +0000 (00:18 +0900)]
fix not to remove comment in the case of no arg

5 years agoMerge pull request #3415 from rchaser53/issue-3198
Seiichi Uchida [Mon, 4 Mar 2019 12:01:30 +0000 (21:01 +0900)]
Merge pull request #3415 from rchaser53/issue-3198

fix the comment for self are swallowed

5 years agoMerge pull request #3425 from scampi/futures-rs
Stéphane Campinas [Mon, 4 Mar 2019 09:46:32 +0000 (10:46 +0100)]
Merge pull request #3425 from scampi/futures-rs

move futures-rs repo back into the required tests

5 years agoleave post comment for self
rchaser53 [Sun, 24 Feb 2019 14:04:47 +0000 (23:04 +0900)]
leave post comment for self

5 years agomove futures-rs integration back into required tests
Stéphane Campinas [Fri, 1 Mar 2019 09:23:27 +0000 (10:23 +0100)]
move futures-rs integration back into required tests

5 years agoUpdate README.md
Nick Cameron [Wed, 27 Feb 2019 19:44:59 +0000 (08:44 +1300)]
Update README.md

Update the Appveyor badge

5 years agoleave pre comment for self
rchaser53 [Sun, 24 Feb 2019 06:18:46 +0000 (15:18 +0900)]
leave pre comment for self

5 years agoMerge pull request #3409 from rchaser53/issue-3343
Stéphane Campinas [Sat, 23 Feb 2019 12:16:23 +0000 (13:16 +0100)]
Merge pull request #3409 from rchaser53/issue-3343

add config inline_attribute_width

5 years agoapply inline_attribute_width for extern crate
rchaser53 [Fri, 22 Feb 2019 14:02:22 +0000 (23:02 +0900)]
apply inline_attribute_width for extern crate

5 years agoadd a section to Configuration.md
rchaser53 [Wed, 20 Feb 2019 11:25:01 +0000 (20:25 +0900)]
add a section to Configuration.md

- attributes => attribute

5 years agoadd config inline_attribute_width
rchaser53 [Tue, 19 Feb 2019 12:13:26 +0000 (21:13 +0900)]
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

5 years agoMerge pull request #3412 from mathstuf/doc-typos
Seiichi Uchida [Sat, 23 Feb 2019 03:34:34 +0000 (12:34 +0900)]
Merge pull request #3412 from mathstuf/doc-typos

Configurations: fix typos and mismatches

5 years agoConfigurations: fix typos and mismatches
Ben Boeckel [Fri, 22 Feb 2019 19:07:55 +0000 (14:07 -0500)]
Configurations: fix typos and mismatches

5 years agoMerge pull request #3411 from scampi/version-gate-clarification
Seiichi Uchida [Fri, 22 Feb 2019 06:06:15 +0000 (15:06 +0900)]
Merge pull request #3411 from scampi/version-gate-clarification

indicate that version-gate are to be considered only with changes to the default formatting

5 years agoindicate that version-gate are to be considered only with changes to the default...
Stéphane Campinas [Thu, 21 Feb 2019 13:39:07 +0000 (14:39 +0100)]
indicate that version-gate are to be considered only with changes to the default formatting

5 years agoVarious cosmetic improvements (#3403)
Alexander Regueiro [Tue, 19 Feb 2019 02:56:42 +0000 (02:56 +0000)]
Various cosmetic improvements (#3403)

5 years agoMerge pull request #3407 from scampi/futures-rs
Seiichi Uchida [Mon, 18 Feb 2019 23:59:56 +0000 (08:59 +0900)]
Merge pull request #3407 from scampi/futures-rs

silence build failures of futures-rs until https://github.com/rust-la…

5 years agoMerge pull request #3408 from scampi/issue-3111
Seiichi Uchida [Mon, 18 Feb 2019 23:59:12 +0000 (08:59 +0900)]
Merge pull request #3408 from scampi/issue-3111

do not put tracking issue as part of the option's title

5 years agodo not put tracking issue as part of the option's title
Stéphane Campinas [Mon, 18 Feb 2019 19:35:22 +0000 (20:35 +0100)]
do not put tracking issue as part of the option's title

5 years agosilence build failures of futures-rs until https://github.com/rust-lang-nursery/futur...
Stéphane Campinas [Mon, 18 Feb 2019 19:14:03 +0000 (20:14 +0100)]
silence build failures of futures-rs until https://github.com/rust-lang-nursery/futures-rs/pull/1445 is merged

5 years agoMerge pull request #3402 from scampi/stdsimd
Seiichi Uchida [Mon, 18 Feb 2019 04:18:53 +0000 (13:18 +0900)]
Merge pull request #3402 from scampi/stdsimd

set the TARGET envar for the stdsimd integration test

5 years agoset the TARGET envar for the stdsimd integration test
Stéphane Campinas [Fri, 15 Feb 2019 12:14:45 +0000 (13:14 +0100)]
set the TARGET envar for the stdsimd integration test

5 years agoMerge pull request #3334 from rchaser53/issue-3227
Stéphane Campinas [Fri, 15 Feb 2019 12:12:42 +0000 (13:12 +0100)]
Merge pull request #3334 from rchaser53/issue-3227

fix Inconsistency between  loop  and while

5 years agoremove tests/source/issue-3227/one.rs
rchaser53 [Fri, 15 Feb 2019 09:11:49 +0000 (18:11 +0900)]
remove tests/source/issue-3227/one.rs

5 years ago1.0.3
topecongiro [Thu, 14 Feb 2019 02:27:55 +0000 (11:27 +0900)]
1.0.3

5 years agoMerge pull request #3401 from topecongiro/rustcap
Seiichi Uchida [Thu, 14 Feb 2019 02:26:05 +0000 (11:26 +0900)]
Merge pull request #3401 from topecongiro/rustcap

Cargo update

5 years agoCargo update
topecongiro [Thu, 14 Feb 2019 02:08:05 +0000 (11:08 +0900)]
Cargo update

Update `rustc-ap-*` crates to 373.0.0.

5 years ago1.0.2
topecongiro [Tue, 12 Feb 2019 16:34:34 +0000 (01:34 +0900)]
1.0.2

5 years agoversion/2: Align loop and while formatting
rchaser53 [Fri, 8 Feb 2019 12:39:11 +0000 (21:39 +0900)]
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.

5 years agopoint unstable options to tracking issues
Stéphane Campinas [Wed, 13 Feb 2019 23:11:25 +0000 (00:11 +0100)]
point unstable options to tracking issues

5 years agoMerge pull request #3342 from topecongiro/visibility-on-trait-alias
Seiichi Uchida [Tue, 12 Feb 2019 16:29:41 +0000 (01:29 +0900)]
Merge pull request #3342 from topecongiro/visibility-on-trait-alias

Format visibility on trait alias

5 years agoFormat visibility on trait alias
topecongiro [Tue, 12 Feb 2019 01:16:12 +0000 (10:16 +0900)]
Format visibility on trait alias

5 years agoMerge pull request #3335 from h-michael/rust-2018
Seiichi Uchida [Sun, 10 Feb 2019 16:12:38 +0000 (01:12 +0900)]
Merge pull request #3335 from h-michael/rust-2018

Rust 2018 idioms

5 years agoMerge pull request #3333 from topecongiro/macro-arg-single-keyword
Seiichi Uchida [Sun, 10 Feb 2019 15:45:13 +0000 (00:45 +0900)]
Merge pull request #3333 from topecongiro/macro-arg-single-keyword

Handle a macro argument with a single keyword

5 years agoHandle a macro argument with a single keyword
topecongiro [Fri, 8 Feb 2019 03:28:35 +0000 (12:28 +0900)]
Handle a macro argument with a single keyword

Closes #3331.

5 years agoMerge pull request #3326 from scampi/issue-3302
Seiichi Uchida [Sun, 10 Feb 2019 15:32:06 +0000 (00:32 +0900)]
Merge pull request #3326 from scampi/issue-3302

fix formatting of strings within a macro

5 years agoremove unneeded Version import
Stéphane Campinas [Sat, 9 Feb 2019 13:23:54 +0000 (14:23 +0100)]
remove unneeded Version import

5 years agocargo fmt
Hirokazu Hata [Sat, 9 Feb 2019 07:20:38 +0000 (16:20 +0900)]
cargo fmt

5 years agoFix rust_2018_idioms warnings
Hirokazu Hata [Sat, 9 Feb 2019 07:14:30 +0000 (16:14 +0900)]
Fix rust_2018_idioms warnings

5 years agodeny rust_2018_idioms
Hirokazu Hata [Sat, 9 Feb 2019 06:55:17 +0000 (15:55 +0900)]
deny rust_2018_idioms

5 years agocargo +nightly fix --edition-idioms
Hirokazu Hata [Sat, 9 Feb 2019 06:53:12 +0000 (15:53 +0900)]
cargo +nightly fix --edition-idioms

5 years agoMerge pull request #3328 from topecongiro/edition-2018
Stéphane Campinas [Fri, 8 Feb 2019 08:35:27 +0000 (09:35 +0100)]
Merge pull request #3328 from topecongiro/edition-2018

Use edition 2018

5 years agoMerge pull request #3332 from rchaser53/issue-3234
Seiichi Uchida [Fri, 8 Feb 2019 03:35:50 +0000 (12:35 +0900)]
Merge pull request #3332 from rchaser53/issue-3234

add issue-3234 test

5 years agoMerge pull request #3325 from topecongiro/rustcap
Seiichi Uchida [Thu, 7 Feb 2019 15:24:57 +0000 (00:24 +0900)]
Merge pull request #3325 from topecongiro/rustcap

Update rustc-ap-* crates to 366.0.0

5 years agoUse edition 2018
topecongiro [Thu, 7 Feb 2019 15:22:34 +0000 (00:22 +0900)]
Use edition 2018

5 years agoadd issue-3234 test
rchaser53 [Thu, 7 Feb 2019 15:05:54 +0000 (00:05 +0900)]
add issue-3234 test

this issue is already resolved

5 years agoMerge pull request #3322 from fyrchik/fix/3304
Stéphane Campinas [Thu, 7 Feb 2019 09:51:08 +0000 (10:51 +0100)]
Merge pull request #3322 from fyrchik/fix/3304

calculate statement first line properly

5 years agoadd more tests
Evgenii [Thu, 7 Feb 2019 09:12:36 +0000 (12:12 +0300)]
add more tests

5 years agofix review comments
Evgenii [Thu, 7 Feb 2019 07:55:52 +0000 (10:55 +0300)]
fix review comments

5 years agofix formatting of strings within a macro
Stéphane Campinas [Wed, 6 Feb 2019 23:05:05 +0000 (00:05 +0100)]
fix formatting of strings within a macro

5 years agoAdd a test for #3313
Seiichi Uchida [Wed, 6 Feb 2019 14:10:27 +0000 (23:10 +0900)]
Add a test for #3313

5 years agoFix how we get span of the PathSegment separator
Seiichi Uchida [Wed, 6 Feb 2019 14:04:44 +0000 (23:04 +0900)]
Fix how we get span of the PathSegment separator

5 years agoCargo update
topecongiro [Tue, 29 Jan 2019 15:55:52 +0000 (00:55 +0900)]
Cargo update

- Update `rustc-ap-*` crates to 366.0.0
- Update the other crates to the latest stable

5 years agoMerge pull request #3323 from scampi/failure-repo
Seiichi Uchida [Wed, 6 Feb 2019 11:23:25 +0000 (20:23 +0900)]
Merge pull request #3323 from scampi/failure-repo

silence testing on the failure repo until it's fixed

5 years agosilence testing on the failure repo until it's fixed
Stéphane Campinas [Wed, 6 Feb 2019 09:12:32 +0000 (10:12 +0100)]
silence testing on the failure repo until it's fixed

5 years agocalculate statement first line properly
Evgenii [Wed, 6 Feb 2019 06:34:50 +0000 (09:34 +0300)]
calculate statement first line properly

5 years agoMerge pull request #3320 from scampi/unecessary-source-test
Seiichi Uchida [Wed, 6 Feb 2019 01:28:25 +0000 (10:28 +0900)]
Merge pull request #3320 from scampi/unecessary-source-test

remove unecessary source test file

5 years agoremove unecessary source test file
Stéphane Campinas [Tue, 5 Feb 2019 20:19:41 +0000 (21:19 +0100)]
remove unecessary source test file

5 years agoMerge pull request #3318 from rchaser53/issue-3314
Seiichi Uchida [Tue, 5 Feb 2019 05:03:05 +0000 (14:03 +0900)]
Merge pull request #3318 from rchaser53/issue-3314

fix Removed indentation after nested comments error

5 years agofix Removed indentation after nested comments error
rchaser53 [Tue, 5 Feb 2019 04:12:45 +0000 (13:12 +0900)]
fix Removed indentation after nested comments error

5 years agoMerge pull request #3317 from fyrchik/fix/edition
Seiichi Uchida [Tue, 5 Feb 2019 02:24:12 +0000 (11:24 +0900)]
Merge pull request #3317 from fyrchik/fix/edition

transition to Rust 2018

5 years agotransition to Rust 2018
Evgenii [Mon, 4 Feb 2019 10:30:43 +0000 (13:30 +0300)]
transition to Rust 2018

5 years agoMerge pull request #3308 from topecongiro/issue-2835
Seiichi Uchida [Sun, 3 Feb 2019 15:11:01 +0000 (00:11 +0900)]
Merge pull request #3308 from topecongiro/issue-2835

Prioritize single_line_fn and empty_item_single_line over brace_style

5 years agoMerge pull request #3311 from rchaser53/issue-3295
Seiichi Uchida [Sun, 3 Feb 2019 15:10:42 +0000 (00:10 +0900)]
Merge pull request #3311 from rchaser53/issue-3295

fix "internal error: left behind trailing whitespace" with long lines

5 years agofix "internal error: left behind trailing whitespace" with long lines
rchaser53 [Fri, 1 Feb 2019 10:58:38 +0000 (19:58 +0900)]
fix "internal error: left behind trailing whitespace" with long lines

5 years agoMerge pull request #3306 from topecongiro/issue-2841
Seiichi Uchida [Thu, 31 Jan 2019 15:23:15 +0000 (00:23 +0900)]
Merge pull request #3306 from topecongiro/issue-2841

Do not force trailing comma when using mixed layout

5 years agoPrioritize single_line_fn and empty_item_single_line over brace_style
topecongiro [Thu, 31 Jan 2019 15:16:33 +0000 (00:16 +0900)]
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.

5 years agoDo not force trailing comma when using mixed layout
topecongiro [Thu, 31 Jan 2019 14:44:58 +0000 (23:44 +0900)]
Do not force trailing comma when using mixed layout

5 years agoMerge pull request #3298 from topecongiro/issue-3272
Seiichi Uchida [Tue, 29 Jan 2019 15:36:55 +0000 (00:36 +0900)]
Merge pull request #3298 from topecongiro/issue-3272

Use the same rule between function and macro

5 years agoUse the same rule with macro and function calls with a single chain
topecongiro [Sun, 27 Jan 2019 12:01:12 +0000 (21:01 +0900)]
Use the same rule with macro and function calls with a single chain

5 years agoAvoid putting a long macro call in a single line
topecongiro [Sun, 27 Jan 2019 11:50:16 +0000 (20:50 +0900)]
Avoid putting a long macro call in a single line