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.

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

add recursive settings and clean up test whitelist #4142

Merged
merged 61 commits into from
May 26, 2020
Merged

add recursive settings and clean up test whitelist #4142

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
60ed5e9
add recursive mode and clean up whitelist where we can
Apr 27, 2020
3f40a9e
move recursive setting to top of lib.rs files
Apr 28, 2020
009421c
rustfmt-core/rustfmt-lib/src/test/mod.rs : revert skipped files
Apr 28, 2020
fa3395d
Merge branch 'master' into bradleypmartin-test-recursive-mode
May 25, 2020
ddd5c6e
add recursive mode and clean up whitelist where we can
Apr 27, 2020
278a4f1
move recursive setting to top of lib.rs files
Apr 28, 2020
f0cce5b
rustfmt-core/rustfmt-lib/src/test/mod.rs : revert skipped files
Apr 28, 2020
010c678
Update diff.rs (#4150)
Nishikoh May 1, 2020
759aaf7
docs: clarify config opts availability [skip ci] (#4155)
calebcartwright May 3, 2020
58c6c79
update to rustc 656
ctaggart May 5, 2020
ce8493a
Remove disable_all_formatting (#4147)
topecongiro May 7, 2020
445f71e
Stabilize binop_separator.
emilio Apr 30, 2020
5524752
Preserve and format type aliases in extern blocks
ayazhafiz May 9, 2020
8d66e73
fixup! Preserve and format type aliases in extern blocks
ayazhafiz May 9, 2020
dc5fb24
Rename fn_args_layout config option to fn_params_layout (#4163)
ayazhafiz May 10, 2020
e086436
Compare code block line indentation with config whitespace (#4166)
ayazhafiz May 10, 2020
a98b1cd
Exclude code block delimiters when wrapping comments (#4165)
ayazhafiz May 10, 2020
6af9fed
Create FUNDING.yml
topecongiro May 10, 2020
04fdc7a
feat: support configurability of leading pipe
calebcartwright Apr 21, 2020
db9962a
tests: add tests for leading pipe config
calebcartwright Apr 21, 2020
8ef90d1
docs: add config info for match_arm_leading_pipes
calebcartwright Apr 21, 2020
a6509fe
fixup! Preserve and format type aliases in extern blocks
ayazhafiz May 10, 2020
e6d5aea
fixup! Preserve and format type aliases in extern blocks
ayazhafiz May 10, 2020
a5232a2
Properly align comments in unicode lines
ayazhafiz May 10, 2020
e81d184
Remove legacy-rustfmt.toml (#4169)
topecongiro May 11, 2020
e7af9c1
Remove spaces added by comment opener when creating itemized block
ayazhafiz May 11, 2020
02e740d
Exclude where kw from comment following fn return type (#4175)
ayazhafiz May 16, 2020
2ade088
Stabilize match_block_trailing_comma. (#4145)
emilio May 16, 2020
1c06692
Update rustc-ap crates to 659.0.0 (#4188)
topecongiro May 20, 2020
4343c4f
Refactor
topecongiro Apr 30, 2020
9a79fca
Rename
topecongiro May 7, 2020
b9c5fe1
Remove Session
topecongiro May 10, 2020
474ca53
Move formatting-related modules under formatting
topecongiro May 10, 2020
5f5c9d1
Cargo fmt
topecongiro May 10, 2020
b05a902
Move some files
topecongiro May 10, 2020
d261e9c
Add format_inputs
topecongiro May 10, 2020
dd2e0ca
Fix git-rustfmt
topecongiro May 10, 2020
975c19d
Fix test
topecongiro May 10, 2020
100068d
Fix ignored test
topecongiro May 10, 2020
d9f7064
Fix test
topecongiro May 11, 2020
69f6b76
Audit lib.rs
topecongiro May 11, 2020
b68f06b
Cargo fmt
topecongiro May 11, 2020
991ab17
Fix merge conflicts
topecongiro May 20, 2020
fffc7ff
Preserve comments in empty statements (#4180)
ayazhafiz May 20, 2020
037c064
Add test cases for fixed issues (#4189)
ayazhafiz May 21, 2020
25d5f9f
Do not break empty blocks in match arm patterns (#4187)
ayazhafiz May 21, 2020
0e3d5f0
Add cargo-make support (#4191)
topecongiro May 22, 2020
b56a370
Parse comma-separated branches in macro definitions (#4173)
ayazhafiz May 22, 2020
24fa639
Fix module resolution in inner modules with paths (#4194)
mahkoh May 22, 2020
5b62710
Update Contributing.md (#4195)
mahkoh May 23, 2020
20a52b7
Align string type for edition (#4197)
May 23, 2020
b042b37
Merge configs from parent directories (#4179)
ayazhafiz May 24, 2020
cbf44c8
Stabilize ignore config option (#4139)
topecongiro May 24, 2020
4861ef4
Upload annotate-snippets to 0.8 (#4161)
zzau13 May 24, 2020
35121ea
Improve error message when module resolution failed (#4198)
topecongiro May 24, 2020
5936675
Fix CFG_RELEASE value (#4202)
sagiegurari May 25, 2020
0a45e91
#4099: trailing_comma + struct_field_align_threshold -> removing a st…
theo-lw May 25, 2020
b272c77
Fix makefile (#4203)
topecongiro May 25, 2020
256c024
Cargo update
topecongiro May 25, 2020
77a7f95
Release v2.0.0-rc.2
topecongiro May 25, 2020
0b8341f
Merge branch 'bradleypmartin-test-recursive-mode' of https://github.c…
May 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions rustfmt-core/rustfmt-lib/src/test/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,10 @@ const DIFF_CONTEXT_SIZE: usize = 3;

// A list of files on which we want to skip testing.
const SKIP_FILE_WHITE_LIST: &[&str] = &[
"issue-3253/paths",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Placing a remaining whitelisted file up in lexicographical order after 'cleaning house'

"issue-3434/no_entry.rs",
"issue-3665/sub_mod.rs",
// Testing for issue-3779
"issue-3779/ice.rs",
// These files and directory are a part of modules defined inside `cfg_if!`.
"cfg_if/mod.rs",
"cfg_if/detect",
"issue-3253/foo.rs",
"issue-3253/bar.rs",
"issue-3253/paths",
// These files and directory are a part of modules defined inside `cfg_attr(..)`.
"cfg_mod/dir",
"cfg_mod/bar.rs",
"cfg_mod/foo.rs",
"cfg_mod/wasm32.rs",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Between adding the recursive config option to the cfg_if/lib.rs files and possibly some changes that have occurred outside the scope of this PR, a good many of these whitelisted file strings don't seem necessary at this time.

Copy link
Contributor

Choose a reason for hiding this comment

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

We need to keep these files in the list to make sure that recursive is working correctly. The test must pass even when these files are skipped.

// We want to ensure `recursive` is working correctly, so do not test
// these files directly
"configs/recursive/disabled/foo.rs",
Expand Down
1 change: 1 addition & 0 deletions rustfmt-core/rustfmt-lib/tests/source/cfg_if/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
//! * `mips64`: [`is_mips64_feature_detected`]
//! * `powerpc`: [`is_powerpc_feature_detected`]
//! * `powerpc64`: [`is_powerpc64_feature_detected`]
// rustfmt-recursive: true
Copy link
Member

Choose a reason for hiding this comment

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

I think the system/idempotence checks need the inline config options to be at the top of the files as well

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, @calebcartwright ! Even if the config options can 'survive' being down below, I also like how having them at the top matches with their location in other files already. I've gone ahead and moved them up there.

I'll wait on topecongiro's feedback on the particular files we can take off the whitelist, then make those changes as well (feel free to weigh in there too if you've got strong opinions).


#![unstable(feature = "stdsimd", issue = "27731")]
#![feature(const_fn, staged_api, stdsimd, doc_cfg, allow_internal_unstable)]
Expand Down
1 change: 1 addition & 0 deletions rustfmt-core/rustfmt-lib/tests/target/cfg_if/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
//! * `mips64`: [`is_mips64_feature_detected`]
//! * `powerpc`: [`is_powerpc_feature_detected`]
//! * `powerpc64`: [`is_powerpc64_feature_detected`]
// rustfmt-recursive: true

#![unstable(feature = "stdsimd", issue = "27731")]
#![feature(const_fn, staged_api, stdsimd, doc_cfg, allow_internal_unstable)]
Expand Down