From f1846ed83cc5be8a5e398b05fa0b9b299bca5689 Mon Sep 17 00:00:00 2001 From: topecongiro Date: Sat, 4 Jan 2020 18:54:46 +0900 Subject: [PATCH 01/18] Separate rustfmt-core --- Cargo.lock | 154 +++++++------ Cargo.toml | 51 ++--- rustfmt-core/.gitignore | 2 + rustfmt-core/Cargo.toml | 49 +++++ {src => rustfmt-core/src}/attr.rs | 0 {src => rustfmt-core/src}/attr/doc_comment.rs | 0 {src => rustfmt-core/src}/chains.rs | 0 {src => rustfmt-core/src}/closures.rs | 0 {src => rustfmt-core/src}/comment.rs | 0 .../src}/config/config_type.rs | 0 .../src}/config/file_lines.rs | 0 {src => rustfmt-core/src}/config/license.rs | 0 {src => rustfmt-core/src}/config/lists.rs | 0 {src => rustfmt-core/src}/config/mod.rs | 0 {src => rustfmt-core/src}/config/options.rs | 0 {src => rustfmt-core/src}/coverage.rs | 0 {src => rustfmt-core/src}/emitter.rs | 0 .../src}/emitter/checkstyle.rs | 0 .../src}/emitter/checkstyle/xml.rs | 0 {src => rustfmt-core/src}/emitter/diff.rs | 0 {src => rustfmt-core/src}/emitter/files.rs | 0 {src => rustfmt-core/src}/emitter/json.rs | 0 .../src}/emitter/modified_lines.rs | 0 {src => rustfmt-core/src}/emitter/stdout.rs | 0 {src => rustfmt-core/src}/expr.rs | 0 .../src}/format_report_formatter.rs | 0 {src => rustfmt-core/src}/formatting.rs | 0 .../src}/formatting/newline_style.rs | 0 {src => rustfmt-core/src}/ignore_path.rs | 0 {src => rustfmt-core/src}/imports.rs | 0 {src => rustfmt-core/src}/issues.rs | 0 {src => rustfmt-core/src}/items.rs | 0 {src => rustfmt-core/src}/lib.rs | 0 {src => rustfmt-core/src}/lists.rs | 0 {src => rustfmt-core/src}/macros.rs | 0 {src => rustfmt-core/src}/matches.rs | 0 {src => rustfmt-core/src}/missed_spans.rs | 0 {src => rustfmt-core/src}/modules.rs | 0 {src => rustfmt-core/src}/modules/visitor.rs | 0 {src => rustfmt-core/src}/overflow.rs | 0 {src => rustfmt-core/src}/pairs.rs | 0 {src => rustfmt-core/src}/patterns.rs | 0 {src => rustfmt-core/src}/release_channel.rs | 0 {src => rustfmt-core/src}/reorder.rs | 0 {src => rustfmt-core/src}/rewrite.rs | 0 {src => rustfmt-core/src}/rustfmt_diff.rs | 0 {src => rustfmt-core/src}/shape.rs | 0 {src => rustfmt-core/src}/skip.rs | 0 {src => rustfmt-core/src}/source_file.rs | 0 {src => rustfmt-core/src}/source_map.rs | 0 {src => rustfmt-core/src}/spanned.rs | 0 {src => rustfmt-core/src}/stmt.rs | 0 {src => rustfmt-core/src}/string.rs | 0 {src => rustfmt-core/src}/syntux.rs | 0 {src => rustfmt-core/src}/syntux/parser.rs | 0 {src => rustfmt-core/src}/syntux/session.rs | 0 .../src}/test/configuration_snippet.rs | 2 +- {src => rustfmt-core/src}/test/mod.rs | 157 +------------- {src => rustfmt-core/src}/types.rs | 0 {src => rustfmt-core/src}/utils.rs | 0 {src => rustfmt-core/src}/vertical.rs | 0 {src => rustfmt-core/src}/visitor.rs | 0 .../tests}/config/issue-1111.toml | 0 .../tests}/config/issue-2641.toml | 0 .../tests}/config/issue-3779.toml | 0 .../tests}/config/issue-3802.toml | 0 .../tests}/config/issue-3933.toml | 0 .../tests}/config/issue-3956.toml | 0 .../tests}/config/skip_children.toml | 0 .../tests}/config/small_tabs.toml | 0 .../tests}/coverage/source/comments.rs | 0 .../tests}/coverage/target/comments.rs | 0 .../tests}/license-template/lt.txt | 0 .../source/alignment_2633/block_style.rs | 0 .../source/alignment_2633/visual_style.rs | 0 .../tests}/source/array_comment.rs | 0 .../tests}/source/assignment.rs | 0 .../associated-types-bounds-wrapping.rs | 0 .../tests}/source/associated_type_bounds.rs | 0 .../tests}/source/async_block.rs | 0 .../tests}/source/async_fn.rs | 0 .../tests}/source/attrib.rs | 0 .../tests}/source/big-impl-block.rs | 0 .../tests}/source/big-impl-visual.rs | 0 .../tests}/source/binary-expr.rs | 0 .../tests}/source/break-and-continue.rs | 0 {tests => rustfmt-core/tests}/source/catch.rs | 0 .../source/cfg_if/detect/arch/aarch64.rs | 0 .../tests}/source/cfg_if/detect/arch/arm.rs | 0 .../tests}/source/cfg_if/detect/arch/mips.rs | 0 .../source/cfg_if/detect/arch/mips64.rs | 0 .../source/cfg_if/detect/arch/powerpc.rs | 0 .../source/cfg_if/detect/arch/powerpc64.rs | 0 .../tests}/source/cfg_if/detect/arch/x86.rs | 0 .../tests}/source/cfg_if/detect/bit.rs | 0 .../tests}/source/cfg_if/detect/cache.rs | 0 .../source/cfg_if/detect/error_macros.rs | 0 .../tests}/source/cfg_if/detect/mod.rs | 0 .../tests}/source/cfg_if/detect/os/aarch64.rs | 0 .../cfg_if/detect/os/freebsd/aarch64.rs | 0 .../source/cfg_if/detect/os/freebsd/arm.rs | 0 .../source/cfg_if/detect/os/freebsd/auxvec.rs | 0 .../source/cfg_if/detect/os/freebsd/mod.rs | 0 .../cfg_if/detect/os/freebsd/powerpc.rs | 0 .../source/cfg_if/detect/os/linux/aarch64.rs | 0 .../source/cfg_if/detect/os/linux/arm.rs | 0 .../source/cfg_if/detect/os/linux/auxvec.rs | 0 .../source/cfg_if/detect/os/linux/cpuinfo.rs | 0 .../source/cfg_if/detect/os/linux/mips.rs | 0 .../source/cfg_if/detect/os/linux/mod.rs | 0 .../source/cfg_if/detect/os/linux/powerpc.rs | 0 .../tests}/source/cfg_if/detect/os/other.rs | 0 .../tests}/source/cfg_if/detect/os/x86.rs | 0 .../tests}/source/cfg_if/lib.rs | 0 .../tests}/source/cfg_if/mod.rs | 0 .../tests}/source/cfg_mod/bar.rs | 0 .../source/cfg_mod/dir/dir1/dir2/wasm32.rs | 0 .../source/cfg_mod/dir/dir1/dir3/wasm32.rs | 0 .../tests}/source/cfg_mod/foo.rs | 0 .../tests}/source/cfg_mod/mod.rs | 0 .../tests}/source/cfg_mod/other.rs | 0 .../tests}/source/cfg_mod/wasm32.rs | 0 .../tests}/source/chains-visual.rs | 0 .../tests}/source/chains.rs | 0 .../tests}/source/chains_with_comment.rs | 0 .../source/closure-block-inside-macro.rs | 0 .../tests}/source/closure_block_style.rs | 0 .../source/closure_block_style_no_comma.rs | 0 .../tests}/source/closure_visual_style.rs | 0 .../tests}/source/comment.rs | 0 .../tests}/source/comment2.rs | 0 .../tests}/source/comment3.rs | 0 .../tests}/source/comment4.rs | 0 .../tests}/source/comment5.rs | 0 .../tests}/source/comment6.rs | 0 .../tests}/source/comment_crlf_newline.rs | 0 .../configs/blank_lines_lower_bound/1.rs | 0 .../brace_style/fn_always_next_line.rs | 0 .../brace_style/fn_prefer_same_line.rs | 0 .../configs/brace_style/fn_same_line_where.rs | 0 .../brace_style/item_always_next_line.rs | 0 .../brace_style/item_prefer_same_line.rs | 0 .../brace_style/item_same_line_where.rs | 0 .../source/configs/comment_width/above.rs | 0 .../source/configs/comment_width/below.rs | 0 .../source/configs/comment_width/ignore.rs | 0 .../condense_wildcard_suffixes/false.rs | 0 .../condense_wildcard_suffixes/true.rs | 0 .../control_brace_style/always_next_line.rs | 0 .../control_brace_style/always_same_line.rs | 0 .../control_brace_style/closing_next_line.rs | 0 .../configs/disable_all_formatting/false.rs | 0 .../configs/disable_all_formatting/true.rs | 0 .../configs/empty_item_single_line/false.rs | 0 .../configs/empty_item_single_line/true.rs | 0 .../enum_discrim_align_threshold/40.rs | 0 .../configs/error_on_line_overflow/false.rs | 0 .../configs/fn_args_layout/compressed.rs | 0 .../source/configs/fn_args_layout/tall.rs | 0 .../source/configs/fn_args_layout/vertical.rs | 0 .../source/configs/fn_single_line/false.rs | 0 .../source/configs/fn_single_line/true.rs | 0 .../configs/force_explicit_abi/false.rs | 0 .../source/configs/force_explicit_abi/true.rs | 0 .../configs/force_multiline_block/false.rs | 0 .../configs/force_multiline_block/true.rs | 0 .../configs/format_macro_bodies/false.rs | 0 .../configs/format_macro_bodies/true.rs | 0 .../configs/format_macro_matchers/false.rs | 0 .../configs/format_macro_matchers/true.rs | 0 .../source/configs/format_strings/false.rs | 0 .../source/configs/format_strings/true.rs | 0 .../tests}/source/configs/hard_tabs/false.rs | 0 .../tests}/source/configs/hard_tabs/true.rs | 0 .../configs/imports_layout/merge_mixed.rs | 0 .../source/configs/indent_style/block_args.rs | 0 .../configs/indent_style/block_array.rs | 0 .../source/configs/indent_style/block_call.rs | 0 .../configs/indent_style/block_chain.rs | 0 .../configs/indent_style/block_generic.rs | 0 .../configs/indent_style/block_struct_lit.rs | 0 .../block_trailing_comma_call/two.rs | 0 .../configs/indent_style/block_where_pred.rs | 0 .../source/configs/indent_style/default.rs | 0 .../source/configs/indent_style/rfc_where.rs | 0 .../configs/indent_style/visual_args.rs | 0 .../configs/indent_style/visual_array.rs | 0 .../configs/indent_style/visual_call.rs | 0 .../configs/indent_style/visual_chain.rs | 0 .../configs/indent_style/visual_generics.rs | 0 .../configs/indent_style/visual_struct_lit.rs | 0 .../indent_style/visual_trailing_comma.rs | 0 .../configs/indent_style/visual_where_pred.rs | 0 .../source/configs/match_arm_blocks/false.rs | 0 .../source/configs/match_arm_blocks/true.rs | 0 .../match_block_trailing_comma/false.rs | 0 .../match_block_trailing_comma/true.rs | 0 .../source/configs/merge_derives/true.rs | 0 .../configs/normalize_comments/false.rs | 0 .../source/configs/normalize_comments/true.rs | 0 .../configs/normalize_doc_attributes/false.rs | 0 .../configs/normalize_doc_attributes/true.rs | 0 .../source/configs/recursive/disabled/foo.rs | 0 .../source/configs/recursive/disabled/lib.rs | 0 .../source/configs/recursive/enabled/foo.rs | 0 .../source/configs/recursive/enabled/lib.rs | 0 .../remove_nested_parens.rs | 0 .../configs/reorder_impl_items/false.rs | 0 .../source/configs/reorder_impl_items/true.rs | 0 .../source/configs/reorder_imports/false.rs | 0 .../source/configs/reorder_imports/true.rs | 0 .../configs/reorder_modules/dolor/mod.rs | 0 .../source/configs/reorder_modules/false.rs | 0 .../configs/reorder_modules/ipsum/mod.rs | 0 .../configs/reorder_modules/lorem/mod.rs | 0 .../source/configs/reorder_modules/sit/mod.rs | 0 .../source/configs/reorder_modules/true.rs | 0 .../source/configs/skip_children/foo/mod.rs | 0 .../source/configs/skip_children/true.rs | 0 .../source/configs/space_before_colon/true.rs | 0 .../configs/spaces_around_ranges/false.rs | 0 .../configs/spaces_around_ranges/true.rs | 0 .../struct_field_align_threshold/20.rs | 0 .../configs/struct_lit_single_line/false.rs | 0 .../tests}/source/configs/tab_spaces/2.rs | 0 .../tests}/source/configs/tab_spaces/4.rs | 0 .../source/configs/trailing_comma/always.rs | 0 .../source/configs/trailing_comma/never.rs | 0 .../source/configs/trailing_comma/vertical.rs | 0 .../type_punctuation_density/compressed.rs | 0 .../configs/type_punctuation_density/wide.rs | 0 .../configs/use_field_init_shorthand/false.rs | 0 .../configs/use_field_init_shorthand/true.rs | 0 .../configs/use_small_heuristics/max.rs | 0 .../source/configs/use_try_shorthand/false.rs | 0 .../source/configs/use_try_shorthand/true.rs | 0 .../use_try_shorthand/true_2015_edition.rs | 0 .../source/configs/where_single_line/true.rs | 0 .../source/configs/wrap_comments/false.rs | 0 .../source/configs/wrap_comments/true.rs | 0 .../tests}/source/const_generics.rs | 0 .../control-brace-style-always-next-line.rs | 0 .../control-brace-style-always-same-line.rs | 0 .../tests}/source/doc-attrib.rs | 0 .../tests}/source/doc-comment-with-example.rs | 0 {tests => rustfmt-core/tests}/source/doc.rs | 0 .../tests}/source/dyn_trait.rs | 0 .../else-if-brace-style-always-next-line.rs | 0 .../else-if-brace-style-always-same-line.rs | 0 .../else-if-brace-style-closing-next-line.rs | 0 .../tests}/source/empty_file.rs | 0 {tests => rustfmt-core/tests}/source/enum.rs | 0 .../tests}/source/existential_type.rs | 0 .../tests}/source/expr-block.rs | 0 .../tests}/source/expr-overflow-delimited.rs | 0 {tests => rustfmt-core/tests}/source/expr.rs | 0 .../tests}/source/extern.rs | 0 .../tests}/source/extern_not_explicit.rs | 0 .../tests}/source/file-lines-1.rs | 0 .../tests}/source/file-lines-2.rs | 0 .../tests}/source/file-lines-3.rs | 0 .../tests}/source/file-lines-4.rs | 0 .../tests}/source/file-lines-5.rs | 0 .../tests}/source/file-lines-6.rs | 0 .../tests}/source/file-lines-7.rs | 0 .../tests}/source/file-lines-8.rs | 0 .../tests}/source/file-lines-item.rs | 0 .../tests}/source/fn-custom-2.rs | 0 .../tests}/source/fn-custom-3.rs | 0 .../tests}/source/fn-custom-4.rs | 0 .../tests}/source/fn-custom-6.rs | 0 .../tests}/source/fn-custom-7.rs | 0 .../tests}/source/fn-custom-8.rs | 0 .../tests}/source/fn-custom.rs | 0 .../tests}/source/fn-param-attributes.rs | 0 .../tests}/source/fn-simple.rs | 0 .../source/fn-single-line/version_two.rs | 0 .../tests}/source/fn_args_indent-block.rs | 0 .../tests}/source/fn_args_layout-vertical.rs | 0 .../tests}/source/hard-tabs.rs | 0 {tests => rustfmt-core/tests}/source/hello.rs | 0 .../tests}/source/hello2.rs | 0 .../tests}/source/if_while_or_patterns.rs | 0 .../tests}/source/immovable_generators.rs | 0 {tests => rustfmt-core/tests}/source/impls.rs | 0 .../tests}/source/imports-impl-only-use.rs | 0 .../source/imports-reorder-lines-and-items.rs | 0 .../tests}/source/imports-reorder-lines.rs | 0 .../tests}/source/imports-reorder.rs | 0 .../tests}/source/imports.rs | 0 .../tests}/source/imports_2015_edition.rs | 0 .../tests}/source/imports_block_indent.rs | 0 .../tests}/source/imports_raw_identifiers.rs | 0 .../invalid-rust-code-in-doc-comment.rs | 0 .../tests}/source/issue-1021.rs | 0 .../tests}/source/issue-1049.rs | 0 .../tests}/source/issue-1111.rs | 0 .../tests}/source/issue-1120.rs | 0 .../tests}/source/issue-1124.rs | 0 .../tests}/source/issue-1127.rs | 0 .../tests}/source/issue-1158.rs | 0 .../tests}/source/issue-1177.rs | 0 .../tests}/source/issue-1192.rs | 0 .../tests}/source/issue-1210/a.rs | 0 .../tests}/source/issue-1210/b.rs | 0 .../tests}/source/issue-1210/c.rs | 0 .../tests}/source/issue-1210/d.rs | 0 .../tests}/source/issue-1210/e.rs | 0 .../tests}/source/issue-1211.rs | 0 .../tests}/source/issue-1216.rs | 0 .../tests}/source/issue-1239.rs | 0 .../tests}/source/issue-1278.rs | 0 .../tests}/source/issue-1350.rs | 0 .../tests}/source/issue-1366.rs | 0 .../tests}/source/issue-1468.rs | 0 .../tests}/source/issue-1693.rs | 0 .../tests}/source/issue-1800.rs | 0 .../tests}/source/issue-1914.rs | 0 .../tests}/source/issue-2025.rs | 0 .../tests}/source/issue-2111.rs | 0 .../tests}/source/issue-2164.rs | 0 .../tests}/source/issue-2179/two.rs | 0 .../tests}/source/issue-2256.rs | 0 .../tests}/source/issue-2342.rs | 0 .../tests}/source/issue-2445.rs | 0 .../tests}/source/issue-2446.rs | 0 .../tests}/source/issue-2479.rs | 0 .../tests}/source/issue-2482/a.rs | 0 .../tests}/source/issue-2482/b.rs | 0 .../tests}/source/issue-2482/c.rs | 0 .../tests}/source/issue-2496.rs | 0 .../tests}/source/issue-2520.rs | 0 .../tests}/source/issue-2523.rs | 0 .../tests}/source/issue-2582.rs | 0 .../tests}/source/issue-2641.rs | 0 .../tests}/source/issue-2644.rs | 0 .../tests}/source/issue-2728.rs | 0 .../tests}/source/issue-2761.rs | 0 .../tests}/source/issue-2794.rs | 0 .../tests}/source/issue-2835.rs | 0 .../tests}/source/issue-2863.rs | 0 .../tests}/source/issue-2869.rs | 0 .../tests}/source/issue-2896.rs | 0 .../tests}/source/issue-2917/packed_simd.rs | 0 .../tests}/source/issue-2922.rs | 0 .../tests}/source/issue-2927-2.rs | 0 .../tests}/source/issue-2927.rs | 0 .../tests}/source/issue-2930.rs | 0 .../tests}/source/issue-2936.rs | 0 .../tests}/source/issue-2955.rs | 0 .../tests}/source/issue-2973.rs | 0 .../tests}/source/issue-2977/impl.rs | 0 .../tests}/source/issue-2977/trait.rs | 0 .../tests}/source/issue-2985.rs | 0 .../tests}/source/issue-2995.rs | 0 .../tests}/source/issue-3029.rs | 0 .../tests}/source/issue-3038.rs | 0 .../tests}/source/issue-3049.rs | 0 .../tests}/source/issue-3055/original.rs | 0 .../tests}/source/issue-3059.rs | 0 .../tests}/source/issue-3066.rs | 0 .../tests}/source/issue-3131.rs | 0 .../tests}/source/issue-3153.rs | 0 .../tests}/source/issue-3170.rs | 0 .../tests}/source/issue-3194.rs | 0 .../tests}/source/issue-3198.rs | 0 .../tests}/source/issue-3213/version_two.rs | 0 .../tests}/source/issue-3217.rs | 0 .../tests}/source/issue-3227/two.rs | 0 .../tests}/source/issue-3234.rs | 0 .../tests}/source/issue-3241.rs | 0 .../tests}/source/issue-3253/bar.rs | 0 .../tests}/source/issue-3253/foo.rs | 0 .../tests}/source/issue-3253/lib.rs | 0 .../tests}/source/issue-3253/paths/bar_foo.rs | 0 .../source/issue-3253/paths/excluded.rs | 0 .../tests}/source/issue-3253/paths/foo_bar.rs | 0 .../tests}/source/issue-3265.rs | 0 .../tests}/source/issue-3270/two.rs | 0 .../tests}/source/issue-3272/v2.rs | 0 .../tests}/source/issue-3278/version_two.rs | 0 .../tests}/source/issue-3295/two.rs | 0 .../tests}/source/issue-3302.rs | 0 .../tests}/source/issue-3343.rs | 0 .../tests}/source/issue-3423.rs | 0 .../tests}/source/issue-3434/lib.rs | 0 .../tests}/source/issue-3434/no_entry.rs | 0 .../source/issue-3434/not_skip_macro.rs | 0 .../tests}/source/issue-3465.rs | 0 .../tests}/source/issue-3494/crlf.rs | 0 .../tests}/source/issue-3494/lf.rs | 0 .../tests}/source/issue-3508.rs | 0 .../tests}/source/issue-3515.rs | 0 .../tests}/source/issue-3532.rs | 0 .../tests}/source/issue-3585/extern_crate.rs | 0 .../issue-3585/reorder_imports_disabled.rs | 0 .../issue-3585/reorder_imports_enabled.rs | 0 .../tests}/source/issue-3585/use.rs | 0 .../tests}/source/issue-3636.rs | 0 .../tests}/source/issue-3639.rs | 0 .../tests}/source/issue-3651.rs | 0 .../tests}/source/issue-3665/lib.rs | 0 .../source/issue-3665/not_skip_attribute.rs | 0 .../tests}/source/issue-3665/sub_mod.rs | 0 .../tests}/source/issue-3672.rs | 0 .../tests}/source/issue-3675.rs | 0 .../tests}/source/issue-3701/two.rs | 0 .../tests}/source/issue-3709.rs | 0 .../tests}/source/issue-3740.rs | 0 .../tests}/source/issue-3750.rs | 0 .../tests}/source/issue-3751.rs | 0 .../tests}/source/issue-3779/ice.rs | 0 .../tests}/source/issue-3779/lib.rs | 0 .../tests}/source/issue-3786.rs | 0 .../tests}/source/issue-3787.rs | 0 .../issue-3840/version-two_hard-tabs.rs | 0 .../issue-3840/version-two_soft-tabs.rs | 0 .../tests}/source/issue-3851.rs | 0 .../tests}/source/issue-3904/two.rs | 0 .../tests}/source/issue-3908.rs | 0 .../tests}/source/issue-3923.rs | 0 .../tests}/source/issue-3929.rs | 0 .../tests}/source/issue-3933/imp-a.rs | 0 .../tests}/source/issue-3933/imp-b.rs | 0 .../tests}/source/issue-3933/lib.rs | 0 .../tests}/source/issue-3933/utils.rs | 0 .../tests}/source/issue-447.rs | 0 .../tests}/source/issue-510.rs | 0 .../tests}/source/issue-539.rs | 0 .../tests}/source/issue-683.rs | 0 .../tests}/source/issue-811.rs | 0 .../tests}/source/issue-850.rs | 0 .../tests}/source/issue-855.rs | 0 .../tests}/source/issue-913.rs | 0 .../tests}/source/issue-945.rs | 0 .../tests}/source/issue-977.rs | 0 .../tests}/source/issue_3839.rs | 0 .../tests}/source/issue_3844.rs | 0 .../tests}/source/issue_3853.rs | 0 .../tests}/source/issue_3868.rs | 0 .../item-brace-style-always-next-line.rs | 0 .../item-brace-style-prefer-same-line.rs | 0 .../item-brace-style-same-line-where.rs | 0 .../tests}/source/itemized-blocks/no_wrap.rs | 0 .../source/itemized-blocks/rewrite_fail.rs | 0 .../tests}/source/itemized-blocks/urls.rs | 0 .../tests}/source/itemized-blocks/wrap.rs | 0 .../tests}/source/label_break.rs | 0 .../tests}/source/large-block.rs | 0 .../tests}/source/large_vec.rs | 0 .../tests}/source/lazy_static.rs | 0 .../license-templates/empty_license_path.rs | 0 .../source/license-templates/license.rs | 0 .../tests}/source/long-fn-1/version_two.rs | 0 .../source/long-match-arms-brace-newline.rs | 0 .../source/long-use-statement-issue-3154.rs | 0 .../tests}/source/long_field_access.rs | 0 {tests => rustfmt-core/tests}/source/loop.rs | 0 .../tests}/source/macro_not_expr.rs | 0 .../tests}/source/macro_rules.rs | 0 .../tests}/source/macros.rs | 0 .../source/markdown-comment-with-options.rs | 0 .../tests}/source/markdown-comment.rs | 0 .../source/match-block-trailing-comma.rs | 0 .../tests}/source/match-flattening.rs | 0 .../source/match-nowrap-trailing-comma.rs | 0 .../tests}/source/match-nowrap.rs | 0 {tests => rustfmt-core/tests}/source/match.rs | 0 .../tests}/source/match_overflow_expr.rs | 0 .../tests}/source/max-line-length-in-chars.rs | 0 .../tests}/source/merge_imports.rs | 0 {tests => rustfmt-core/tests}/source/mod-1.rs | 0 {tests => rustfmt-core/tests}/source/mod-2.rs | 0 .../tests}/source/mod_skip_child.rs | 0 .../tests}/source/multiple.rs | 0 .../tests}/source/nested-if-else.rs | 0 .../tests}/source/nested_skipped/mod.rs | 0 .../tests}/source/nestedmod/mod.rs | 0 .../tests}/source/nestedmod/mod2a.rs | 0 .../tests}/source/nestedmod/mod2b.rs | 0 .../tests}/source/nestedmod/mod2c.rs | 0 .../tests}/source/nestedmod/mymod1/mod3a.rs | 0 .../tests}/source/nestedmod/submod2/a.rs | 0 .../tests}/source/nestedmod/submod2/mod.rs | 0 .../tests}/source/no_arg_with_commnet.rs | 0 .../tests}/source/no_new_line_beginning.rs | 0 ...es_should_not_imply_format_doc_comments.rs | 0 .../normalize_multiline_doc_attribute.rs | 0 .../tests}/source/one_line_if_v2.rs | 0 {tests => rustfmt-core/tests}/source/other.rs | 0 {tests => rustfmt-core/tests}/source/paren.rs | 0 .../tests}/source/path_clarity/foo.rs | 0 .../tests}/source/path_clarity/foo/bar.rs | 0 {tests => rustfmt-core/tests}/source/paths.rs | 0 .../source/pattern-condense-wildcards.rs | 0 .../tests}/source/pattern.rs | 0 .../preserves_carriage_return_for_unix.rs | 0 .../preserves_carriage_return_for_windows.rs | 0 .../tests}/source/pub-restricted.rs | 0 .../tests}/source/remove_blank_lines.rs | 0 .../tests}/source/reorder-impl-items.rs | 0 .../tests}/source/single-line-if-else.rs | 0 .../tests}/source/single-line-macro/v2.rs | 0 .../tests}/source/soft-wrapping.rs | 0 .../tests}/source/space-not-before-newline.rs | 0 .../tests}/source/spaces-around-ranges.rs | 0 .../tests}/source/static.rs | 0 .../tests}/source/string-lit-2.rs | 0 .../tests}/source/string-lit.rs | 0 .../tests}/source/string_punctuation.rs | 0 .../tests}/source/struct-field-attributes.rs | 0 .../tests}/source/struct_lits.rs | 0 .../tests}/source/struct_lits_multiline.rs | 0 .../tests}/source/struct_lits_visual.rs | 0 .../source/struct_lits_visual_multiline.rs | 0 .../tests}/source/struct_tuple_visual.rs | 0 .../tests}/source/structs.rs | 0 .../tests}/source/trailing-comma-never.rs | 0 .../tests}/source/trailing_commas.rs | 0 .../source/trailing_comments/hard_tabs.rs | 0 .../source/trailing_comments/soft_tabs.rs | 0 {tests => rustfmt-core/tests}/source/trait.rs | 0 .../tests}/source/trait_2015_edition.rs | 0 .../tests}/source/try-conversion.rs | 0 {tests => rustfmt-core/tests}/source/tuple.rs | 0 .../tests}/source/type-ascription.rs | 0 {tests => rustfmt-core/tests}/source/type.rs | 0 .../tests}/source/type_alias.rs | 0 .../tests}/source/unicode.rs | 0 .../tests}/source/unions.rs | 0 .../tests}/source/visibility.rs | 0 .../tests}/source/visual-fn-type.rs | 0 .../tests}/source/where-clause-rfc.rs | 0 .../tests}/source/where-clause.rs | 0 .../tests}/source/width-heuristics.rs | 0 ...ts_should_not_imply_format_doc_comments.rs | 0 .../target/alignment_2633/block_style.rs | 0 .../alignment_2633/horizontal_tactic.rs | 0 .../target/alignment_2633/visual_style.rs | 0 .../tests}/target/array_comment.rs | 0 .../tests}/target/assignment.rs | 0 .../tests}/target/associated-items.rs | 0 .../associated-types-bounds-wrapping.rs | 0 .../tests}/target/associated_type_bounds.rs | 0 .../tests}/target/associated_type_defaults.rs | 0 .../tests}/target/async_block.rs | 0 .../tests}/target/async_closure.rs | 0 .../tests}/target/async_fn.rs | 0 .../tests}/target/attrib-block-expr.rs | 0 .../tests}/target/attrib-extern-crate.rs | 0 .../tests}/target/attrib.rs | 0 .../tests}/target/big-impl-block.rs | 0 .../tests}/target/big-impl-visual.rs | 0 .../tests}/target/binary-expr.rs | 0 .../tests}/target/break-and-continue.rs | 0 {tests => rustfmt-core/tests}/target/catch.rs | 0 .../target/cfg_if/detect/arch/aarch64.rs | 0 .../tests}/target/cfg_if/detect/arch/arm.rs | 0 .../tests}/target/cfg_if/detect/arch/mips.rs | 0 .../target/cfg_if/detect/arch/mips64.rs | 0 .../target/cfg_if/detect/arch/powerpc.rs | 0 .../target/cfg_if/detect/arch/powerpc64.rs | 0 .../tests}/target/cfg_if/detect/arch/x86.rs | 0 .../tests}/target/cfg_if/detect/bit.rs | 0 .../tests}/target/cfg_if/detect/cache.rs | 0 .../target/cfg_if/detect/error_macros.rs | 0 .../tests}/target/cfg_if/detect/mod.rs | 0 .../tests}/target/cfg_if/detect/os/aarch64.rs | 0 .../cfg_if/detect/os/freebsd/aarch64.rs | 0 .../target/cfg_if/detect/os/freebsd/arm.rs | 0 .../target/cfg_if/detect/os/freebsd/auxvec.rs | 0 .../target/cfg_if/detect/os/freebsd/mod.rs | 0 .../cfg_if/detect/os/freebsd/powerpc.rs | 0 .../target/cfg_if/detect/os/linux/aarch64.rs | 0 .../target/cfg_if/detect/os/linux/arm.rs | 0 .../target/cfg_if/detect/os/linux/auxvec.rs | 0 .../target/cfg_if/detect/os/linux/cpuinfo.rs | 0 .../target/cfg_if/detect/os/linux/mips.rs | 0 .../target/cfg_if/detect/os/linux/mod.rs | 0 .../target/cfg_if/detect/os/linux/powerpc.rs | 0 .../tests}/target/cfg_if/detect/os/other.rs | 0 .../tests}/target/cfg_if/detect/os/x86.rs | 0 .../tests}/target/cfg_if/lib.rs | 0 .../tests}/target/cfg_if/mod.rs | 0 .../tests}/target/cfg_mod/bar.rs | 0 .../target/cfg_mod/dir/dir1/dir2/wasm32.rs | 0 .../target/cfg_mod/dir/dir1/dir3/wasm32.rs | 0 .../tests}/target/cfg_mod/foo.rs | 0 .../tests}/target/cfg_mod/mod.rs | 0 .../tests}/target/cfg_mod/other.rs | 0 .../tests}/target/cfg_mod/wasm32.rs | 0 .../tests}/target/chains-visual.rs | 0 .../tests}/target/chains.rs | 0 .../tests}/target/chains_with_comment.rs | 0 .../target/closure-block-inside-macro.rs | 0 .../tests}/target/closure_block_style.rs | 0 .../target/closure_block_style_no_comma.rs | 0 .../tests}/target/closure_visual_style.rs | 0 .../tests}/target/comment-inside-const.rs | 0 .../tests}/target/comment-not-disappear.rs | 0 .../tests}/target/comment.rs | 0 .../tests}/target/comment2.rs | 0 .../tests}/target/comment3.rs | 0 .../tests}/target/comment4.rs | 0 .../tests}/target/comment5.rs | 0 .../tests}/target/comment6.rs | 0 .../tests}/target/comment_crlf_newline.rs | 0 .../tests}/target/comments-fn.rs | 0 .../configs/blank_lines_lower_bound/1.rs | 0 .../brace_style/fn_always_next_line.rs | 0 .../brace_style/fn_prefer_same_line.rs | 0 .../configs/brace_style/fn_same_line_where.rs | 0 .../brace_style/item_always_next_line.rs | 0 .../brace_style/item_prefer_same_line.rs | 0 .../brace_style/item_same_line_where.rs | 0 .../configs/combine_control_expr/false.rs | 0 .../configs/combine_control_expr/true.rs | 0 .../target/configs/comment_width/above.rs | 0 .../target/configs/comment_width/below.rs | 0 .../target/configs/comment_width/ignore.rs | 0 .../condense_wildcard_suffixes/false.rs | 0 .../condense_wildcard_suffixes/true.rs | 0 .../control_brace_style/always_next_line.rs | 0 .../control_brace_style/always_same_line.rs | 0 .../control_brace_style/closing_next_line.rs | 0 .../configs/disable_all_formatting/false.rs | 0 .../configs/disable_all_formatting/true.rs | 0 .../configs/empty_item_single_line/false.rs | 0 .../configs/empty_item_single_line/true.rs | 0 .../enum_discrim_align_threshold/40.rs | 0 .../configs/error_on_line_overflow/false.rs | 0 .../configs/error_on_unformatted/false.rs | 0 .../configs/fn_args_layout/compressed.rs | 0 .../target/configs/fn_args_layout/tall.rs | 0 .../target/configs/fn_args_layout/vertical.rs | 0 .../target/configs/fn_single_line/false.rs | 0 .../target/configs/fn_single_line/true.rs | 0 .../configs/force_explicit_abi/false.rs | 0 .../target/configs/force_explicit_abi/true.rs | 0 .../configs/force_multiline_block/false.rs | 0 .../configs/force_multiline_block/true.rs | 0 .../configs/format_macro_bodies/false.rs | 0 .../configs/format_macro_bodies/true.rs | 0 .../configs/format_macro_matchers/false.rs | 0 .../configs/format_macro_matchers/true.rs | 0 .../target/configs/format_strings/false.rs | 0 .../target/configs/format_strings/true.rs | 0 .../tests}/target/configs/hard_tabs/false.rs | 0 .../tests}/target/configs/hard_tabs/true.rs | 0 .../target/configs/imports_indent/block.rs | 0 .../imports_layout/horizontal_vertical.rs | 0 .../configs/imports_layout/merge_mixed.rs | 0 .../target/configs/imports_layout/mixed.rs | 0 .../target/configs/indent_style/block_args.rs | 0 .../configs/indent_style/block_array.rs | 0 .../target/configs/indent_style/block_call.rs | 0 .../configs/indent_style/block_chain.rs | 0 .../configs/indent_style/block_generic.rs | 0 .../configs/indent_style/block_struct_lit.rs | 0 .../indent_style/block_tab_spaces_call.rs | 0 .../block_trailing_comma_call/two.rs | 0 .../configs/indent_style/block_where_pred.rs | 0 .../target/configs/indent_style/default.rs | 0 .../configs/indent_style/rfc_control.rs | 0 .../target/configs/indent_style/rfc_where.rs | 0 .../configs/indent_style/visual_args.rs | 0 .../configs/indent_style/visual_array.rs | 0 .../configs/indent_style/visual_call.rs | 0 .../configs/indent_style/visual_chain.rs | 0 .../configs/indent_style/visual_generics.rs | 0 .../configs/indent_style/visual_struct_lit.rs | 0 .../indent_style/visual_trailing_comma.rs | 0 .../configs/indent_style/visual_where_pred.rs | 0 .../target/configs/match_arm_blocks/false.rs | 0 .../target/configs/match_arm_blocks/true.rs | 0 .../match_block_trailing_comma/false.rs | 0 .../match_block_trailing_comma/true.rs | 0 .../target/configs/merge_derives/true.rs | 0 .../configs/normalize_comments/false.rs | 0 .../target/configs/normalize_comments/true.rs | 0 .../configs/normalize_doc_attributes/false.rs | 0 .../configs/normalize_doc_attributes/true.rs | 0 .../target/configs/recursive/disabled/foo.rs | 0 .../target/configs/recursive/disabled/lib.rs | 0 .../target/configs/recursive/enabled/foo.rs | 0 .../target/configs/recursive/enabled/lib.rs | 0 .../remove_nested_parens.rs | 0 .../configs/reorder_impl_items/false.rs | 0 .../target/configs/reorder_impl_items/true.rs | 0 .../target/configs/reorder_imports/false.rs | 0 .../target/configs/reorder_imports/true.rs | 0 .../configs/reorder_modules/dolor/mod.rs | 0 .../target/configs/reorder_modules/false.rs | 0 .../configs/reorder_modules/ipsum/mod.rs | 0 .../configs/reorder_modules/lorem/mod.rs | 0 .../target/configs/reorder_modules/sit/mod.rs | 0 .../target/configs/reorder_modules/true.rs | 0 .../target/configs/skip_children/foo/mod.rs | 0 .../target/configs/skip_children/true.rs | 0 .../target/configs/space_before_colon/true.rs | 0 .../configs/spaces_around_ranges/false.rs | 0 .../configs/spaces_around_ranges/true.rs | 0 .../struct_field_align_threshold/20.rs | 0 .../configs/struct_lit_single_line/false.rs | 0 .../tests}/target/configs/tab_spaces/2.rs | 0 .../tests}/target/configs/tab_spaces/4.rs | 0 .../target/configs/trailing_comma/always.rs | 0 .../target/configs/trailing_comma/never.rs | 0 .../target/configs/trailing_comma/vertical.rs | 0 .../configs/trailing_semicolon/false.rs | 0 .../target/configs/trailing_semicolon/true.rs | 0 .../type_punctuation_density/compressed.rs | 0 .../configs/type_punctuation_density/wide.rs | 0 .../configs/use_field_init_shorthand/false.rs | 0 .../configs/use_field_init_shorthand/true.rs | 0 .../configs/use_small_heuristics/max.rs | 0 .../target/configs/use_try_shorthand/false.rs | 0 .../target/configs/use_try_shorthand/true.rs | 0 .../use_try_shorthand/true_2015_edition.rs | 0 .../target/configs/where_single_line/true.rs | 0 .../target/configs/wrap_comments/false.rs | 0 .../target/configs/wrap_comments/true.rs | 0 .../tests}/target/const_generics.rs | 0 .../control-brace-style-always-next-line.rs | 0 .../control-brace-style-always-same-line.rs | 0 .../tests}/target/doc-attrib.rs | 0 .../tests}/target/doc-comment-with-example.rs | 0 {tests => rustfmt-core/tests}/target/doc.rs | 0 .../tests}/target/dyn_trait.rs | 0 .../else-if-brace-style-always-next-line.rs | 0 .../else-if-brace-style-always-same-line.rs | 0 .../else-if-brace-style-closing-next-line.rs | 0 ...mpty-tuple-no-conversion-to-unit-struct.rs | 0 .../tests}/target/empty_file.rs | 0 {tests => rustfmt-core/tests}/target/enum.rs | 0 .../tests}/target/existential_type.rs | 0 .../tests}/target/expr-block.rs | 0 .../tests}/target/expr-overflow-delimited.rs | 0 {tests => rustfmt-core/tests}/target/expr.rs | 0 .../tests}/target/extern.rs | 0 .../tests}/target/extern_not_explicit.rs | 0 .../tests}/target/file-lines-1.rs | 0 .../tests}/target/file-lines-2.rs | 0 .../tests}/target/file-lines-3.rs | 0 .../tests}/target/file-lines-4.rs | 0 .../tests}/target/file-lines-5.rs | 0 .../tests}/target/file-lines-6.rs | 0 .../tests}/target/file-lines-7.rs | 0 .../tests}/target/file-lines-8.rs | 0 .../tests}/target/file-lines-item.rs | 0 .../target/fn-args-with-last-line-comment.rs | 0 .../tests}/target/fn-custom-2.rs | 0 .../tests}/target/fn-custom-3.rs | 0 .../tests}/target/fn-custom-4.rs | 0 .../tests}/target/fn-custom-6.rs | 0 .../tests}/target/fn-custom-7.rs | 0 .../tests}/target/fn-custom-8.rs | 0 .../tests}/target/fn-custom.rs | 0 .../tests}/target/fn-param-attributes.rs | 0 .../tests}/target/fn-simple.rs | 0 .../target/fn-single-line/version_two.rs | 0 {tests => rustfmt-core/tests}/target/fn-ty.rs | 0 {tests => rustfmt-core/tests}/target/fn.rs | 0 .../tests}/target/fn_args_indent-block.rs | 0 .../tests}/target/fn_args_layout-vertical.rs | 0 .../tests}/target/fn_once.rs | 0 .../tests}/target/format_strings/issue-202.rs | 0 .../target/format_strings/issue-2833.rs | 0 .../target/format_strings/issue-3263.rs | 0 .../tests}/target/format_strings/issue-687.rs | 0 .../tests}/target/format_strings/issue564.rs | 0 .../tests}/target/hard-tabs.rs | 0 {tests => rustfmt-core/tests}/target/hello.rs | 0 .../tests}/target/if_while_or_patterns.rs | 0 .../tests}/target/immovable_generators.rs | 0 {tests => rustfmt-core/tests}/target/impl.rs | 0 {tests => rustfmt-core/tests}/target/impls.rs | 0 .../tests}/target/import-fencepost-length.rs | 0 .../tests}/target/imports-impl-only-use.rs | 0 .../target/imports-reorder-lines-and-items.rs | 0 .../tests}/target/imports-reorder-lines.rs | 0 .../tests}/target/imports-reorder.rs | 0 .../tests}/target/imports.rs | 0 .../tests}/target/imports_2015_edition.rs | 0 .../tests}/target/imports_block_indent.rs | 0 .../tests}/target/imports_raw_identifiers.rs | 0 .../tests}/target/indented-impl.rs | 0 .../invalid-rust-code-in-doc-comment.rs | 0 .../tests}/target/issue-1021.rs | 0 .../tests}/target/issue-1049.rs | 0 .../tests}/target/issue-1055.rs | 0 .../tests}/target/issue-1096.rs | 0 .../tests}/target/issue-1111.rs | 0 .../tests}/target/issue-1113.rs | 0 .../tests}/target/issue-1120.rs | 0 .../tests}/target/issue-1124.rs | 0 .../tests}/target/issue-1127.rs | 0 .../tests}/target/issue-1158.rs | 0 .../tests}/target/issue-1177.rs | 0 .../tests}/target/issue-1192.rs | 0 .../tests}/target/issue-1210/a.rs | 0 .../tests}/target/issue-1210/b.rs | 0 .../tests}/target/issue-1210/c.rs | 0 .../tests}/target/issue-1210/d.rs | 0 .../tests}/target/issue-1210/e.rs | 0 .../tests}/target/issue-1211.rs | 0 .../tests}/target/issue-1214.rs | 0 .../tests}/target/issue-1216.rs | 0 .../tests}/target/issue-1239.rs | 0 .../tests}/target/issue-1247.rs | 0 .../tests}/target/issue-1255.rs | 0 .../tests}/target/issue-1278.rs | 0 .../tests}/target/issue-1350.rs | 0 .../tests}/target/issue-1366.rs | 0 .../tests}/target/issue-1397.rs | 0 .../tests}/target/issue-1468.rs | 0 .../tests}/target/issue-1598.rs | 0 .../tests}/target/issue-1624.rs | 0 .../tests}/target/issue-1681.rs | 0 .../tests}/target/issue-1693.rs | 0 .../tests}/target/issue-1703.rs | 0 .../tests}/target/issue-1800.rs | 0 .../tests}/target/issue-1802.rs | 0 .../tests}/target/issue-1824.rs | 0 .../tests}/target/issue-1914.rs | 0 .../tests}/target/issue-2025.rs | 0 .../tests}/target/issue-2103.rs | 0 .../tests}/target/issue-2111.rs | 0 .../tests}/target/issue-2123.rs | 0 .../tests}/target/issue-2164.rs | 0 .../tests}/target/issue-2179/two.rs | 0 .../tests}/target/issue-2197.rs | 0 .../tests}/target/issue-2256.rs | 0 .../tests}/target/issue-2324.rs | 0 .../tests}/target/issue-2329.rs | 0 .../tests}/target/issue-2342.rs | 0 .../tests}/target/issue-2346.rs | 0 .../tests}/target/issue-2401.rs | 0 .../tests}/target/issue-2445.rs | 0 .../tests}/target/issue-2446.rs | 0 .../tests}/target/issue-2479.rs | 0 .../tests}/target/issue-2482/a.rs | 0 .../tests}/target/issue-2482/b.rs | 0 .../tests}/target/issue-2482/c.rs | 0 .../tests}/target/issue-2496.rs | 0 .../tests}/target/issue-2520.rs | 0 .../tests}/target/issue-2523.rs | 0 .../tests}/target/issue-2526.rs | 0 .../tests}/target/issue-2551.rs | 0 .../tests}/target/issue-2554.rs | 0 .../tests}/target/issue-2582.rs | 0 .../tests}/target/issue-2641.rs | 0 .../tests}/target/issue-2644.rs | 0 .../target/issue-2673-nonmodrs-mods/foo.rs | 0 .../issue-2673-nonmodrs-mods/foo/bar.rs | 0 .../target/issue-2673-nonmodrs-mods/lib.rs | 0 .../tests}/target/issue-2728.rs | 0 .../tests}/target/issue-2759.rs | 0 .../tests}/target/issue-2761.rs | 0 .../tests}/target/issue-2794.rs | 0 .../tests}/target/issue-2810.rs | 0 .../tests}/target/issue-2835.rs | 0 .../tests}/target/issue-2863.rs | 0 .../tests}/target/issue-2869.rs | 0 .../tests}/target/issue-2896.rs | 0 .../tests}/target/issue-2916.rs | 0 .../tests}/target/issue-2917/minimal.rs | 0 .../tests}/target/issue-2917/packed_simd.rs | 0 .../tests}/target/issue-2922.rs | 0 .../tests}/target/issue-2927-2.rs | 0 .../tests}/target/issue-2927.rs | 0 .../tests}/target/issue-2930.rs | 0 .../tests}/target/issue-2936.rs | 0 .../tests}/target/issue-2941.rs | 0 .../tests}/target/issue-2955.rs | 0 .../tests}/target/issue-2973.rs | 0 .../tests}/target/issue-2976.rs | 0 .../tests}/target/issue-2977/block.rs | 0 .../tests}/target/issue-2977/impl.rs | 0 .../tests}/target/issue-2977/item.rs | 0 .../tests}/target/issue-2977/trait.rs | 0 .../tests}/target/issue-2985.rs | 0 .../tests}/target/issue-2995.rs | 0 .../tests}/target/issue-3029.rs | 0 .../tests}/target/issue-3032.rs | 0 .../tests}/target/issue-3038.rs | 0 .../tests}/target/issue-3043.rs | 0 .../tests}/target/issue-3049.rs | 0 .../tests}/target/issue-3055/backtick.rs | 0 .../target/issue-3055/empty-code-block.rs | 0 .../tests}/target/issue-3055/original.rs | 0 .../tests}/target/issue-3059.rs | 0 .../tests}/target/issue-3066.rs | 0 .../tests}/target/issue-3105.rs | 0 .../tests}/target/issue-3118.rs | 0 .../tests}/target/issue-3124.rs | 0 .../tests}/target/issue-3131.rs | 0 .../tests}/target/issue-3132.rs | 0 .../tests}/target/issue-3153.rs | 0 .../tests}/target/issue-3170.rs | 0 .../tests}/target/issue-3182.rs | 0 .../tests}/target/issue-3184.rs | 0 .../tests}/target/issue-3194.rs | 0 .../tests}/target/issue-3198.rs | 0 .../tests}/target/issue-3213/version_two.rs | 0 .../tests}/target/issue-3217.rs | 0 .../tests}/target/issue-3224.rs | 0 .../tests}/target/issue-3227/two.rs | 0 .../tests}/target/issue-3234.rs | 0 .../tests}/target/issue-3241.rs | 0 .../tests}/target/issue-3253/bar.rs | 0 .../tests}/target/issue-3253/foo.rs | 0 .../tests}/target/issue-3253/lib.rs | 0 .../tests}/target/issue-3253/paths/bar_foo.rs | 0 .../target/issue-3253/paths/excluded.rs | 0 .../tests}/target/issue-3253/paths/foo_bar.rs | 0 .../tests}/target/issue-3265.rs | 0 .../tests}/target/issue-3270/two.rs | 0 .../tests}/target/issue-3270/wrap.rs | 0 .../tests}/target/issue-3272/v2.rs | 0 .../tests}/target/issue-3278/version_two.rs | 0 .../tests}/target/issue-3295/two.rs | 0 .../tests}/target/issue-3302.rs | 0 .../tests}/target/issue-3304.rs | 0 .../tests}/target/issue-3314.rs | 0 .../tests}/target/issue-3343.rs | 0 .../tests}/target/issue-3423.rs | 0 .../tests}/target/issue-3434/lib.rs | 0 .../tests}/target/issue-3434/no_entry.rs | 0 .../target/issue-3434/not_skip_macro.rs | 0 .../tests}/target/issue-3442.rs | 0 .../tests}/target/issue-3465.rs | 0 .../tests}/target/issue-3494/crlf.rs | 0 .../tests}/target/issue-3494/lf.rs | 0 .../tests}/target/issue-3499.rs | 0 .../tests}/target/issue-3508.rs | 0 .../tests}/target/issue-3515.rs | 0 .../tests}/target/issue-3532.rs | 0 .../tests}/target/issue-3539.rs | 0 .../tests}/target/issue-3554.rs | 0 .../tests}/target/issue-3567.rs | 0 .../tests}/target/issue-3568.rs | 0 .../tests}/target/issue-3585/extern_crate.rs | 0 .../issue-3585/reorder_imports_disabled.rs | 0 .../issue-3585/reorder_imports_enabled.rs | 0 .../tests}/target/issue-3585/use.rs | 0 .../tests}/target/issue-3592.rs | 0 .../tests}/target/issue-3595.rs | 0 .../tests}/target/issue-3601.rs | 0 .../tests}/target/issue-3614/version_two.rs | 0 .../tests}/target/issue-3636.rs | 0 .../tests}/target/issue-3639.rs | 0 .../tests}/target/issue-3645.rs | 0 .../tests}/target/issue-3651.rs | 0 .../tests}/target/issue-3665/lib.rs | 0 .../target/issue-3665/not_skip_attribute.rs | 0 .../tests}/target/issue-3665/sub_mod.rs | 0 .../tests}/target/issue-3672.rs | 0 .../tests}/target/issue-3675.rs | 0 .../tests}/target/issue-3701/two.rs | 0 .../tests}/target/issue-3709.rs | 0 .../tests}/target/issue-3711.rs | 0 .../tests}/target/issue-3717.rs | 0 .../tests}/target/issue-3718.rs | 0 .../tests}/target/issue-3740.rs | 0 .../tests}/target/issue-3741.rs | 0 .../tests}/target/issue-3750.rs | 0 .../tests}/target/issue-3751.rs | 0 .../tests}/target/issue-3759.rs | 0 .../tests}/target/issue-3779/ice.rs | 0 .../tests}/target/issue-3779/lib.rs | 0 .../tests}/target/issue-3786.rs | 0 .../tests}/target/issue-3787.rs | 0 .../tests}/target/issue-3815.rs | 0 .../issue-3840/version-two_hard-tabs.rs | 0 .../issue-3840/version-two_soft-tabs.rs | 0 .../tests}/target/issue-3845.rs | 0 .../tests}/target/issue-3851.rs | 0 .../tests}/target/issue-3882.rs | 0 .../tests}/target/issue-3904/two.rs | 0 .../tests}/target/issue-3908.rs | 0 .../tests}/target/issue-3923.rs | 0 .../tests}/target/issue-3929.rs | 0 .../tests}/target/issue-3933/imp-a.rs | 0 .../tests}/target/issue-3933/imp-b.rs | 0 .../tests}/target/issue-3933/lib.rs | 0 .../tests}/target/issue-3933/utils.rs | 0 .../tests}/target/issue-3934.rs | 0 .../tests}/target/issue-3956/graphics.rs | 0 .../tests}/target/issue-3956/graphics_emu.rs | 0 .../tests}/target/issue-3956/lib.rs | 0 .../tests}/target/issue-3974.rs | 0 .../tests}/target/issue-3992.rs | 0 .../tests}/target/issue-447.rs | 0 .../tests}/target/issue-510.rs | 0 .../tests}/target/issue-539.rs | 0 .../tests}/target/issue-64.rs | 0 .../tests}/target/issue-683.rs | 0 .../tests}/target/issue-691.rs | 0 .../tests}/target/issue-770.rs | 0 .../tests}/target/issue-811.rs | 0 .../tests}/target/issue-831.rs | 0 .../tests}/target/issue-850.rs | 0 .../tests}/target/issue-855.rs | 0 .../tests}/target/issue-913.rs | 0 .../tests}/target/issue-945.rs | 0 .../tests}/target/issue-977.rs | 0 .../tests}/target/issue_3839.rs | 0 .../tests}/target/issue_3844.rs | 0 .../tests}/target/issue_3853.rs | 0 .../tests}/target/issue_3854.rs | 0 .../tests}/target/issue_3868.rs | 0 .../item-brace-style-always-next-line.rs | 0 .../item-brace-style-prefer-same-line.rs | 0 .../item-brace-style-same-line-where.rs | 0 .../tests}/target/itemized-blocks/no_wrap.rs | 0 .../target/itemized-blocks/rewrite_fail.rs | 0 .../tests}/target/itemized-blocks/urls.rs | 0 .../tests}/target/itemized-blocks/wrap.rs | 0 .../tests}/target/label_break.rs | 0 .../tests}/target/large-block.rs | 0 .../tests}/target/large_vec.rs | 0 .../tests}/target/lazy_static.rs | 0 .../license-templates/empty_license_path.rs | 0 .../target/license-templates/license.rs | 0 .../tests}/target/long-fn-1/version_two.rs | 0 .../target/long-match-arms-brace-newline.rs | 0 .../target/long-use-statement-issue-3154.rs | 0 .../tests}/target/long_field_access.rs | 0 {tests => rustfmt-core/tests}/target/loop.rs | 0 .../tests}/target/macro_not_expr.rs | 0 .../tests}/target/macro_rules.rs | 0 .../tests}/target/macros.rs | 0 .../target/markdown-comment-with-options.rs | 0 .../tests}/target/markdown-comment.rs | 0 .../target/match-block-trailing-comma.rs | 0 .../tests}/target/match-flattening.rs | 0 .../target/match-nowrap-trailing-comma.rs | 0 .../tests}/target/match-nowrap.rs | 0 {tests => rustfmt-core/tests}/target/match.rs | 0 .../tests}/target/match_overflow_expr.rs | 0 .../tests}/target/max-line-length-in-chars.rs | 0 .../tests}/target/merge_imports.rs | 0 {tests => rustfmt-core/tests}/target/mod-1.rs | 0 {tests => rustfmt-core/tests}/target/mod-2.rs | 0 .../tests}/target/mod_skip_child.rs | 0 .../tests}/target/multi-file.rs | 0 .../target/multiline_string_in_macro_def.rs | 0 .../tests}/target/multiple.rs | 0 .../tests}/target/nested-if-else.rs | 0 .../tests}/target/nested-visual-block.rs | 0 .../tests}/target/nested_skipped/mod.rs | 0 .../tests}/target/nestedmod/mod.rs | 0 .../tests}/target/nestedmod/mod2a.rs | 0 .../tests}/target/nestedmod/mod2b.rs | 0 .../tests}/target/nestedmod/mod2c.rs | 0 .../tests}/target/nestedmod/mymod1/mod3a.rs | 0 .../tests}/target/nestedmod/submod2/a.rs | 0 .../tests}/target/nestedmod/submod2/mod.rs | 0 .../tests}/target/no_arg_with_commnet.rs | 0 .../tests}/target/no_new_line_beginning.rs | 0 ...es_should_not_imply_format_doc_comments.rs | 0 .../normalize_multiline_doc_attribute.rs | 0 .../tests}/target/obsolete_in_place.rs | 0 .../tests}/target/one_line_if_v2.rs | 0 {tests => rustfmt-core/tests}/target/other.rs | 0 {tests => rustfmt-core/tests}/target/paren.rs | 0 .../tests}/target/path_clarity/foo.rs | 0 .../tests}/target/path_clarity/foo/bar.rs | 0 {tests => rustfmt-core/tests}/target/paths.rs | 0 .../target/pattern-condense-wildcards.rs | 0 .../tests}/target/pattern.rs | 0 .../preserves_carriage_return_for_unix.rs | 0 .../preserves_carriage_return_for_windows.rs | 0 .../tests}/target/pub-restricted.rs | 0 .../tests}/target/raw_identifiers.rs | 0 .../tests}/target/remove_blank_lines.rs | 0 .../tests}/target/reorder-impl-items.rs | 0 ...t_string_when_format_strings_is_not_set.rs | 0 .../tests}/target/single-line-if-else.rs | 0 .../tests}/target/single-line-macro/v2.rs | 0 {tests => rustfmt-core/tests}/target/skip.rs | 0 .../tests}/target/skip_mod.rs | 0 .../tests}/target/soft-wrapping.rs | 0 .../tests}/target/space-not-before-newline.rs | 0 .../tests}/target/spaces-around-ranges.rs | 0 .../tests}/target/static.rs | 0 .../tests}/target/string-lit-2.rs | 0 .../tests}/target/string-lit-custom.rs | 0 .../tests}/target/string-lit.rs | 0 .../tests}/target/string_punctuation.rs | 0 .../tests}/target/struct-field-attributes.rs | 0 .../tests}/target/struct_lits.rs | 0 .../tests}/target/struct_lits_multiline.rs | 0 .../tests}/target/struct_lits_visual.rs | 0 .../target/struct_lits_visual_multiline.rs | 0 .../tests}/target/struct_tuple_visual.rs | 0 .../tests}/target/structs.rs | 0 .../tests}/target/trailing-comma-never.rs | 0 .../tests}/target/trailing_commas.rs | 0 .../target/trailing_comments/hard_tabs.rs | 0 .../target/trailing_comments/soft_tabs.rs | 0 {tests => rustfmt-core/tests}/target/trait.rs | 0 .../tests}/target/trait_2015_edition.rs | 0 .../tests}/target/try-conversion.rs | 0 {tests => rustfmt-core/tests}/target/tuple.rs | 0 .../tests}/target/type-ascription.rs | 0 {tests => rustfmt-core/tests}/target/type.rs | 0 .../tests}/target/type_alias.rs | 0 .../tests}/target/unicode.rs | 0 .../target/unindent_if_else_cond_comment.rs | 0 .../tests}/target/unions.rs | 0 .../tests}/target/visibility.rs | 0 .../tests}/target/visual-fn-type.rs | 0 .../tests}/target/where-clause-rfc.rs | 0 .../tests}/target/where-clause.rs | 0 .../tests}/target/width-heuristics.rs | 0 ...ts_should_not_imply_format_doc_comments.rs | 0 .../tests}/writemode/source/fn-single-line.rs | 0 .../tests}/writemode/source/json.rs | 0 .../tests}/writemode/source/modified.rs | 0 .../tests}/writemode/source/stdin.rs | 0 .../tests}/writemode/target/checkstyle.xml | 0 .../tests}/writemode/target/modified.txt | 0 .../tests}/writemode/target/output.json | 0 .../tests}/writemode/target/stdin.json | 0 .../tests}/writemode/target/stdin.xml | 0 src/bin/main.rs | 202 ++++++++++++++++-- src/git-rustfmt/main.rs | 5 +- 1129 files changed, 353 insertions(+), 269 deletions(-) create mode 100644 rustfmt-core/.gitignore create mode 100644 rustfmt-core/Cargo.toml rename {src => rustfmt-core/src}/attr.rs (100%) rename {src => rustfmt-core/src}/attr/doc_comment.rs (100%) rename {src => rustfmt-core/src}/chains.rs (100%) rename {src => rustfmt-core/src}/closures.rs (100%) rename {src => rustfmt-core/src}/comment.rs (100%) rename {src => rustfmt-core/src}/config/config_type.rs (100%) rename {src => rustfmt-core/src}/config/file_lines.rs (100%) rename {src => rustfmt-core/src}/config/license.rs (100%) rename {src => rustfmt-core/src}/config/lists.rs (100%) rename {src => rustfmt-core/src}/config/mod.rs (100%) rename {src => rustfmt-core/src}/config/options.rs (100%) rename {src => rustfmt-core/src}/coverage.rs (100%) rename {src => rustfmt-core/src}/emitter.rs (100%) rename {src => rustfmt-core/src}/emitter/checkstyle.rs (100%) rename {src => rustfmt-core/src}/emitter/checkstyle/xml.rs (100%) rename {src => rustfmt-core/src}/emitter/diff.rs (100%) rename {src => rustfmt-core/src}/emitter/files.rs (100%) rename {src => rustfmt-core/src}/emitter/json.rs (100%) rename {src => rustfmt-core/src}/emitter/modified_lines.rs (100%) rename {src => rustfmt-core/src}/emitter/stdout.rs (100%) rename {src => rustfmt-core/src}/expr.rs (100%) rename {src => rustfmt-core/src}/format_report_formatter.rs (100%) rename {src => rustfmt-core/src}/formatting.rs (100%) rename {src => rustfmt-core/src}/formatting/newline_style.rs (100%) rename {src => rustfmt-core/src}/ignore_path.rs (100%) rename {src => rustfmt-core/src}/imports.rs (100%) rename {src => rustfmt-core/src}/issues.rs (100%) rename {src => rustfmt-core/src}/items.rs (100%) rename {src => rustfmt-core/src}/lib.rs (100%) rename {src => rustfmt-core/src}/lists.rs (100%) rename {src => rustfmt-core/src}/macros.rs (100%) rename {src => rustfmt-core/src}/matches.rs (100%) rename {src => rustfmt-core/src}/missed_spans.rs (100%) rename {src => rustfmt-core/src}/modules.rs (100%) rename {src => rustfmt-core/src}/modules/visitor.rs (100%) rename {src => rustfmt-core/src}/overflow.rs (100%) rename {src => rustfmt-core/src}/pairs.rs (100%) rename {src => rustfmt-core/src}/patterns.rs (100%) rename {src => rustfmt-core/src}/release_channel.rs (100%) rename {src => rustfmt-core/src}/reorder.rs (100%) rename {src => rustfmt-core/src}/rewrite.rs (100%) rename {src => rustfmt-core/src}/rustfmt_diff.rs (100%) rename {src => rustfmt-core/src}/shape.rs (100%) rename {src => rustfmt-core/src}/skip.rs (100%) rename {src => rustfmt-core/src}/source_file.rs (100%) rename {src => rustfmt-core/src}/source_map.rs (100%) rename {src => rustfmt-core/src}/spanned.rs (100%) rename {src => rustfmt-core/src}/stmt.rs (100%) rename {src => rustfmt-core/src}/string.rs (100%) rename {src => rustfmt-core/src}/syntux.rs (100%) rename {src => rustfmt-core/src}/syntux/parser.rs (100%) rename {src => rustfmt-core/src}/syntux/session.rs (100%) rename {src => rustfmt-core/src}/test/configuration_snippet.rs (99%) rename {src => rustfmt-core/src}/test/mod.rs (85%) rename {src => rustfmt-core/src}/types.rs (100%) rename {src => rustfmt-core/src}/utils.rs (100%) rename {src => rustfmt-core/src}/vertical.rs (100%) rename {src => rustfmt-core/src}/visitor.rs (100%) rename {tests => rustfmt-core/tests}/config/issue-1111.toml (100%) rename {tests => rustfmt-core/tests}/config/issue-2641.toml (100%) rename {tests => rustfmt-core/tests}/config/issue-3779.toml (100%) rename {tests => rustfmt-core/tests}/config/issue-3802.toml (100%) rename {tests => rustfmt-core/tests}/config/issue-3933.toml (100%) rename {tests => rustfmt-core/tests}/config/issue-3956.toml (100%) rename {tests => rustfmt-core/tests}/config/skip_children.toml (100%) rename {tests => rustfmt-core/tests}/config/small_tabs.toml (100%) rename {tests => rustfmt-core/tests}/coverage/source/comments.rs (100%) rename {tests => rustfmt-core/tests}/coverage/target/comments.rs (100%) rename {tests => rustfmt-core/tests}/license-template/lt.txt (100%) rename {tests => rustfmt-core/tests}/source/alignment_2633/block_style.rs (100%) rename {tests => rustfmt-core/tests}/source/alignment_2633/visual_style.rs (100%) rename {tests => rustfmt-core/tests}/source/array_comment.rs (100%) rename {tests => rustfmt-core/tests}/source/assignment.rs (100%) rename {tests => rustfmt-core/tests}/source/associated-types-bounds-wrapping.rs (100%) rename {tests => rustfmt-core/tests}/source/associated_type_bounds.rs (100%) rename {tests => rustfmt-core/tests}/source/async_block.rs (100%) rename {tests => rustfmt-core/tests}/source/async_fn.rs (100%) rename {tests => rustfmt-core/tests}/source/attrib.rs (100%) rename {tests => rustfmt-core/tests}/source/big-impl-block.rs (100%) rename {tests => rustfmt-core/tests}/source/big-impl-visual.rs (100%) rename {tests => rustfmt-core/tests}/source/binary-expr.rs (100%) rename {tests => rustfmt-core/tests}/source/break-and-continue.rs (100%) rename {tests => rustfmt-core/tests}/source/catch.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/detect/arch/aarch64.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/detect/arch/arm.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/detect/arch/mips.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/detect/arch/mips64.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/detect/arch/powerpc.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/detect/arch/powerpc64.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/detect/arch/x86.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/detect/bit.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/detect/cache.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/detect/error_macros.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/detect/mod.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/detect/os/aarch64.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/detect/os/freebsd/aarch64.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/detect/os/freebsd/arm.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/detect/os/freebsd/auxvec.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/detect/os/freebsd/mod.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/detect/os/freebsd/powerpc.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/detect/os/linux/aarch64.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/detect/os/linux/arm.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/detect/os/linux/auxvec.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/detect/os/linux/cpuinfo.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/detect/os/linux/mips.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/detect/os/linux/mod.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/detect/os/linux/powerpc.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/detect/os/other.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/detect/os/x86.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/lib.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_if/mod.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_mod/bar.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_mod/dir/dir1/dir2/wasm32.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_mod/dir/dir1/dir3/wasm32.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_mod/foo.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_mod/mod.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_mod/other.rs (100%) rename {tests => rustfmt-core/tests}/source/cfg_mod/wasm32.rs (100%) rename {tests => rustfmt-core/tests}/source/chains-visual.rs (100%) rename {tests => rustfmt-core/tests}/source/chains.rs (100%) rename {tests => rustfmt-core/tests}/source/chains_with_comment.rs (100%) rename {tests => rustfmt-core/tests}/source/closure-block-inside-macro.rs (100%) rename {tests => rustfmt-core/tests}/source/closure_block_style.rs (100%) rename {tests => rustfmt-core/tests}/source/closure_block_style_no_comma.rs (100%) rename {tests => rustfmt-core/tests}/source/closure_visual_style.rs (100%) rename {tests => rustfmt-core/tests}/source/comment.rs (100%) rename {tests => rustfmt-core/tests}/source/comment2.rs (100%) rename {tests => rustfmt-core/tests}/source/comment3.rs (100%) rename {tests => rustfmt-core/tests}/source/comment4.rs (100%) rename {tests => rustfmt-core/tests}/source/comment5.rs (100%) rename {tests => rustfmt-core/tests}/source/comment6.rs (100%) rename {tests => rustfmt-core/tests}/source/comment_crlf_newline.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/blank_lines_lower_bound/1.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/brace_style/fn_always_next_line.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/brace_style/fn_prefer_same_line.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/brace_style/fn_same_line_where.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/brace_style/item_always_next_line.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/brace_style/item_prefer_same_line.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/brace_style/item_same_line_where.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/comment_width/above.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/comment_width/below.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/comment_width/ignore.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/condense_wildcard_suffixes/false.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/condense_wildcard_suffixes/true.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/control_brace_style/always_next_line.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/control_brace_style/always_same_line.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/control_brace_style/closing_next_line.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/disable_all_formatting/false.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/disable_all_formatting/true.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/empty_item_single_line/false.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/empty_item_single_line/true.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/enum_discrim_align_threshold/40.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/error_on_line_overflow/false.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/fn_args_layout/compressed.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/fn_args_layout/tall.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/fn_args_layout/vertical.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/fn_single_line/false.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/fn_single_line/true.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/force_explicit_abi/false.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/force_explicit_abi/true.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/force_multiline_block/false.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/force_multiline_block/true.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/format_macro_bodies/false.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/format_macro_bodies/true.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/format_macro_matchers/false.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/format_macro_matchers/true.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/format_strings/false.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/format_strings/true.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/hard_tabs/false.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/hard_tabs/true.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/imports_layout/merge_mixed.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/indent_style/block_args.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/indent_style/block_array.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/indent_style/block_call.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/indent_style/block_chain.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/indent_style/block_generic.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/indent_style/block_struct_lit.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/indent_style/block_trailing_comma_call/two.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/indent_style/block_where_pred.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/indent_style/default.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/indent_style/rfc_where.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/indent_style/visual_args.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/indent_style/visual_array.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/indent_style/visual_call.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/indent_style/visual_chain.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/indent_style/visual_generics.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/indent_style/visual_struct_lit.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/indent_style/visual_trailing_comma.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/indent_style/visual_where_pred.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/match_arm_blocks/false.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/match_arm_blocks/true.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/match_block_trailing_comma/false.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/match_block_trailing_comma/true.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/merge_derives/true.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/normalize_comments/false.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/normalize_comments/true.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/normalize_doc_attributes/false.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/normalize_doc_attributes/true.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/recursive/disabled/foo.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/recursive/disabled/lib.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/recursive/enabled/foo.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/recursive/enabled/lib.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/remove_nested_parens/remove_nested_parens.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/reorder_impl_items/false.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/reorder_impl_items/true.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/reorder_imports/false.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/reorder_imports/true.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/reorder_modules/dolor/mod.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/reorder_modules/false.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/reorder_modules/ipsum/mod.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/reorder_modules/lorem/mod.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/reorder_modules/sit/mod.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/reorder_modules/true.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/skip_children/foo/mod.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/skip_children/true.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/space_before_colon/true.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/spaces_around_ranges/false.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/spaces_around_ranges/true.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/struct_field_align_threshold/20.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/struct_lit_single_line/false.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/tab_spaces/2.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/tab_spaces/4.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/trailing_comma/always.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/trailing_comma/never.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/trailing_comma/vertical.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/type_punctuation_density/compressed.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/type_punctuation_density/wide.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/use_field_init_shorthand/false.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/use_field_init_shorthand/true.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/use_small_heuristics/max.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/use_try_shorthand/false.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/use_try_shorthand/true.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/use_try_shorthand/true_2015_edition.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/where_single_line/true.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/wrap_comments/false.rs (100%) rename {tests => rustfmt-core/tests}/source/configs/wrap_comments/true.rs (100%) rename {tests => rustfmt-core/tests}/source/const_generics.rs (100%) rename {tests => rustfmt-core/tests}/source/control-brace-style-always-next-line.rs (100%) rename {tests => rustfmt-core/tests}/source/control-brace-style-always-same-line.rs (100%) rename {tests => rustfmt-core/tests}/source/doc-attrib.rs (100%) rename {tests => rustfmt-core/tests}/source/doc-comment-with-example.rs (100%) rename {tests => rustfmt-core/tests}/source/doc.rs (100%) rename {tests => rustfmt-core/tests}/source/dyn_trait.rs (100%) rename {tests => rustfmt-core/tests}/source/else-if-brace-style-always-next-line.rs (100%) rename {tests => rustfmt-core/tests}/source/else-if-brace-style-always-same-line.rs (100%) rename {tests => rustfmt-core/tests}/source/else-if-brace-style-closing-next-line.rs (100%) rename {tests => rustfmt-core/tests}/source/empty_file.rs (100%) rename {tests => rustfmt-core/tests}/source/enum.rs (100%) rename {tests => rustfmt-core/tests}/source/existential_type.rs (100%) rename {tests => rustfmt-core/tests}/source/expr-block.rs (100%) rename {tests => rustfmt-core/tests}/source/expr-overflow-delimited.rs (100%) rename {tests => rustfmt-core/tests}/source/expr.rs (100%) rename {tests => rustfmt-core/tests}/source/extern.rs (100%) rename {tests => rustfmt-core/tests}/source/extern_not_explicit.rs (100%) rename {tests => rustfmt-core/tests}/source/file-lines-1.rs (100%) rename {tests => rustfmt-core/tests}/source/file-lines-2.rs (100%) rename {tests => rustfmt-core/tests}/source/file-lines-3.rs (100%) rename {tests => rustfmt-core/tests}/source/file-lines-4.rs (100%) rename {tests => rustfmt-core/tests}/source/file-lines-5.rs (100%) rename {tests => rustfmt-core/tests}/source/file-lines-6.rs (100%) rename {tests => rustfmt-core/tests}/source/file-lines-7.rs (100%) rename {tests => rustfmt-core/tests}/source/file-lines-8.rs (100%) rename {tests => rustfmt-core/tests}/source/file-lines-item.rs (100%) rename {tests => rustfmt-core/tests}/source/fn-custom-2.rs (100%) rename {tests => rustfmt-core/tests}/source/fn-custom-3.rs (100%) rename {tests => rustfmt-core/tests}/source/fn-custom-4.rs (100%) rename {tests => rustfmt-core/tests}/source/fn-custom-6.rs (100%) rename {tests => rustfmt-core/tests}/source/fn-custom-7.rs (100%) rename {tests => rustfmt-core/tests}/source/fn-custom-8.rs (100%) rename {tests => rustfmt-core/tests}/source/fn-custom.rs (100%) rename {tests => rustfmt-core/tests}/source/fn-param-attributes.rs (100%) rename {tests => rustfmt-core/tests}/source/fn-simple.rs (100%) rename {tests => rustfmt-core/tests}/source/fn-single-line/version_two.rs (100%) rename {tests => rustfmt-core/tests}/source/fn_args_indent-block.rs (100%) rename {tests => rustfmt-core/tests}/source/fn_args_layout-vertical.rs (100%) rename {tests => rustfmt-core/tests}/source/hard-tabs.rs (100%) rename {tests => rustfmt-core/tests}/source/hello.rs (100%) rename {tests => rustfmt-core/tests}/source/hello2.rs (100%) rename {tests => rustfmt-core/tests}/source/if_while_or_patterns.rs (100%) rename {tests => rustfmt-core/tests}/source/immovable_generators.rs (100%) rename {tests => rustfmt-core/tests}/source/impls.rs (100%) rename {tests => rustfmt-core/tests}/source/imports-impl-only-use.rs (100%) rename {tests => rustfmt-core/tests}/source/imports-reorder-lines-and-items.rs (100%) rename {tests => rustfmt-core/tests}/source/imports-reorder-lines.rs (100%) rename {tests => rustfmt-core/tests}/source/imports-reorder.rs (100%) rename {tests => rustfmt-core/tests}/source/imports.rs (100%) rename {tests => rustfmt-core/tests}/source/imports_2015_edition.rs (100%) rename {tests => rustfmt-core/tests}/source/imports_block_indent.rs (100%) rename {tests => rustfmt-core/tests}/source/imports_raw_identifiers.rs (100%) rename {tests => rustfmt-core/tests}/source/invalid-rust-code-in-doc-comment.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-1021.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-1049.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-1111.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-1120.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-1124.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-1127.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-1158.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-1177.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-1192.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-1210/a.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-1210/b.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-1210/c.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-1210/d.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-1210/e.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-1211.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-1216.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-1239.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-1278.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-1350.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-1366.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-1468.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-1693.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-1800.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-1914.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2025.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2111.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2164.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2179/two.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2256.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2342.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2445.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2446.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2479.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2482/a.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2482/b.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2482/c.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2496.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2520.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2523.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2582.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2641.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2644.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2728.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2761.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2794.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2835.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2863.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2869.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2896.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2917/packed_simd.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2922.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2927-2.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2927.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2930.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2936.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2955.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2973.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2977/impl.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2977/trait.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2985.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-2995.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3029.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3038.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3049.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3055/original.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3059.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3066.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3131.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3153.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3170.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3194.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3198.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3213/version_two.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3217.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3227/two.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3234.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3241.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3253/bar.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3253/foo.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3253/lib.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3253/paths/bar_foo.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3253/paths/excluded.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3253/paths/foo_bar.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3265.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3270/two.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3272/v2.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3278/version_two.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3295/two.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3302.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3343.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3423.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3434/lib.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3434/no_entry.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3434/not_skip_macro.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3465.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3494/crlf.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3494/lf.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3508.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3515.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3532.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3585/extern_crate.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3585/reorder_imports_disabled.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3585/reorder_imports_enabled.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3585/use.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3636.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3639.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3651.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3665/lib.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3665/not_skip_attribute.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3665/sub_mod.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3672.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3675.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3701/two.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3709.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3740.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3750.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3751.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3779/ice.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3779/lib.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3786.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3787.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3840/version-two_hard-tabs.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3840/version-two_soft-tabs.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3851.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3904/two.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3908.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3923.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3929.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3933/imp-a.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3933/imp-b.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3933/lib.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-3933/utils.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-447.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-510.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-539.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-683.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-811.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-850.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-855.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-913.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-945.rs (100%) rename {tests => rustfmt-core/tests}/source/issue-977.rs (100%) rename {tests => rustfmt-core/tests}/source/issue_3839.rs (100%) rename {tests => rustfmt-core/tests}/source/issue_3844.rs (100%) rename {tests => rustfmt-core/tests}/source/issue_3853.rs (100%) rename {tests => rustfmt-core/tests}/source/issue_3868.rs (100%) rename {tests => rustfmt-core/tests}/source/item-brace-style-always-next-line.rs (100%) rename {tests => rustfmt-core/tests}/source/item-brace-style-prefer-same-line.rs (100%) rename {tests => rustfmt-core/tests}/source/item-brace-style-same-line-where.rs (100%) rename {tests => rustfmt-core/tests}/source/itemized-blocks/no_wrap.rs (100%) rename {tests => rustfmt-core/tests}/source/itemized-blocks/rewrite_fail.rs (100%) rename {tests => rustfmt-core/tests}/source/itemized-blocks/urls.rs (100%) rename {tests => rustfmt-core/tests}/source/itemized-blocks/wrap.rs (100%) rename {tests => rustfmt-core/tests}/source/label_break.rs (100%) rename {tests => rustfmt-core/tests}/source/large-block.rs (100%) rename {tests => rustfmt-core/tests}/source/large_vec.rs (100%) rename {tests => rustfmt-core/tests}/source/lazy_static.rs (100%) rename {tests => rustfmt-core/tests}/source/license-templates/empty_license_path.rs (100%) rename {tests => rustfmt-core/tests}/source/license-templates/license.rs (100%) rename {tests => rustfmt-core/tests}/source/long-fn-1/version_two.rs (100%) rename {tests => rustfmt-core/tests}/source/long-match-arms-brace-newline.rs (100%) rename {tests => rustfmt-core/tests}/source/long-use-statement-issue-3154.rs (100%) rename {tests => rustfmt-core/tests}/source/long_field_access.rs (100%) rename {tests => rustfmt-core/tests}/source/loop.rs (100%) rename {tests => rustfmt-core/tests}/source/macro_not_expr.rs (100%) rename {tests => rustfmt-core/tests}/source/macro_rules.rs (100%) rename {tests => rustfmt-core/tests}/source/macros.rs (100%) rename {tests => rustfmt-core/tests}/source/markdown-comment-with-options.rs (100%) rename {tests => rustfmt-core/tests}/source/markdown-comment.rs (100%) rename {tests => rustfmt-core/tests}/source/match-block-trailing-comma.rs (100%) rename {tests => rustfmt-core/tests}/source/match-flattening.rs (100%) rename {tests => rustfmt-core/tests}/source/match-nowrap-trailing-comma.rs (100%) rename {tests => rustfmt-core/tests}/source/match-nowrap.rs (100%) rename {tests => rustfmt-core/tests}/source/match.rs (100%) rename {tests => rustfmt-core/tests}/source/match_overflow_expr.rs (100%) rename {tests => rustfmt-core/tests}/source/max-line-length-in-chars.rs (100%) rename {tests => rustfmt-core/tests}/source/merge_imports.rs (100%) rename {tests => rustfmt-core/tests}/source/mod-1.rs (100%) rename {tests => rustfmt-core/tests}/source/mod-2.rs (100%) rename {tests => rustfmt-core/tests}/source/mod_skip_child.rs (100%) rename {tests => rustfmt-core/tests}/source/multiple.rs (100%) rename {tests => rustfmt-core/tests}/source/nested-if-else.rs (100%) rename {tests => rustfmt-core/tests}/source/nested_skipped/mod.rs (100%) rename {tests => rustfmt-core/tests}/source/nestedmod/mod.rs (100%) rename {tests => rustfmt-core/tests}/source/nestedmod/mod2a.rs (100%) rename {tests => rustfmt-core/tests}/source/nestedmod/mod2b.rs (100%) rename {tests => rustfmt-core/tests}/source/nestedmod/mod2c.rs (100%) rename {tests => rustfmt-core/tests}/source/nestedmod/mymod1/mod3a.rs (100%) rename {tests => rustfmt-core/tests}/source/nestedmod/submod2/a.rs (100%) rename {tests => rustfmt-core/tests}/source/nestedmod/submod2/mod.rs (100%) rename {tests => rustfmt-core/tests}/source/no_arg_with_commnet.rs (100%) rename {tests => rustfmt-core/tests}/source/no_new_line_beginning.rs (100%) rename {tests => rustfmt-core/tests}/source/normalize_doc_attributes_should_not_imply_format_doc_comments.rs (100%) rename {tests => rustfmt-core/tests}/source/normalize_multiline_doc_attribute.rs (100%) rename {tests => rustfmt-core/tests}/source/one_line_if_v2.rs (100%) rename {tests => rustfmt-core/tests}/source/other.rs (100%) rename {tests => rustfmt-core/tests}/source/paren.rs (100%) rename {tests => rustfmt-core/tests}/source/path_clarity/foo.rs (100%) rename {tests => rustfmt-core/tests}/source/path_clarity/foo/bar.rs (100%) rename {tests => rustfmt-core/tests}/source/paths.rs (100%) rename {tests => rustfmt-core/tests}/source/pattern-condense-wildcards.rs (100%) rename {tests => rustfmt-core/tests}/source/pattern.rs (100%) rename {tests => rustfmt-core/tests}/source/preserves_carriage_return_for_unix.rs (100%) rename {tests => rustfmt-core/tests}/source/preserves_carriage_return_for_windows.rs (100%) rename {tests => rustfmt-core/tests}/source/pub-restricted.rs (100%) rename {tests => rustfmt-core/tests}/source/remove_blank_lines.rs (100%) rename {tests => rustfmt-core/tests}/source/reorder-impl-items.rs (100%) rename {tests => rustfmt-core/tests}/source/single-line-if-else.rs (100%) rename {tests => rustfmt-core/tests}/source/single-line-macro/v2.rs (100%) rename {tests => rustfmt-core/tests}/source/soft-wrapping.rs (100%) rename {tests => rustfmt-core/tests}/source/space-not-before-newline.rs (100%) rename {tests => rustfmt-core/tests}/source/spaces-around-ranges.rs (100%) rename {tests => rustfmt-core/tests}/source/static.rs (100%) rename {tests => rustfmt-core/tests}/source/string-lit-2.rs (100%) rename {tests => rustfmt-core/tests}/source/string-lit.rs (100%) rename {tests => rustfmt-core/tests}/source/string_punctuation.rs (100%) rename {tests => rustfmt-core/tests}/source/struct-field-attributes.rs (100%) rename {tests => rustfmt-core/tests}/source/struct_lits.rs (100%) rename {tests => rustfmt-core/tests}/source/struct_lits_multiline.rs (100%) rename {tests => rustfmt-core/tests}/source/struct_lits_visual.rs (100%) rename {tests => rustfmt-core/tests}/source/struct_lits_visual_multiline.rs (100%) rename {tests => rustfmt-core/tests}/source/struct_tuple_visual.rs (100%) rename {tests => rustfmt-core/tests}/source/structs.rs (100%) rename {tests => rustfmt-core/tests}/source/trailing-comma-never.rs (100%) rename {tests => rustfmt-core/tests}/source/trailing_commas.rs (100%) rename {tests => rustfmt-core/tests}/source/trailing_comments/hard_tabs.rs (100%) rename {tests => rustfmt-core/tests}/source/trailing_comments/soft_tabs.rs (100%) rename {tests => rustfmt-core/tests}/source/trait.rs (100%) rename {tests => rustfmt-core/tests}/source/trait_2015_edition.rs (100%) rename {tests => rustfmt-core/tests}/source/try-conversion.rs (100%) rename {tests => rustfmt-core/tests}/source/tuple.rs (100%) rename {tests => rustfmt-core/tests}/source/type-ascription.rs (100%) rename {tests => rustfmt-core/tests}/source/type.rs (100%) rename {tests => rustfmt-core/tests}/source/type_alias.rs (100%) rename {tests => rustfmt-core/tests}/source/unicode.rs (100%) rename {tests => rustfmt-core/tests}/source/unions.rs (100%) rename {tests => rustfmt-core/tests}/source/visibility.rs (100%) rename {tests => rustfmt-core/tests}/source/visual-fn-type.rs (100%) rename {tests => rustfmt-core/tests}/source/where-clause-rfc.rs (100%) rename {tests => rustfmt-core/tests}/source/where-clause.rs (100%) rename {tests => rustfmt-core/tests}/source/width-heuristics.rs (100%) rename {tests => rustfmt-core/tests}/source/wrap_comments_should_not_imply_format_doc_comments.rs (100%) rename {tests => rustfmt-core/tests}/target/alignment_2633/block_style.rs (100%) rename {tests => rustfmt-core/tests}/target/alignment_2633/horizontal_tactic.rs (100%) rename {tests => rustfmt-core/tests}/target/alignment_2633/visual_style.rs (100%) rename {tests => rustfmt-core/tests}/target/array_comment.rs (100%) rename {tests => rustfmt-core/tests}/target/assignment.rs (100%) rename {tests => rustfmt-core/tests}/target/associated-items.rs (100%) rename {tests => rustfmt-core/tests}/target/associated-types-bounds-wrapping.rs (100%) rename {tests => rustfmt-core/tests}/target/associated_type_bounds.rs (100%) rename {tests => rustfmt-core/tests}/target/associated_type_defaults.rs (100%) rename {tests => rustfmt-core/tests}/target/async_block.rs (100%) rename {tests => rustfmt-core/tests}/target/async_closure.rs (100%) rename {tests => rustfmt-core/tests}/target/async_fn.rs (100%) rename {tests => rustfmt-core/tests}/target/attrib-block-expr.rs (100%) rename {tests => rustfmt-core/tests}/target/attrib-extern-crate.rs (100%) rename {tests => rustfmt-core/tests}/target/attrib.rs (100%) rename {tests => rustfmt-core/tests}/target/big-impl-block.rs (100%) rename {tests => rustfmt-core/tests}/target/big-impl-visual.rs (100%) rename {tests => rustfmt-core/tests}/target/binary-expr.rs (100%) rename {tests => rustfmt-core/tests}/target/break-and-continue.rs (100%) rename {tests => rustfmt-core/tests}/target/catch.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/detect/arch/aarch64.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/detect/arch/arm.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/detect/arch/mips.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/detect/arch/mips64.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/detect/arch/powerpc.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/detect/arch/powerpc64.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/detect/arch/x86.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/detect/bit.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/detect/cache.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/detect/error_macros.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/detect/mod.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/detect/os/aarch64.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/detect/os/freebsd/aarch64.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/detect/os/freebsd/arm.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/detect/os/freebsd/auxvec.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/detect/os/freebsd/mod.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/detect/os/freebsd/powerpc.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/detect/os/linux/aarch64.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/detect/os/linux/arm.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/detect/os/linux/auxvec.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/detect/os/linux/cpuinfo.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/detect/os/linux/mips.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/detect/os/linux/mod.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/detect/os/linux/powerpc.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/detect/os/other.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/detect/os/x86.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/lib.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_if/mod.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_mod/bar.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_mod/dir/dir1/dir2/wasm32.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_mod/dir/dir1/dir3/wasm32.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_mod/foo.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_mod/mod.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_mod/other.rs (100%) rename {tests => rustfmt-core/tests}/target/cfg_mod/wasm32.rs (100%) rename {tests => rustfmt-core/tests}/target/chains-visual.rs (100%) rename {tests => rustfmt-core/tests}/target/chains.rs (100%) rename {tests => rustfmt-core/tests}/target/chains_with_comment.rs (100%) rename {tests => rustfmt-core/tests}/target/closure-block-inside-macro.rs (100%) rename {tests => rustfmt-core/tests}/target/closure_block_style.rs (100%) rename {tests => rustfmt-core/tests}/target/closure_block_style_no_comma.rs (100%) rename {tests => rustfmt-core/tests}/target/closure_visual_style.rs (100%) rename {tests => rustfmt-core/tests}/target/comment-inside-const.rs (100%) rename {tests => rustfmt-core/tests}/target/comment-not-disappear.rs (100%) rename {tests => rustfmt-core/tests}/target/comment.rs (100%) rename {tests => rustfmt-core/tests}/target/comment2.rs (100%) rename {tests => rustfmt-core/tests}/target/comment3.rs (100%) rename {tests => rustfmt-core/tests}/target/comment4.rs (100%) rename {tests => rustfmt-core/tests}/target/comment5.rs (100%) rename {tests => rustfmt-core/tests}/target/comment6.rs (100%) rename {tests => rustfmt-core/tests}/target/comment_crlf_newline.rs (100%) rename {tests => rustfmt-core/tests}/target/comments-fn.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/blank_lines_lower_bound/1.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/brace_style/fn_always_next_line.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/brace_style/fn_prefer_same_line.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/brace_style/fn_same_line_where.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/brace_style/item_always_next_line.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/brace_style/item_prefer_same_line.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/brace_style/item_same_line_where.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/combine_control_expr/false.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/combine_control_expr/true.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/comment_width/above.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/comment_width/below.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/comment_width/ignore.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/condense_wildcard_suffixes/false.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/condense_wildcard_suffixes/true.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/control_brace_style/always_next_line.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/control_brace_style/always_same_line.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/control_brace_style/closing_next_line.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/disable_all_formatting/false.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/disable_all_formatting/true.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/empty_item_single_line/false.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/empty_item_single_line/true.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/enum_discrim_align_threshold/40.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/error_on_line_overflow/false.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/error_on_unformatted/false.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/fn_args_layout/compressed.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/fn_args_layout/tall.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/fn_args_layout/vertical.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/fn_single_line/false.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/fn_single_line/true.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/force_explicit_abi/false.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/force_explicit_abi/true.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/force_multiline_block/false.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/force_multiline_block/true.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/format_macro_bodies/false.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/format_macro_bodies/true.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/format_macro_matchers/false.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/format_macro_matchers/true.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/format_strings/false.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/format_strings/true.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/hard_tabs/false.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/hard_tabs/true.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/imports_indent/block.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/imports_layout/horizontal_vertical.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/imports_layout/merge_mixed.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/imports_layout/mixed.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/indent_style/block_args.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/indent_style/block_array.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/indent_style/block_call.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/indent_style/block_chain.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/indent_style/block_generic.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/indent_style/block_struct_lit.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/indent_style/block_tab_spaces_call.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/indent_style/block_trailing_comma_call/two.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/indent_style/block_where_pred.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/indent_style/default.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/indent_style/rfc_control.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/indent_style/rfc_where.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/indent_style/visual_args.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/indent_style/visual_array.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/indent_style/visual_call.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/indent_style/visual_chain.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/indent_style/visual_generics.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/indent_style/visual_struct_lit.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/indent_style/visual_trailing_comma.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/indent_style/visual_where_pred.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/match_arm_blocks/false.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/match_arm_blocks/true.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/match_block_trailing_comma/false.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/match_block_trailing_comma/true.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/merge_derives/true.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/normalize_comments/false.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/normalize_comments/true.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/normalize_doc_attributes/false.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/normalize_doc_attributes/true.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/recursive/disabled/foo.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/recursive/disabled/lib.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/recursive/enabled/foo.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/recursive/enabled/lib.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/remove_nested_parens/remove_nested_parens.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/reorder_impl_items/false.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/reorder_impl_items/true.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/reorder_imports/false.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/reorder_imports/true.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/reorder_modules/dolor/mod.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/reorder_modules/false.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/reorder_modules/ipsum/mod.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/reorder_modules/lorem/mod.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/reorder_modules/sit/mod.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/reorder_modules/true.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/skip_children/foo/mod.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/skip_children/true.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/space_before_colon/true.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/spaces_around_ranges/false.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/spaces_around_ranges/true.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/struct_field_align_threshold/20.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/struct_lit_single_line/false.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/tab_spaces/2.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/tab_spaces/4.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/trailing_comma/always.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/trailing_comma/never.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/trailing_comma/vertical.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/trailing_semicolon/false.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/trailing_semicolon/true.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/type_punctuation_density/compressed.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/type_punctuation_density/wide.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/use_field_init_shorthand/false.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/use_field_init_shorthand/true.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/use_small_heuristics/max.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/use_try_shorthand/false.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/use_try_shorthand/true.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/use_try_shorthand/true_2015_edition.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/where_single_line/true.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/wrap_comments/false.rs (100%) rename {tests => rustfmt-core/tests}/target/configs/wrap_comments/true.rs (100%) rename {tests => rustfmt-core/tests}/target/const_generics.rs (100%) rename {tests => rustfmt-core/tests}/target/control-brace-style-always-next-line.rs (100%) rename {tests => rustfmt-core/tests}/target/control-brace-style-always-same-line.rs (100%) rename {tests => rustfmt-core/tests}/target/doc-attrib.rs (100%) rename {tests => rustfmt-core/tests}/target/doc-comment-with-example.rs (100%) rename {tests => rustfmt-core/tests}/target/doc.rs (100%) rename {tests => rustfmt-core/tests}/target/dyn_trait.rs (100%) rename {tests => rustfmt-core/tests}/target/else-if-brace-style-always-next-line.rs (100%) rename {tests => rustfmt-core/tests}/target/else-if-brace-style-always-same-line.rs (100%) rename {tests => rustfmt-core/tests}/target/else-if-brace-style-closing-next-line.rs (100%) rename {tests => rustfmt-core/tests}/target/empty-tuple-no-conversion-to-unit-struct.rs (100%) rename {tests => rustfmt-core/tests}/target/empty_file.rs (100%) rename {tests => rustfmt-core/tests}/target/enum.rs (100%) rename {tests => rustfmt-core/tests}/target/existential_type.rs (100%) rename {tests => rustfmt-core/tests}/target/expr-block.rs (100%) rename {tests => rustfmt-core/tests}/target/expr-overflow-delimited.rs (100%) rename {tests => rustfmt-core/tests}/target/expr.rs (100%) rename {tests => rustfmt-core/tests}/target/extern.rs (100%) rename {tests => rustfmt-core/tests}/target/extern_not_explicit.rs (100%) rename {tests => rustfmt-core/tests}/target/file-lines-1.rs (100%) rename {tests => rustfmt-core/tests}/target/file-lines-2.rs (100%) rename {tests => rustfmt-core/tests}/target/file-lines-3.rs (100%) rename {tests => rustfmt-core/tests}/target/file-lines-4.rs (100%) rename {tests => rustfmt-core/tests}/target/file-lines-5.rs (100%) rename {tests => rustfmt-core/tests}/target/file-lines-6.rs (100%) rename {tests => rustfmt-core/tests}/target/file-lines-7.rs (100%) rename {tests => rustfmt-core/tests}/target/file-lines-8.rs (100%) rename {tests => rustfmt-core/tests}/target/file-lines-item.rs (100%) rename {tests => rustfmt-core/tests}/target/fn-args-with-last-line-comment.rs (100%) rename {tests => rustfmt-core/tests}/target/fn-custom-2.rs (100%) rename {tests => rustfmt-core/tests}/target/fn-custom-3.rs (100%) rename {tests => rustfmt-core/tests}/target/fn-custom-4.rs (100%) rename {tests => rustfmt-core/tests}/target/fn-custom-6.rs (100%) rename {tests => rustfmt-core/tests}/target/fn-custom-7.rs (100%) rename {tests => rustfmt-core/tests}/target/fn-custom-8.rs (100%) rename {tests => rustfmt-core/tests}/target/fn-custom.rs (100%) rename {tests => rustfmt-core/tests}/target/fn-param-attributes.rs (100%) rename {tests => rustfmt-core/tests}/target/fn-simple.rs (100%) rename {tests => rustfmt-core/tests}/target/fn-single-line/version_two.rs (100%) rename {tests => rustfmt-core/tests}/target/fn-ty.rs (100%) rename {tests => rustfmt-core/tests}/target/fn.rs (100%) rename {tests => rustfmt-core/tests}/target/fn_args_indent-block.rs (100%) rename {tests => rustfmt-core/tests}/target/fn_args_layout-vertical.rs (100%) rename {tests => rustfmt-core/tests}/target/fn_once.rs (100%) rename {tests => rustfmt-core/tests}/target/format_strings/issue-202.rs (100%) rename {tests => rustfmt-core/tests}/target/format_strings/issue-2833.rs (100%) rename {tests => rustfmt-core/tests}/target/format_strings/issue-3263.rs (100%) rename {tests => rustfmt-core/tests}/target/format_strings/issue-687.rs (100%) rename {tests => rustfmt-core/tests}/target/format_strings/issue564.rs (100%) rename {tests => rustfmt-core/tests}/target/hard-tabs.rs (100%) rename {tests => rustfmt-core/tests}/target/hello.rs (100%) rename {tests => rustfmt-core/tests}/target/if_while_or_patterns.rs (100%) rename {tests => rustfmt-core/tests}/target/immovable_generators.rs (100%) rename {tests => rustfmt-core/tests}/target/impl.rs (100%) rename {tests => rustfmt-core/tests}/target/impls.rs (100%) rename {tests => rustfmt-core/tests}/target/import-fencepost-length.rs (100%) rename {tests => rustfmt-core/tests}/target/imports-impl-only-use.rs (100%) rename {tests => rustfmt-core/tests}/target/imports-reorder-lines-and-items.rs (100%) rename {tests => rustfmt-core/tests}/target/imports-reorder-lines.rs (100%) rename {tests => rustfmt-core/tests}/target/imports-reorder.rs (100%) rename {tests => rustfmt-core/tests}/target/imports.rs (100%) rename {tests => rustfmt-core/tests}/target/imports_2015_edition.rs (100%) rename {tests => rustfmt-core/tests}/target/imports_block_indent.rs (100%) rename {tests => rustfmt-core/tests}/target/imports_raw_identifiers.rs (100%) rename {tests => rustfmt-core/tests}/target/indented-impl.rs (100%) rename {tests => rustfmt-core/tests}/target/invalid-rust-code-in-doc-comment.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1021.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1049.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1055.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1096.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1111.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1113.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1120.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1124.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1127.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1158.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1177.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1192.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1210/a.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1210/b.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1210/c.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1210/d.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1210/e.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1211.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1214.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1216.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1239.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1247.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1255.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1278.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1350.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1366.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1397.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1468.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1598.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1624.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1681.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1693.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1703.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1800.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1802.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1824.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-1914.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2025.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2103.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2111.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2123.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2164.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2179/two.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2197.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2256.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2324.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2329.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2342.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2346.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2401.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2445.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2446.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2479.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2482/a.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2482/b.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2482/c.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2496.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2520.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2523.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2526.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2551.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2554.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2582.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2641.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2644.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2673-nonmodrs-mods/foo.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2673-nonmodrs-mods/foo/bar.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2673-nonmodrs-mods/lib.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2728.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2759.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2761.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2794.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2810.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2835.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2863.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2869.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2896.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2916.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2917/minimal.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2917/packed_simd.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2922.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2927-2.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2927.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2930.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2936.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2941.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2955.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2973.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2976.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2977/block.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2977/impl.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2977/item.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2977/trait.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2985.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-2995.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3029.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3032.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3038.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3043.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3049.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3055/backtick.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3055/empty-code-block.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3055/original.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3059.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3066.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3105.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3118.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3124.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3131.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3132.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3153.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3170.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3182.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3184.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3194.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3198.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3213/version_two.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3217.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3224.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3227/two.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3234.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3241.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3253/bar.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3253/foo.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3253/lib.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3253/paths/bar_foo.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3253/paths/excluded.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3253/paths/foo_bar.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3265.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3270/two.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3270/wrap.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3272/v2.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3278/version_two.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3295/two.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3302.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3304.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3314.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3343.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3423.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3434/lib.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3434/no_entry.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3434/not_skip_macro.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3442.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3465.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3494/crlf.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3494/lf.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3499.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3508.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3515.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3532.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3539.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3554.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3567.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3568.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3585/extern_crate.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3585/reorder_imports_disabled.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3585/reorder_imports_enabled.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3585/use.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3592.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3595.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3601.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3614/version_two.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3636.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3639.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3645.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3651.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3665/lib.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3665/not_skip_attribute.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3665/sub_mod.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3672.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3675.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3701/two.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3709.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3711.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3717.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3718.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3740.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3741.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3750.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3751.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3759.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3779/ice.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3779/lib.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3786.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3787.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3815.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3840/version-two_hard-tabs.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3840/version-two_soft-tabs.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3845.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3851.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3882.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3904/two.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3908.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3923.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3929.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3933/imp-a.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3933/imp-b.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3933/lib.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3933/utils.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3934.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3956/graphics.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3956/graphics_emu.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3956/lib.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3974.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-3992.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-447.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-510.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-539.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-64.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-683.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-691.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-770.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-811.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-831.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-850.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-855.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-913.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-945.rs (100%) rename {tests => rustfmt-core/tests}/target/issue-977.rs (100%) rename {tests => rustfmt-core/tests}/target/issue_3839.rs (100%) rename {tests => rustfmt-core/tests}/target/issue_3844.rs (100%) rename {tests => rustfmt-core/tests}/target/issue_3853.rs (100%) rename {tests => rustfmt-core/tests}/target/issue_3854.rs (100%) rename {tests => rustfmt-core/tests}/target/issue_3868.rs (100%) rename {tests => rustfmt-core/tests}/target/item-brace-style-always-next-line.rs (100%) rename {tests => rustfmt-core/tests}/target/item-brace-style-prefer-same-line.rs (100%) rename {tests => rustfmt-core/tests}/target/item-brace-style-same-line-where.rs (100%) rename {tests => rustfmt-core/tests}/target/itemized-blocks/no_wrap.rs (100%) rename {tests => rustfmt-core/tests}/target/itemized-blocks/rewrite_fail.rs (100%) rename {tests => rustfmt-core/tests}/target/itemized-blocks/urls.rs (100%) rename {tests => rustfmt-core/tests}/target/itemized-blocks/wrap.rs (100%) rename {tests => rustfmt-core/tests}/target/label_break.rs (100%) rename {tests => rustfmt-core/tests}/target/large-block.rs (100%) rename {tests => rustfmt-core/tests}/target/large_vec.rs (100%) rename {tests => rustfmt-core/tests}/target/lazy_static.rs (100%) rename {tests => rustfmt-core/tests}/target/license-templates/empty_license_path.rs (100%) rename {tests => rustfmt-core/tests}/target/license-templates/license.rs (100%) rename {tests => rustfmt-core/tests}/target/long-fn-1/version_two.rs (100%) rename {tests => rustfmt-core/tests}/target/long-match-arms-brace-newline.rs (100%) rename {tests => rustfmt-core/tests}/target/long-use-statement-issue-3154.rs (100%) rename {tests => rustfmt-core/tests}/target/long_field_access.rs (100%) rename {tests => rustfmt-core/tests}/target/loop.rs (100%) rename {tests => rustfmt-core/tests}/target/macro_not_expr.rs (100%) rename {tests => rustfmt-core/tests}/target/macro_rules.rs (100%) rename {tests => rustfmt-core/tests}/target/macros.rs (100%) rename {tests => rustfmt-core/tests}/target/markdown-comment-with-options.rs (100%) rename {tests => rustfmt-core/tests}/target/markdown-comment.rs (100%) rename {tests => rustfmt-core/tests}/target/match-block-trailing-comma.rs (100%) rename {tests => rustfmt-core/tests}/target/match-flattening.rs (100%) rename {tests => rustfmt-core/tests}/target/match-nowrap-trailing-comma.rs (100%) rename {tests => rustfmt-core/tests}/target/match-nowrap.rs (100%) rename {tests => rustfmt-core/tests}/target/match.rs (100%) rename {tests => rustfmt-core/tests}/target/match_overflow_expr.rs (100%) rename {tests => rustfmt-core/tests}/target/max-line-length-in-chars.rs (100%) rename {tests => rustfmt-core/tests}/target/merge_imports.rs (100%) rename {tests => rustfmt-core/tests}/target/mod-1.rs (100%) rename {tests => rustfmt-core/tests}/target/mod-2.rs (100%) rename {tests => rustfmt-core/tests}/target/mod_skip_child.rs (100%) rename {tests => rustfmt-core/tests}/target/multi-file.rs (100%) rename {tests => rustfmt-core/tests}/target/multiline_string_in_macro_def.rs (100%) rename {tests => rustfmt-core/tests}/target/multiple.rs (100%) rename {tests => rustfmt-core/tests}/target/nested-if-else.rs (100%) rename {tests => rustfmt-core/tests}/target/nested-visual-block.rs (100%) rename {tests => rustfmt-core/tests}/target/nested_skipped/mod.rs (100%) rename {tests => rustfmt-core/tests}/target/nestedmod/mod.rs (100%) rename {tests => rustfmt-core/tests}/target/nestedmod/mod2a.rs (100%) rename {tests => rustfmt-core/tests}/target/nestedmod/mod2b.rs (100%) rename {tests => rustfmt-core/tests}/target/nestedmod/mod2c.rs (100%) rename {tests => rustfmt-core/tests}/target/nestedmod/mymod1/mod3a.rs (100%) rename {tests => rustfmt-core/tests}/target/nestedmod/submod2/a.rs (100%) rename {tests => rustfmt-core/tests}/target/nestedmod/submod2/mod.rs (100%) rename {tests => rustfmt-core/tests}/target/no_arg_with_commnet.rs (100%) rename {tests => rustfmt-core/tests}/target/no_new_line_beginning.rs (100%) rename {tests => rustfmt-core/tests}/target/normalize_doc_attributes_should_not_imply_format_doc_comments.rs (100%) rename {tests => rustfmt-core/tests}/target/normalize_multiline_doc_attribute.rs (100%) rename {tests => rustfmt-core/tests}/target/obsolete_in_place.rs (100%) rename {tests => rustfmt-core/tests}/target/one_line_if_v2.rs (100%) rename {tests => rustfmt-core/tests}/target/other.rs (100%) rename {tests => rustfmt-core/tests}/target/paren.rs (100%) rename {tests => rustfmt-core/tests}/target/path_clarity/foo.rs (100%) rename {tests => rustfmt-core/tests}/target/path_clarity/foo/bar.rs (100%) rename {tests => rustfmt-core/tests}/target/paths.rs (100%) rename {tests => rustfmt-core/tests}/target/pattern-condense-wildcards.rs (100%) rename {tests => rustfmt-core/tests}/target/pattern.rs (100%) rename {tests => rustfmt-core/tests}/target/preserves_carriage_return_for_unix.rs (100%) rename {tests => rustfmt-core/tests}/target/preserves_carriage_return_for_windows.rs (100%) rename {tests => rustfmt-core/tests}/target/pub-restricted.rs (100%) rename {tests => rustfmt-core/tests}/target/raw_identifiers.rs (100%) rename {tests => rustfmt-core/tests}/target/remove_blank_lines.rs (100%) rename {tests => rustfmt-core/tests}/target/reorder-impl-items.rs (100%) rename {tests => rustfmt-core/tests}/target/should_not_format_string_when_format_strings_is_not_set.rs (100%) rename {tests => rustfmt-core/tests}/target/single-line-if-else.rs (100%) rename {tests => rustfmt-core/tests}/target/single-line-macro/v2.rs (100%) rename {tests => rustfmt-core/tests}/target/skip.rs (100%) rename {tests => rustfmt-core/tests}/target/skip_mod.rs (100%) rename {tests => rustfmt-core/tests}/target/soft-wrapping.rs (100%) rename {tests => rustfmt-core/tests}/target/space-not-before-newline.rs (100%) rename {tests => rustfmt-core/tests}/target/spaces-around-ranges.rs (100%) rename {tests => rustfmt-core/tests}/target/static.rs (100%) rename {tests => rustfmt-core/tests}/target/string-lit-2.rs (100%) rename {tests => rustfmt-core/tests}/target/string-lit-custom.rs (100%) rename {tests => rustfmt-core/tests}/target/string-lit.rs (100%) rename {tests => rustfmt-core/tests}/target/string_punctuation.rs (100%) rename {tests => rustfmt-core/tests}/target/struct-field-attributes.rs (100%) rename {tests => rustfmt-core/tests}/target/struct_lits.rs (100%) rename {tests => rustfmt-core/tests}/target/struct_lits_multiline.rs (100%) rename {tests => rustfmt-core/tests}/target/struct_lits_visual.rs (100%) rename {tests => rustfmt-core/tests}/target/struct_lits_visual_multiline.rs (100%) rename {tests => rustfmt-core/tests}/target/struct_tuple_visual.rs (100%) rename {tests => rustfmt-core/tests}/target/structs.rs (100%) rename {tests => rustfmt-core/tests}/target/trailing-comma-never.rs (100%) rename {tests => rustfmt-core/tests}/target/trailing_commas.rs (100%) rename {tests => rustfmt-core/tests}/target/trailing_comments/hard_tabs.rs (100%) rename {tests => rustfmt-core/tests}/target/trailing_comments/soft_tabs.rs (100%) rename {tests => rustfmt-core/tests}/target/trait.rs (100%) rename {tests => rustfmt-core/tests}/target/trait_2015_edition.rs (100%) rename {tests => rustfmt-core/tests}/target/try-conversion.rs (100%) rename {tests => rustfmt-core/tests}/target/tuple.rs (100%) rename {tests => rustfmt-core/tests}/target/type-ascription.rs (100%) rename {tests => rustfmt-core/tests}/target/type.rs (100%) rename {tests => rustfmt-core/tests}/target/type_alias.rs (100%) rename {tests => rustfmt-core/tests}/target/unicode.rs (100%) rename {tests => rustfmt-core/tests}/target/unindent_if_else_cond_comment.rs (100%) rename {tests => rustfmt-core/tests}/target/unions.rs (100%) rename {tests => rustfmt-core/tests}/target/visibility.rs (100%) rename {tests => rustfmt-core/tests}/target/visual-fn-type.rs (100%) rename {tests => rustfmt-core/tests}/target/where-clause-rfc.rs (100%) rename {tests => rustfmt-core/tests}/target/where-clause.rs (100%) rename {tests => rustfmt-core/tests}/target/width-heuristics.rs (100%) rename {tests => rustfmt-core/tests}/target/wrap_comments_should_not_imply_format_doc_comments.rs (100%) rename {tests => rustfmt-core/tests}/writemode/source/fn-single-line.rs (100%) rename {tests => rustfmt-core/tests}/writemode/source/json.rs (100%) rename {tests => rustfmt-core/tests}/writemode/source/modified.rs (100%) rename {tests => rustfmt-core/tests}/writemode/source/stdin.rs (100%) rename {tests => rustfmt-core/tests}/writemode/target/checkstyle.xml (100%) rename {tests => rustfmt-core/tests}/writemode/target/modified.txt (100%) rename {tests => rustfmt-core/tests}/writemode/target/output.json (100%) rename {tests => rustfmt-core/tests}/writemode/target/stdin.json (100%) rename {tests => rustfmt-core/tests}/writemode/target/stdin.xml (100%) diff --git a/Cargo.lock b/Cargo.lock index bb765584d8f..ed51533fc94 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -119,9 +119,6 @@ dependencies = [ name = "bytecount" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "packed_simd 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "byteorder" @@ -178,31 +175,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "crossbeam-channel" -version = "0.3.9" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "crossbeam-deque" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "crossbeam-epoch" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -223,9 +220,19 @@ dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "crossbeam-utils" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "diff" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -313,7 +320,7 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -324,7 +331,7 @@ dependencies = [ [[package]] name = "globset" version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/topecongiro/ripgrep?branch=update-crossbeam#ecf89122fc3d1af5c9b20a6d44eb5e3998ed7c39" dependencies = [ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", "bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -341,6 +348,14 @@ dependencies = [ "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "hermit-abi" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "humantime" version = "1.3.0" @@ -352,10 +367,10 @@ dependencies = [ [[package]] name = "ignore" version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/topecongiro/ripgrep?branch=update-crossbeam#ecf89122fc3d1af5c9b20a6d44eb5e3998ed7c39" dependencies = [ - "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "globset 0.4.4 (git+https://github.com/topecongiro/ripgrep?branch=update-crossbeam)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -392,7 +407,7 @@ name = "jobserver" version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -418,7 +433,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "lock_api" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -432,6 +447,11 @@ dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "maybe-uninit" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "memchr" version = "2.2.1" @@ -439,7 +459,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "memoffset" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -452,26 +472,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "num_cpus" -version = "1.10.1" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "packed_simd" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "parking_lot" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lock_api 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -486,7 +499,7 @@ dependencies = [ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -603,7 +616,7 @@ version = "610.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rustc-ap-rustc_data_structures 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -630,7 +643,7 @@ dependencies = [ "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-rayon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-rayon-core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -656,7 +669,7 @@ version = "610.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rustc-ap-serialize 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -698,7 +711,7 @@ version = "610.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -717,7 +730,7 @@ dependencies = [ "rustc-ap-serialize 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-ap-syntax_pos 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -753,7 +766,7 @@ name = "rustc-rayon" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-rayon-core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -763,11 +776,11 @@ name = "rustc-rayon-core" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -796,16 +809,34 @@ dependencies = [ name = "rustfmt-nightly" version = "1.4.10" dependencies = [ - "annotate-snippets 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", - "bytecount 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "cargo_metadata 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", - "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", - "ignore 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-workspace-hack 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustfmt_core 0.1.0", + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", + "structopt 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "term 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rustfmt_core" +version = "0.1.0" +dependencies = [ + "annotate-snippets 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", + "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", + "bytecount 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "diff 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ignore 0.4.10 (git+https://github.com/topecongiro/ripgrep?branch=update-crossbeam)", "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -814,11 +845,9 @@ dependencies = [ "rustc-ap-rustc_target 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-ap-syntax 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-ap-syntax_pos 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-workspace-hack 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustfmt-config_proc_macro 0.2.0", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", - "structopt 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "term 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -894,8 +923,11 @@ dependencies = [ [[package]] name = "smallvec" -version = "0.6.10" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "stable_deref_trait" @@ -1128,12 +1160,13 @@ dependencies = [ "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" "checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120" -"checksum crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa" -"checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71" -"checksum crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9" +"checksum crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c" +"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca" +"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac" "checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" "checksum crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c" -"checksum diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "3c2b69f912779fbb121ceb775d74d51e915af17aaebc38d28a592843a2dd0a3a" +"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" +"checksum diff 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" "checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" "checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" "checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" @@ -1144,11 +1177,12 @@ dependencies = [ "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" "checksum getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)" = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -"checksum getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571" -"checksum globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "925aa2cac82d8834e2b2a4415b6f6879757fb5c0928fc445ae76461a12eed8f2" +"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" +"checksum globset 0.4.4 (git+https://github.com/topecongiro/ripgrep?branch=update-crossbeam)" = "" "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" +"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" "checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -"checksum ignore 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0ec16832258409d571aaef8273f3c3cc5b060d784e159d1a0f3b0017308f84a7" +"checksum ignore 0.4.10 (git+https://github.com/topecongiro/ripgrep?branch=update-crossbeam)" = "" "checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2" "checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" "checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" @@ -1156,13 +1190,13 @@ dependencies = [ "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" "checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8" -"checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc" +"checksum lock_api 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e57b3997725d2b60dbec1297f6c2e2957cc383db1cebd6be812163f969c7d586" "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" +"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" "checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" -"checksum memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f" +"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" "checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" -"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273" -"checksum packed_simd 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a85ea9fc0d4ac0deb6fe7911d38786b32fc11119afd9e9d38b84ff691ce64220" +"checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72" "checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" "checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" "checksum proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aeccfe4d5d8ea175d5f0e4a2ad0637e0f4121d63bd99d356fb1f39ab2e7c6097" @@ -1204,7 +1238,7 @@ dependencies = [ "checksum serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "9796c9b7ba2ffe7a9ce53c2287dfc48080f4b2b362fcc245a259b3a7201119dd" "checksum serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "4b133a43a1ecd55d4086bd5b4dc6c1751c68b1bfbeba7a5040442022c7e7c02e" "checksum serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "2f72eb2a68a7dc3f9a691bfda9305a1c017a6215e5a4545c258500d2099a37c2" -"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" +"checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" "checksum structopt 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d4f66a4c0ddf7aee4677995697366de0749b0139057342eccbb609b12d0affc" diff --git a/Cargo.toml b/Cargo.toml index a914f956cfe..2c2f84a3493 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,52 +31,27 @@ path = "src/git-rustfmt/main.rs" default = ["cargo-fmt", "rustfmt-format-diff"] cargo-fmt = [] rustfmt-format-diff = [] -generic-simd = ["bytecount/generic-simd"] [dependencies] -itertools = "0.8" -toml = "0.5" -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" -unicode-segmentation = "1.0.0" -regex = "1.0" -term = "0.6" -diff = "0.1" -log = "0.4" +ansi_term = "0.12" +anyhow = "1.0" +cargo_metadata = "0.9" env_logger = "0.7" getopts = "0.2" -cargo_metadata = "0.9" -bytecount = "0.6" -unicode-width = "0.1.5" -unicode_categories = "0.1.1" -dirs = "2.0.1" -ignore = "0.4.6" -annotate-snippets = { version = "0.6", features = ["ansi_term"] } +log = "0.4" +regex = "1.0" +serde = "1.0" +serde_json = "1.0" structopt = "0.3" -rustfmt-config_proc_macro = { version = "0.2", path = "config_proc_macro" } -lazy_static = "1.0.0" -ansi_term = "0.12" -anyhow = "1.0" +term = "0.6" thiserror = "1.0" +rustfmt_core = { path = "rustfmt-core" } + +[dev-dependencies] +lazy_static = "1.0" + # A noop dependency that changes in the Rust repository, it's a bit of a hack. # See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust` # for more information. rustc-workspace-hack = "1.0.0" - -[dependencies.rustc_target] -package = "rustc-ap-rustc_target" -version = "610.0.0" - -[dependencies.syntax] -package = "rustc-ap-syntax" -version = "610.0.0" - -[dependencies.syntax_pos] -package = "rustc-ap-syntax_pos" -version = "610.0.0" - -[dependencies.rustc_data_structures] -package = "rustc-ap-rustc_data_structures" -version = "610.0.0" - diff --git a/rustfmt-core/.gitignore b/rustfmt-core/.gitignore new file mode 100644 index 00000000000..96ef6c0b944 --- /dev/null +++ b/rustfmt-core/.gitignore @@ -0,0 +1,2 @@ +/target +Cargo.lock diff --git a/rustfmt-core/Cargo.toml b/rustfmt-core/Cargo.toml new file mode 100644 index 00000000000..c20635fddf9 --- /dev/null +++ b/rustfmt-core/Cargo.toml @@ -0,0 +1,49 @@ +[package] +name = "rustfmt_core" +version = "0.1.0" +authors = ["topecongiro "] +edition = "2018" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +annotate-snippets = { version = "0.6", features = ["ansi_term"] } +ansi_term = "0.12" +anyhow = "1.0" +bytecount = "0.6" +diff = "0.1" +dirs = "2.0.1" +ignore = { git = "https://github.com/topecongiro/ripgrep", branch = "update-crossbeam" } +itertools = "0.8" +lazy_static = "1.0.0" +log = "0.4" +regex = "1.0" +rustfmt-config_proc_macro = { version = "0.2", path = "../config_proc_macro" } +serde = { version = "1.0", features = ["derive"] } +serde_json = "1.0" +term = "0.6" +thiserror = "1.0" +toml = "0.5" +unicode_categories = "0.1.1" +unicode-segmentation = "1.0.0" +unicode-width = "0.1.5" + +[dev-dependencies] +env_logger = "0.7" + +[dependencies.rustc_target] +package = "rustc-ap-rustc_target" +version = "610.0.0" + +[dependencies.syntax] +package = "rustc-ap-syntax" +version = "610.0.0" + +[dependencies.syntax_pos] +package = "rustc-ap-syntax_pos" +version = "610.0.0" + +[dependencies.rustc_data_structures] +package = "rustc-ap-rustc_data_structures" +version = "610.0.0" + diff --git a/src/attr.rs b/rustfmt-core/src/attr.rs similarity index 100% rename from src/attr.rs rename to rustfmt-core/src/attr.rs diff --git a/src/attr/doc_comment.rs b/rustfmt-core/src/attr/doc_comment.rs similarity index 100% rename from src/attr/doc_comment.rs rename to rustfmt-core/src/attr/doc_comment.rs diff --git a/src/chains.rs b/rustfmt-core/src/chains.rs similarity index 100% rename from src/chains.rs rename to rustfmt-core/src/chains.rs diff --git a/src/closures.rs b/rustfmt-core/src/closures.rs similarity index 100% rename from src/closures.rs rename to rustfmt-core/src/closures.rs diff --git a/src/comment.rs b/rustfmt-core/src/comment.rs similarity index 100% rename from src/comment.rs rename to rustfmt-core/src/comment.rs diff --git a/src/config/config_type.rs b/rustfmt-core/src/config/config_type.rs similarity index 100% rename from src/config/config_type.rs rename to rustfmt-core/src/config/config_type.rs diff --git a/src/config/file_lines.rs b/rustfmt-core/src/config/file_lines.rs similarity index 100% rename from src/config/file_lines.rs rename to rustfmt-core/src/config/file_lines.rs diff --git a/src/config/license.rs b/rustfmt-core/src/config/license.rs similarity index 100% rename from src/config/license.rs rename to rustfmt-core/src/config/license.rs diff --git a/src/config/lists.rs b/rustfmt-core/src/config/lists.rs similarity index 100% rename from src/config/lists.rs rename to rustfmt-core/src/config/lists.rs diff --git a/src/config/mod.rs b/rustfmt-core/src/config/mod.rs similarity index 100% rename from src/config/mod.rs rename to rustfmt-core/src/config/mod.rs diff --git a/src/config/options.rs b/rustfmt-core/src/config/options.rs similarity index 100% rename from src/config/options.rs rename to rustfmt-core/src/config/options.rs diff --git a/src/coverage.rs b/rustfmt-core/src/coverage.rs similarity index 100% rename from src/coverage.rs rename to rustfmt-core/src/coverage.rs diff --git a/src/emitter.rs b/rustfmt-core/src/emitter.rs similarity index 100% rename from src/emitter.rs rename to rustfmt-core/src/emitter.rs diff --git a/src/emitter/checkstyle.rs b/rustfmt-core/src/emitter/checkstyle.rs similarity index 100% rename from src/emitter/checkstyle.rs rename to rustfmt-core/src/emitter/checkstyle.rs diff --git a/src/emitter/checkstyle/xml.rs b/rustfmt-core/src/emitter/checkstyle/xml.rs similarity index 100% rename from src/emitter/checkstyle/xml.rs rename to rustfmt-core/src/emitter/checkstyle/xml.rs diff --git a/src/emitter/diff.rs b/rustfmt-core/src/emitter/diff.rs similarity index 100% rename from src/emitter/diff.rs rename to rustfmt-core/src/emitter/diff.rs diff --git a/src/emitter/files.rs b/rustfmt-core/src/emitter/files.rs similarity index 100% rename from src/emitter/files.rs rename to rustfmt-core/src/emitter/files.rs diff --git a/src/emitter/json.rs b/rustfmt-core/src/emitter/json.rs similarity index 100% rename from src/emitter/json.rs rename to rustfmt-core/src/emitter/json.rs diff --git a/src/emitter/modified_lines.rs b/rustfmt-core/src/emitter/modified_lines.rs similarity index 100% rename from src/emitter/modified_lines.rs rename to rustfmt-core/src/emitter/modified_lines.rs diff --git a/src/emitter/stdout.rs b/rustfmt-core/src/emitter/stdout.rs similarity index 100% rename from src/emitter/stdout.rs rename to rustfmt-core/src/emitter/stdout.rs diff --git a/src/expr.rs b/rustfmt-core/src/expr.rs similarity index 100% rename from src/expr.rs rename to rustfmt-core/src/expr.rs diff --git a/src/format_report_formatter.rs b/rustfmt-core/src/format_report_formatter.rs similarity index 100% rename from src/format_report_formatter.rs rename to rustfmt-core/src/format_report_formatter.rs diff --git a/src/formatting.rs b/rustfmt-core/src/formatting.rs similarity index 100% rename from src/formatting.rs rename to rustfmt-core/src/formatting.rs diff --git a/src/formatting/newline_style.rs b/rustfmt-core/src/formatting/newline_style.rs similarity index 100% rename from src/formatting/newline_style.rs rename to rustfmt-core/src/formatting/newline_style.rs diff --git a/src/ignore_path.rs b/rustfmt-core/src/ignore_path.rs similarity index 100% rename from src/ignore_path.rs rename to rustfmt-core/src/ignore_path.rs diff --git a/src/imports.rs b/rustfmt-core/src/imports.rs similarity index 100% rename from src/imports.rs rename to rustfmt-core/src/imports.rs diff --git a/src/issues.rs b/rustfmt-core/src/issues.rs similarity index 100% rename from src/issues.rs rename to rustfmt-core/src/issues.rs diff --git a/src/items.rs b/rustfmt-core/src/items.rs similarity index 100% rename from src/items.rs rename to rustfmt-core/src/items.rs diff --git a/src/lib.rs b/rustfmt-core/src/lib.rs similarity index 100% rename from src/lib.rs rename to rustfmt-core/src/lib.rs diff --git a/src/lists.rs b/rustfmt-core/src/lists.rs similarity index 100% rename from src/lists.rs rename to rustfmt-core/src/lists.rs diff --git a/src/macros.rs b/rustfmt-core/src/macros.rs similarity index 100% rename from src/macros.rs rename to rustfmt-core/src/macros.rs diff --git a/src/matches.rs b/rustfmt-core/src/matches.rs similarity index 100% rename from src/matches.rs rename to rustfmt-core/src/matches.rs diff --git a/src/missed_spans.rs b/rustfmt-core/src/missed_spans.rs similarity index 100% rename from src/missed_spans.rs rename to rustfmt-core/src/missed_spans.rs diff --git a/src/modules.rs b/rustfmt-core/src/modules.rs similarity index 100% rename from src/modules.rs rename to rustfmt-core/src/modules.rs diff --git a/src/modules/visitor.rs b/rustfmt-core/src/modules/visitor.rs similarity index 100% rename from src/modules/visitor.rs rename to rustfmt-core/src/modules/visitor.rs diff --git a/src/overflow.rs b/rustfmt-core/src/overflow.rs similarity index 100% rename from src/overflow.rs rename to rustfmt-core/src/overflow.rs diff --git a/src/pairs.rs b/rustfmt-core/src/pairs.rs similarity index 100% rename from src/pairs.rs rename to rustfmt-core/src/pairs.rs diff --git a/src/patterns.rs b/rustfmt-core/src/patterns.rs similarity index 100% rename from src/patterns.rs rename to rustfmt-core/src/patterns.rs diff --git a/src/release_channel.rs b/rustfmt-core/src/release_channel.rs similarity index 100% rename from src/release_channel.rs rename to rustfmt-core/src/release_channel.rs diff --git a/src/reorder.rs b/rustfmt-core/src/reorder.rs similarity index 100% rename from src/reorder.rs rename to rustfmt-core/src/reorder.rs diff --git a/src/rewrite.rs b/rustfmt-core/src/rewrite.rs similarity index 100% rename from src/rewrite.rs rename to rustfmt-core/src/rewrite.rs diff --git a/src/rustfmt_diff.rs b/rustfmt-core/src/rustfmt_diff.rs similarity index 100% rename from src/rustfmt_diff.rs rename to rustfmt-core/src/rustfmt_diff.rs diff --git a/src/shape.rs b/rustfmt-core/src/shape.rs similarity index 100% rename from src/shape.rs rename to rustfmt-core/src/shape.rs diff --git a/src/skip.rs b/rustfmt-core/src/skip.rs similarity index 100% rename from src/skip.rs rename to rustfmt-core/src/skip.rs diff --git a/src/source_file.rs b/rustfmt-core/src/source_file.rs similarity index 100% rename from src/source_file.rs rename to rustfmt-core/src/source_file.rs diff --git a/src/source_map.rs b/rustfmt-core/src/source_map.rs similarity index 100% rename from src/source_map.rs rename to rustfmt-core/src/source_map.rs diff --git a/src/spanned.rs b/rustfmt-core/src/spanned.rs similarity index 100% rename from src/spanned.rs rename to rustfmt-core/src/spanned.rs diff --git a/src/stmt.rs b/rustfmt-core/src/stmt.rs similarity index 100% rename from src/stmt.rs rename to rustfmt-core/src/stmt.rs diff --git a/src/string.rs b/rustfmt-core/src/string.rs similarity index 100% rename from src/string.rs rename to rustfmt-core/src/string.rs diff --git a/src/syntux.rs b/rustfmt-core/src/syntux.rs similarity index 100% rename from src/syntux.rs rename to rustfmt-core/src/syntux.rs diff --git a/src/syntux/parser.rs b/rustfmt-core/src/syntux/parser.rs similarity index 100% rename from src/syntux/parser.rs rename to rustfmt-core/src/syntux/parser.rs diff --git a/src/syntux/session.rs b/rustfmt-core/src/syntux/session.rs similarity index 100% rename from src/syntux/session.rs rename to rustfmt-core/src/syntux/session.rs diff --git a/src/test/configuration_snippet.rs b/rustfmt-core/src/test/configuration_snippet.rs similarity index 99% rename from src/test/configuration_snippet.rs rename to rustfmt-core/src/test/configuration_snippet.rs index 7981004a072..28967090209 100644 --- a/src/test/configuration_snippet.rs +++ b/rustfmt-core/src/test/configuration_snippet.rs @@ -9,7 +9,7 @@ use crate::config::{Config, EmitMode, Verbosity}; use crate::rustfmt_diff::{make_diff, Mismatch}; use crate::{Input, Session}; -const CONFIGURATIONS_FILE_NAME: &str = "Configurations.md"; +const CONFIGURATIONS_FILE_NAME: &str = "../Configurations.md"; // This enum is used to represent one of three text features in Configurations.md: a block of code // with its starting line number, the name of a rustfmt configuration option, or the value of a diff --git a/src/test/mod.rs b/rustfmt-core/src/test/mod.rs similarity index 85% rename from src/test/mod.rs rename to rustfmt-core/src/test/mod.rs index ab156e39175..e633e652cfd 100644 --- a/src/test/mod.rs +++ b/rustfmt-core/src/test/mod.rs @@ -1,11 +1,9 @@ use std::collections::HashMap; -use std::env; use std::fs; -use std::io::{self, BufRead, BufReader, Read, Write}; +use std::io::{self, BufRead, BufReader, Read}; use std::iter::Peekable; use std::mem; use std::path::{Path, PathBuf}; -use std::process::{Command, Stdio}; use std::str::Chars; use std::thread; @@ -388,16 +386,9 @@ fn self_tests() { return; } let mut files = get_test_files(Path::new("tests"), false); - let bin_directories = vec!["cargo-fmt", "git-rustfmt", "bin", "format-diff"]; - for dir in bin_directories { - let mut path = PathBuf::from("src"); - path.push(dir); - path.push("main.rs"); - files.push(path); - } files.push(PathBuf::from("src/lib.rs")); - let (reports, count, fails) = check_files(files, &Some(PathBuf::from("rustfmt.toml"))); + let (reports, count, fails) = check_files(files, &Some(PathBuf::from("../rustfmt.toml"))); let mut warnings = 0; // Display results. @@ -500,35 +491,6 @@ fn stdin_works_with_checkstyle() { ); } -#[test] -fn stdin_disable_all_formatting_test() { - init_log(); - match option_env!("CFG_RELEASE_CHANNEL") { - None | Some("nightly") => {} - // These tests require nightly. - _ => return, - } - let input = "fn main() { println!(\"This should not be formatted.\"); }"; - let mut child = Command::new(rustfmt()) - .stdin(Stdio::piped()) - .stdout(Stdio::piped()) - .arg("--config-path=./tests/config/disable_all_formatting.toml") - .spawn() - .expect("failed to execute child"); - - { - let stdin = child.stdin.as_mut().expect("failed to get stdin"); - stdin - .write_all(input.as_bytes()) - .expect("failed to write stdin"); - } - - let output = child.wait_with_output().expect("failed to wait on child"); - assert!(output.status.success()); - assert!(output.stderr.is_empty()); - assert_eq!(input, String::from_utf8(output.stdout).unwrap()); -} - #[test] fn format_lines_errors_are_reported() { init_log(); @@ -875,118 +837,3 @@ fn string_eq_ignore_newline_repr_test() { assert!(!string_eq_ignore_newline_repr("a\r\nbcd", "a\nbcdefghijk")); } -struct TempFile { - path: PathBuf, -} - -fn make_temp_file(file_name: &'static str) -> TempFile { - use std::env::var; - use std::fs::File; - - // Used in the Rust build system. - let target_dir = var("RUSTFMT_TEST_DIR").unwrap_or_else(|_| ".".to_owned()); - let path = Path::new(&target_dir).join(file_name); - - let mut file = File::create(&path).expect("couldn't create temp file"); - let content = b"fn main() {}\n"; - file.write_all(content).expect("couldn't write temp file"); - TempFile { path } -} - -impl Drop for TempFile { - fn drop(&mut self) { - use std::fs::remove_file; - remove_file(&self.path).expect("couldn't delete temp file"); - } -} - -fn rustfmt() -> &'static Path { - lazy_static! { - static ref RUSTFMT_PATH: PathBuf = { - let mut me = env::current_exe().expect("failed to get current executable"); - // Chop of the test name. - me.pop(); - // Chop off `deps`. - me.pop(); - - // If we run `cargo test --release`, we might only have a release build. - if cfg!(release) { - // `../release/` - me.pop(); - me.push("release"); - } - me.push("rustfmt"); - assert!( - me.is_file() || me.with_extension("exe").is_file(), - if cfg!(release) { - "no rustfmt bin, try running `cargo build --release` before testing" - } else { - "no rustfmt bin, try running `cargo build` before testing" - } - ); - me - }; - } - &RUSTFMT_PATH -} - -#[test] -fn verify_check_works() { - init_log(); - let temp_file = make_temp_file("temp_check.rs"); - - Command::new(rustfmt()) - .arg("--check") - .arg(&temp_file.path) - .status() - .expect("run with check option failed"); -} - -#[test] -fn verify_check_works_with_stdin() { - init_log(); - - let mut child = Command::new(rustfmt()) - .arg("--check") - .stdin(Stdio::piped()) - .stderr(Stdio::piped()) - .spawn() - .expect("run with check option failed"); - - { - let stdin = child.stdin.as_mut().expect("Failed to open stdin"); - stdin - .write_all(b"fn main() {}\n") - .expect("Failed to write to rustfmt --check"); - } - let output = child - .wait_with_output() - .expect("Failed to wait on rustfmt child"); - assert!(output.status.success()); -} - -#[test] -fn verify_check_l_works_with_stdin() { - init_log(); - - let mut child = Command::new(rustfmt()) - .arg("--check") - .arg("-l") - .stdin(Stdio::piped()) - .stdout(Stdio::piped()) - .stderr(Stdio::piped()) - .spawn() - .expect("run with check option failed"); - - { - let stdin = child.stdin.as_mut().expect("Failed to open stdin"); - stdin - .write_all(b"fn main()\n{}\n") - .expect("Failed to write to rustfmt --check"); - } - let output = child - .wait_with_output() - .expect("Failed to wait on rustfmt child"); - assert!(output.status.success()); - assert_eq!(std::str::from_utf8(&output.stdout).unwrap(), "stdin\n"); -} diff --git a/src/types.rs b/rustfmt-core/src/types.rs similarity index 100% rename from src/types.rs rename to rustfmt-core/src/types.rs diff --git a/src/utils.rs b/rustfmt-core/src/utils.rs similarity index 100% rename from src/utils.rs rename to rustfmt-core/src/utils.rs diff --git a/src/vertical.rs b/rustfmt-core/src/vertical.rs similarity index 100% rename from src/vertical.rs rename to rustfmt-core/src/vertical.rs diff --git a/src/visitor.rs b/rustfmt-core/src/visitor.rs similarity index 100% rename from src/visitor.rs rename to rustfmt-core/src/visitor.rs diff --git a/tests/config/issue-1111.toml b/rustfmt-core/tests/config/issue-1111.toml similarity index 100% rename from tests/config/issue-1111.toml rename to rustfmt-core/tests/config/issue-1111.toml diff --git a/tests/config/issue-2641.toml b/rustfmt-core/tests/config/issue-2641.toml similarity index 100% rename from tests/config/issue-2641.toml rename to rustfmt-core/tests/config/issue-2641.toml diff --git a/tests/config/issue-3779.toml b/rustfmt-core/tests/config/issue-3779.toml similarity index 100% rename from tests/config/issue-3779.toml rename to rustfmt-core/tests/config/issue-3779.toml diff --git a/tests/config/issue-3802.toml b/rustfmt-core/tests/config/issue-3802.toml similarity index 100% rename from tests/config/issue-3802.toml rename to rustfmt-core/tests/config/issue-3802.toml diff --git a/tests/config/issue-3933.toml b/rustfmt-core/tests/config/issue-3933.toml similarity index 100% rename from tests/config/issue-3933.toml rename to rustfmt-core/tests/config/issue-3933.toml diff --git a/tests/config/issue-3956.toml b/rustfmt-core/tests/config/issue-3956.toml similarity index 100% rename from tests/config/issue-3956.toml rename to rustfmt-core/tests/config/issue-3956.toml diff --git a/tests/config/skip_children.toml b/rustfmt-core/tests/config/skip_children.toml similarity index 100% rename from tests/config/skip_children.toml rename to rustfmt-core/tests/config/skip_children.toml diff --git a/tests/config/small_tabs.toml b/rustfmt-core/tests/config/small_tabs.toml similarity index 100% rename from tests/config/small_tabs.toml rename to rustfmt-core/tests/config/small_tabs.toml diff --git a/tests/coverage/source/comments.rs b/rustfmt-core/tests/coverage/source/comments.rs similarity index 100% rename from tests/coverage/source/comments.rs rename to rustfmt-core/tests/coverage/source/comments.rs diff --git a/tests/coverage/target/comments.rs b/rustfmt-core/tests/coverage/target/comments.rs similarity index 100% rename from tests/coverage/target/comments.rs rename to rustfmt-core/tests/coverage/target/comments.rs diff --git a/tests/license-template/lt.txt b/rustfmt-core/tests/license-template/lt.txt similarity index 100% rename from tests/license-template/lt.txt rename to rustfmt-core/tests/license-template/lt.txt diff --git a/tests/source/alignment_2633/block_style.rs b/rustfmt-core/tests/source/alignment_2633/block_style.rs similarity index 100% rename from tests/source/alignment_2633/block_style.rs rename to rustfmt-core/tests/source/alignment_2633/block_style.rs diff --git a/tests/source/alignment_2633/visual_style.rs b/rustfmt-core/tests/source/alignment_2633/visual_style.rs similarity index 100% rename from tests/source/alignment_2633/visual_style.rs rename to rustfmt-core/tests/source/alignment_2633/visual_style.rs diff --git a/tests/source/array_comment.rs b/rustfmt-core/tests/source/array_comment.rs similarity index 100% rename from tests/source/array_comment.rs rename to rustfmt-core/tests/source/array_comment.rs diff --git a/tests/source/assignment.rs b/rustfmt-core/tests/source/assignment.rs similarity index 100% rename from tests/source/assignment.rs rename to rustfmt-core/tests/source/assignment.rs diff --git a/tests/source/associated-types-bounds-wrapping.rs b/rustfmt-core/tests/source/associated-types-bounds-wrapping.rs similarity index 100% rename from tests/source/associated-types-bounds-wrapping.rs rename to rustfmt-core/tests/source/associated-types-bounds-wrapping.rs diff --git a/tests/source/associated_type_bounds.rs b/rustfmt-core/tests/source/associated_type_bounds.rs similarity index 100% rename from tests/source/associated_type_bounds.rs rename to rustfmt-core/tests/source/associated_type_bounds.rs diff --git a/tests/source/async_block.rs b/rustfmt-core/tests/source/async_block.rs similarity index 100% rename from tests/source/async_block.rs rename to rustfmt-core/tests/source/async_block.rs diff --git a/tests/source/async_fn.rs b/rustfmt-core/tests/source/async_fn.rs similarity index 100% rename from tests/source/async_fn.rs rename to rustfmt-core/tests/source/async_fn.rs diff --git a/tests/source/attrib.rs b/rustfmt-core/tests/source/attrib.rs similarity index 100% rename from tests/source/attrib.rs rename to rustfmt-core/tests/source/attrib.rs diff --git a/tests/source/big-impl-block.rs b/rustfmt-core/tests/source/big-impl-block.rs similarity index 100% rename from tests/source/big-impl-block.rs rename to rustfmt-core/tests/source/big-impl-block.rs diff --git a/tests/source/big-impl-visual.rs b/rustfmt-core/tests/source/big-impl-visual.rs similarity index 100% rename from tests/source/big-impl-visual.rs rename to rustfmt-core/tests/source/big-impl-visual.rs diff --git a/tests/source/binary-expr.rs b/rustfmt-core/tests/source/binary-expr.rs similarity index 100% rename from tests/source/binary-expr.rs rename to rustfmt-core/tests/source/binary-expr.rs diff --git a/tests/source/break-and-continue.rs b/rustfmt-core/tests/source/break-and-continue.rs similarity index 100% rename from tests/source/break-and-continue.rs rename to rustfmt-core/tests/source/break-and-continue.rs diff --git a/tests/source/catch.rs b/rustfmt-core/tests/source/catch.rs similarity index 100% rename from tests/source/catch.rs rename to rustfmt-core/tests/source/catch.rs diff --git a/tests/source/cfg_if/detect/arch/aarch64.rs b/rustfmt-core/tests/source/cfg_if/detect/arch/aarch64.rs similarity index 100% rename from tests/source/cfg_if/detect/arch/aarch64.rs rename to rustfmt-core/tests/source/cfg_if/detect/arch/aarch64.rs diff --git a/tests/source/cfg_if/detect/arch/arm.rs b/rustfmt-core/tests/source/cfg_if/detect/arch/arm.rs similarity index 100% rename from tests/source/cfg_if/detect/arch/arm.rs rename to rustfmt-core/tests/source/cfg_if/detect/arch/arm.rs diff --git a/tests/source/cfg_if/detect/arch/mips.rs b/rustfmt-core/tests/source/cfg_if/detect/arch/mips.rs similarity index 100% rename from tests/source/cfg_if/detect/arch/mips.rs rename to rustfmt-core/tests/source/cfg_if/detect/arch/mips.rs diff --git a/tests/source/cfg_if/detect/arch/mips64.rs b/rustfmt-core/tests/source/cfg_if/detect/arch/mips64.rs similarity index 100% rename from tests/source/cfg_if/detect/arch/mips64.rs rename to rustfmt-core/tests/source/cfg_if/detect/arch/mips64.rs diff --git a/tests/source/cfg_if/detect/arch/powerpc.rs b/rustfmt-core/tests/source/cfg_if/detect/arch/powerpc.rs similarity index 100% rename from tests/source/cfg_if/detect/arch/powerpc.rs rename to rustfmt-core/tests/source/cfg_if/detect/arch/powerpc.rs diff --git a/tests/source/cfg_if/detect/arch/powerpc64.rs b/rustfmt-core/tests/source/cfg_if/detect/arch/powerpc64.rs similarity index 100% rename from tests/source/cfg_if/detect/arch/powerpc64.rs rename to rustfmt-core/tests/source/cfg_if/detect/arch/powerpc64.rs diff --git a/tests/source/cfg_if/detect/arch/x86.rs b/rustfmt-core/tests/source/cfg_if/detect/arch/x86.rs similarity index 100% rename from tests/source/cfg_if/detect/arch/x86.rs rename to rustfmt-core/tests/source/cfg_if/detect/arch/x86.rs diff --git a/tests/source/cfg_if/detect/bit.rs b/rustfmt-core/tests/source/cfg_if/detect/bit.rs similarity index 100% rename from tests/source/cfg_if/detect/bit.rs rename to rustfmt-core/tests/source/cfg_if/detect/bit.rs diff --git a/tests/source/cfg_if/detect/cache.rs b/rustfmt-core/tests/source/cfg_if/detect/cache.rs similarity index 100% rename from tests/source/cfg_if/detect/cache.rs rename to rustfmt-core/tests/source/cfg_if/detect/cache.rs diff --git a/tests/source/cfg_if/detect/error_macros.rs b/rustfmt-core/tests/source/cfg_if/detect/error_macros.rs similarity index 100% rename from tests/source/cfg_if/detect/error_macros.rs rename to rustfmt-core/tests/source/cfg_if/detect/error_macros.rs diff --git a/tests/source/cfg_if/detect/mod.rs b/rustfmt-core/tests/source/cfg_if/detect/mod.rs similarity index 100% rename from tests/source/cfg_if/detect/mod.rs rename to rustfmt-core/tests/source/cfg_if/detect/mod.rs diff --git a/tests/source/cfg_if/detect/os/aarch64.rs b/rustfmt-core/tests/source/cfg_if/detect/os/aarch64.rs similarity index 100% rename from tests/source/cfg_if/detect/os/aarch64.rs rename to rustfmt-core/tests/source/cfg_if/detect/os/aarch64.rs diff --git a/tests/source/cfg_if/detect/os/freebsd/aarch64.rs b/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/aarch64.rs similarity index 100% rename from tests/source/cfg_if/detect/os/freebsd/aarch64.rs rename to rustfmt-core/tests/source/cfg_if/detect/os/freebsd/aarch64.rs diff --git a/tests/source/cfg_if/detect/os/freebsd/arm.rs b/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/arm.rs similarity index 100% rename from tests/source/cfg_if/detect/os/freebsd/arm.rs rename to rustfmt-core/tests/source/cfg_if/detect/os/freebsd/arm.rs diff --git a/tests/source/cfg_if/detect/os/freebsd/auxvec.rs b/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/auxvec.rs similarity index 100% rename from tests/source/cfg_if/detect/os/freebsd/auxvec.rs rename to rustfmt-core/tests/source/cfg_if/detect/os/freebsd/auxvec.rs diff --git a/tests/source/cfg_if/detect/os/freebsd/mod.rs b/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/mod.rs similarity index 100% rename from tests/source/cfg_if/detect/os/freebsd/mod.rs rename to rustfmt-core/tests/source/cfg_if/detect/os/freebsd/mod.rs diff --git a/tests/source/cfg_if/detect/os/freebsd/powerpc.rs b/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/powerpc.rs similarity index 100% rename from tests/source/cfg_if/detect/os/freebsd/powerpc.rs rename to rustfmt-core/tests/source/cfg_if/detect/os/freebsd/powerpc.rs diff --git a/tests/source/cfg_if/detect/os/linux/aarch64.rs b/rustfmt-core/tests/source/cfg_if/detect/os/linux/aarch64.rs similarity index 100% rename from tests/source/cfg_if/detect/os/linux/aarch64.rs rename to rustfmt-core/tests/source/cfg_if/detect/os/linux/aarch64.rs diff --git a/tests/source/cfg_if/detect/os/linux/arm.rs b/rustfmt-core/tests/source/cfg_if/detect/os/linux/arm.rs similarity index 100% rename from tests/source/cfg_if/detect/os/linux/arm.rs rename to rustfmt-core/tests/source/cfg_if/detect/os/linux/arm.rs diff --git a/tests/source/cfg_if/detect/os/linux/auxvec.rs b/rustfmt-core/tests/source/cfg_if/detect/os/linux/auxvec.rs similarity index 100% rename from tests/source/cfg_if/detect/os/linux/auxvec.rs rename to rustfmt-core/tests/source/cfg_if/detect/os/linux/auxvec.rs diff --git a/tests/source/cfg_if/detect/os/linux/cpuinfo.rs b/rustfmt-core/tests/source/cfg_if/detect/os/linux/cpuinfo.rs similarity index 100% rename from tests/source/cfg_if/detect/os/linux/cpuinfo.rs rename to rustfmt-core/tests/source/cfg_if/detect/os/linux/cpuinfo.rs diff --git a/tests/source/cfg_if/detect/os/linux/mips.rs b/rustfmt-core/tests/source/cfg_if/detect/os/linux/mips.rs similarity index 100% rename from tests/source/cfg_if/detect/os/linux/mips.rs rename to rustfmt-core/tests/source/cfg_if/detect/os/linux/mips.rs diff --git a/tests/source/cfg_if/detect/os/linux/mod.rs b/rustfmt-core/tests/source/cfg_if/detect/os/linux/mod.rs similarity index 100% rename from tests/source/cfg_if/detect/os/linux/mod.rs rename to rustfmt-core/tests/source/cfg_if/detect/os/linux/mod.rs diff --git a/tests/source/cfg_if/detect/os/linux/powerpc.rs b/rustfmt-core/tests/source/cfg_if/detect/os/linux/powerpc.rs similarity index 100% rename from tests/source/cfg_if/detect/os/linux/powerpc.rs rename to rustfmt-core/tests/source/cfg_if/detect/os/linux/powerpc.rs diff --git a/tests/source/cfg_if/detect/os/other.rs b/rustfmt-core/tests/source/cfg_if/detect/os/other.rs similarity index 100% rename from tests/source/cfg_if/detect/os/other.rs rename to rustfmt-core/tests/source/cfg_if/detect/os/other.rs diff --git a/tests/source/cfg_if/detect/os/x86.rs b/rustfmt-core/tests/source/cfg_if/detect/os/x86.rs similarity index 100% rename from tests/source/cfg_if/detect/os/x86.rs rename to rustfmt-core/tests/source/cfg_if/detect/os/x86.rs diff --git a/tests/source/cfg_if/lib.rs b/rustfmt-core/tests/source/cfg_if/lib.rs similarity index 100% rename from tests/source/cfg_if/lib.rs rename to rustfmt-core/tests/source/cfg_if/lib.rs diff --git a/tests/source/cfg_if/mod.rs b/rustfmt-core/tests/source/cfg_if/mod.rs similarity index 100% rename from tests/source/cfg_if/mod.rs rename to rustfmt-core/tests/source/cfg_if/mod.rs diff --git a/tests/source/cfg_mod/bar.rs b/rustfmt-core/tests/source/cfg_mod/bar.rs similarity index 100% rename from tests/source/cfg_mod/bar.rs rename to rustfmt-core/tests/source/cfg_mod/bar.rs diff --git a/tests/source/cfg_mod/dir/dir1/dir2/wasm32.rs b/rustfmt-core/tests/source/cfg_mod/dir/dir1/dir2/wasm32.rs similarity index 100% rename from tests/source/cfg_mod/dir/dir1/dir2/wasm32.rs rename to rustfmt-core/tests/source/cfg_mod/dir/dir1/dir2/wasm32.rs diff --git a/tests/source/cfg_mod/dir/dir1/dir3/wasm32.rs b/rustfmt-core/tests/source/cfg_mod/dir/dir1/dir3/wasm32.rs similarity index 100% rename from tests/source/cfg_mod/dir/dir1/dir3/wasm32.rs rename to rustfmt-core/tests/source/cfg_mod/dir/dir1/dir3/wasm32.rs diff --git a/tests/source/cfg_mod/foo.rs b/rustfmt-core/tests/source/cfg_mod/foo.rs similarity index 100% rename from tests/source/cfg_mod/foo.rs rename to rustfmt-core/tests/source/cfg_mod/foo.rs diff --git a/tests/source/cfg_mod/mod.rs b/rustfmt-core/tests/source/cfg_mod/mod.rs similarity index 100% rename from tests/source/cfg_mod/mod.rs rename to rustfmt-core/tests/source/cfg_mod/mod.rs diff --git a/tests/source/cfg_mod/other.rs b/rustfmt-core/tests/source/cfg_mod/other.rs similarity index 100% rename from tests/source/cfg_mod/other.rs rename to rustfmt-core/tests/source/cfg_mod/other.rs diff --git a/tests/source/cfg_mod/wasm32.rs b/rustfmt-core/tests/source/cfg_mod/wasm32.rs similarity index 100% rename from tests/source/cfg_mod/wasm32.rs rename to rustfmt-core/tests/source/cfg_mod/wasm32.rs diff --git a/tests/source/chains-visual.rs b/rustfmt-core/tests/source/chains-visual.rs similarity index 100% rename from tests/source/chains-visual.rs rename to rustfmt-core/tests/source/chains-visual.rs diff --git a/tests/source/chains.rs b/rustfmt-core/tests/source/chains.rs similarity index 100% rename from tests/source/chains.rs rename to rustfmt-core/tests/source/chains.rs diff --git a/tests/source/chains_with_comment.rs b/rustfmt-core/tests/source/chains_with_comment.rs similarity index 100% rename from tests/source/chains_with_comment.rs rename to rustfmt-core/tests/source/chains_with_comment.rs diff --git a/tests/source/closure-block-inside-macro.rs b/rustfmt-core/tests/source/closure-block-inside-macro.rs similarity index 100% rename from tests/source/closure-block-inside-macro.rs rename to rustfmt-core/tests/source/closure-block-inside-macro.rs diff --git a/tests/source/closure_block_style.rs b/rustfmt-core/tests/source/closure_block_style.rs similarity index 100% rename from tests/source/closure_block_style.rs rename to rustfmt-core/tests/source/closure_block_style.rs diff --git a/tests/source/closure_block_style_no_comma.rs b/rustfmt-core/tests/source/closure_block_style_no_comma.rs similarity index 100% rename from tests/source/closure_block_style_no_comma.rs rename to rustfmt-core/tests/source/closure_block_style_no_comma.rs diff --git a/tests/source/closure_visual_style.rs b/rustfmt-core/tests/source/closure_visual_style.rs similarity index 100% rename from tests/source/closure_visual_style.rs rename to rustfmt-core/tests/source/closure_visual_style.rs diff --git a/tests/source/comment.rs b/rustfmt-core/tests/source/comment.rs similarity index 100% rename from tests/source/comment.rs rename to rustfmt-core/tests/source/comment.rs diff --git a/tests/source/comment2.rs b/rustfmt-core/tests/source/comment2.rs similarity index 100% rename from tests/source/comment2.rs rename to rustfmt-core/tests/source/comment2.rs diff --git a/tests/source/comment3.rs b/rustfmt-core/tests/source/comment3.rs similarity index 100% rename from tests/source/comment3.rs rename to rustfmt-core/tests/source/comment3.rs diff --git a/tests/source/comment4.rs b/rustfmt-core/tests/source/comment4.rs similarity index 100% rename from tests/source/comment4.rs rename to rustfmt-core/tests/source/comment4.rs diff --git a/tests/source/comment5.rs b/rustfmt-core/tests/source/comment5.rs similarity index 100% rename from tests/source/comment5.rs rename to rustfmt-core/tests/source/comment5.rs diff --git a/tests/source/comment6.rs b/rustfmt-core/tests/source/comment6.rs similarity index 100% rename from tests/source/comment6.rs rename to rustfmt-core/tests/source/comment6.rs diff --git a/tests/source/comment_crlf_newline.rs b/rustfmt-core/tests/source/comment_crlf_newline.rs similarity index 100% rename from tests/source/comment_crlf_newline.rs rename to rustfmt-core/tests/source/comment_crlf_newline.rs diff --git a/tests/source/configs/blank_lines_lower_bound/1.rs b/rustfmt-core/tests/source/configs/blank_lines_lower_bound/1.rs similarity index 100% rename from tests/source/configs/blank_lines_lower_bound/1.rs rename to rustfmt-core/tests/source/configs/blank_lines_lower_bound/1.rs diff --git a/tests/source/configs/brace_style/fn_always_next_line.rs b/rustfmt-core/tests/source/configs/brace_style/fn_always_next_line.rs similarity index 100% rename from tests/source/configs/brace_style/fn_always_next_line.rs rename to rustfmt-core/tests/source/configs/brace_style/fn_always_next_line.rs diff --git a/tests/source/configs/brace_style/fn_prefer_same_line.rs b/rustfmt-core/tests/source/configs/brace_style/fn_prefer_same_line.rs similarity index 100% rename from tests/source/configs/brace_style/fn_prefer_same_line.rs rename to rustfmt-core/tests/source/configs/brace_style/fn_prefer_same_line.rs diff --git a/tests/source/configs/brace_style/fn_same_line_where.rs b/rustfmt-core/tests/source/configs/brace_style/fn_same_line_where.rs similarity index 100% rename from tests/source/configs/brace_style/fn_same_line_where.rs rename to rustfmt-core/tests/source/configs/brace_style/fn_same_line_where.rs diff --git a/tests/source/configs/brace_style/item_always_next_line.rs b/rustfmt-core/tests/source/configs/brace_style/item_always_next_line.rs similarity index 100% rename from tests/source/configs/brace_style/item_always_next_line.rs rename to rustfmt-core/tests/source/configs/brace_style/item_always_next_line.rs diff --git a/tests/source/configs/brace_style/item_prefer_same_line.rs b/rustfmt-core/tests/source/configs/brace_style/item_prefer_same_line.rs similarity index 100% rename from tests/source/configs/brace_style/item_prefer_same_line.rs rename to rustfmt-core/tests/source/configs/brace_style/item_prefer_same_line.rs diff --git a/tests/source/configs/brace_style/item_same_line_where.rs b/rustfmt-core/tests/source/configs/brace_style/item_same_line_where.rs similarity index 100% rename from tests/source/configs/brace_style/item_same_line_where.rs rename to rustfmt-core/tests/source/configs/brace_style/item_same_line_where.rs diff --git a/tests/source/configs/comment_width/above.rs b/rustfmt-core/tests/source/configs/comment_width/above.rs similarity index 100% rename from tests/source/configs/comment_width/above.rs rename to rustfmt-core/tests/source/configs/comment_width/above.rs diff --git a/tests/source/configs/comment_width/below.rs b/rustfmt-core/tests/source/configs/comment_width/below.rs similarity index 100% rename from tests/source/configs/comment_width/below.rs rename to rustfmt-core/tests/source/configs/comment_width/below.rs diff --git a/tests/source/configs/comment_width/ignore.rs b/rustfmt-core/tests/source/configs/comment_width/ignore.rs similarity index 100% rename from tests/source/configs/comment_width/ignore.rs rename to rustfmt-core/tests/source/configs/comment_width/ignore.rs diff --git a/tests/source/configs/condense_wildcard_suffixes/false.rs b/rustfmt-core/tests/source/configs/condense_wildcard_suffixes/false.rs similarity index 100% rename from tests/source/configs/condense_wildcard_suffixes/false.rs rename to rustfmt-core/tests/source/configs/condense_wildcard_suffixes/false.rs diff --git a/tests/source/configs/condense_wildcard_suffixes/true.rs b/rustfmt-core/tests/source/configs/condense_wildcard_suffixes/true.rs similarity index 100% rename from tests/source/configs/condense_wildcard_suffixes/true.rs rename to rustfmt-core/tests/source/configs/condense_wildcard_suffixes/true.rs diff --git a/tests/source/configs/control_brace_style/always_next_line.rs b/rustfmt-core/tests/source/configs/control_brace_style/always_next_line.rs similarity index 100% rename from tests/source/configs/control_brace_style/always_next_line.rs rename to rustfmt-core/tests/source/configs/control_brace_style/always_next_line.rs diff --git a/tests/source/configs/control_brace_style/always_same_line.rs b/rustfmt-core/tests/source/configs/control_brace_style/always_same_line.rs similarity index 100% rename from tests/source/configs/control_brace_style/always_same_line.rs rename to rustfmt-core/tests/source/configs/control_brace_style/always_same_line.rs diff --git a/tests/source/configs/control_brace_style/closing_next_line.rs b/rustfmt-core/tests/source/configs/control_brace_style/closing_next_line.rs similarity index 100% rename from tests/source/configs/control_brace_style/closing_next_line.rs rename to rustfmt-core/tests/source/configs/control_brace_style/closing_next_line.rs diff --git a/tests/source/configs/disable_all_formatting/false.rs b/rustfmt-core/tests/source/configs/disable_all_formatting/false.rs similarity index 100% rename from tests/source/configs/disable_all_formatting/false.rs rename to rustfmt-core/tests/source/configs/disable_all_formatting/false.rs diff --git a/tests/source/configs/disable_all_formatting/true.rs b/rustfmt-core/tests/source/configs/disable_all_formatting/true.rs similarity index 100% rename from tests/source/configs/disable_all_formatting/true.rs rename to rustfmt-core/tests/source/configs/disable_all_formatting/true.rs diff --git a/tests/source/configs/empty_item_single_line/false.rs b/rustfmt-core/tests/source/configs/empty_item_single_line/false.rs similarity index 100% rename from tests/source/configs/empty_item_single_line/false.rs rename to rustfmt-core/tests/source/configs/empty_item_single_line/false.rs diff --git a/tests/source/configs/empty_item_single_line/true.rs b/rustfmt-core/tests/source/configs/empty_item_single_line/true.rs similarity index 100% rename from tests/source/configs/empty_item_single_line/true.rs rename to rustfmt-core/tests/source/configs/empty_item_single_line/true.rs diff --git a/tests/source/configs/enum_discrim_align_threshold/40.rs b/rustfmt-core/tests/source/configs/enum_discrim_align_threshold/40.rs similarity index 100% rename from tests/source/configs/enum_discrim_align_threshold/40.rs rename to rustfmt-core/tests/source/configs/enum_discrim_align_threshold/40.rs diff --git a/tests/source/configs/error_on_line_overflow/false.rs b/rustfmt-core/tests/source/configs/error_on_line_overflow/false.rs similarity index 100% rename from tests/source/configs/error_on_line_overflow/false.rs rename to rustfmt-core/tests/source/configs/error_on_line_overflow/false.rs diff --git a/tests/source/configs/fn_args_layout/compressed.rs b/rustfmt-core/tests/source/configs/fn_args_layout/compressed.rs similarity index 100% rename from tests/source/configs/fn_args_layout/compressed.rs rename to rustfmt-core/tests/source/configs/fn_args_layout/compressed.rs diff --git a/tests/source/configs/fn_args_layout/tall.rs b/rustfmt-core/tests/source/configs/fn_args_layout/tall.rs similarity index 100% rename from tests/source/configs/fn_args_layout/tall.rs rename to rustfmt-core/tests/source/configs/fn_args_layout/tall.rs diff --git a/tests/source/configs/fn_args_layout/vertical.rs b/rustfmt-core/tests/source/configs/fn_args_layout/vertical.rs similarity index 100% rename from tests/source/configs/fn_args_layout/vertical.rs rename to rustfmt-core/tests/source/configs/fn_args_layout/vertical.rs diff --git a/tests/source/configs/fn_single_line/false.rs b/rustfmt-core/tests/source/configs/fn_single_line/false.rs similarity index 100% rename from tests/source/configs/fn_single_line/false.rs rename to rustfmt-core/tests/source/configs/fn_single_line/false.rs diff --git a/tests/source/configs/fn_single_line/true.rs b/rustfmt-core/tests/source/configs/fn_single_line/true.rs similarity index 100% rename from tests/source/configs/fn_single_line/true.rs rename to rustfmt-core/tests/source/configs/fn_single_line/true.rs diff --git a/tests/source/configs/force_explicit_abi/false.rs b/rustfmt-core/tests/source/configs/force_explicit_abi/false.rs similarity index 100% rename from tests/source/configs/force_explicit_abi/false.rs rename to rustfmt-core/tests/source/configs/force_explicit_abi/false.rs diff --git a/tests/source/configs/force_explicit_abi/true.rs b/rustfmt-core/tests/source/configs/force_explicit_abi/true.rs similarity index 100% rename from tests/source/configs/force_explicit_abi/true.rs rename to rustfmt-core/tests/source/configs/force_explicit_abi/true.rs diff --git a/tests/source/configs/force_multiline_block/false.rs b/rustfmt-core/tests/source/configs/force_multiline_block/false.rs similarity index 100% rename from tests/source/configs/force_multiline_block/false.rs rename to rustfmt-core/tests/source/configs/force_multiline_block/false.rs diff --git a/tests/source/configs/force_multiline_block/true.rs b/rustfmt-core/tests/source/configs/force_multiline_block/true.rs similarity index 100% rename from tests/source/configs/force_multiline_block/true.rs rename to rustfmt-core/tests/source/configs/force_multiline_block/true.rs diff --git a/tests/source/configs/format_macro_bodies/false.rs b/rustfmt-core/tests/source/configs/format_macro_bodies/false.rs similarity index 100% rename from tests/source/configs/format_macro_bodies/false.rs rename to rustfmt-core/tests/source/configs/format_macro_bodies/false.rs diff --git a/tests/source/configs/format_macro_bodies/true.rs b/rustfmt-core/tests/source/configs/format_macro_bodies/true.rs similarity index 100% rename from tests/source/configs/format_macro_bodies/true.rs rename to rustfmt-core/tests/source/configs/format_macro_bodies/true.rs diff --git a/tests/source/configs/format_macro_matchers/false.rs b/rustfmt-core/tests/source/configs/format_macro_matchers/false.rs similarity index 100% rename from tests/source/configs/format_macro_matchers/false.rs rename to rustfmt-core/tests/source/configs/format_macro_matchers/false.rs diff --git a/tests/source/configs/format_macro_matchers/true.rs b/rustfmt-core/tests/source/configs/format_macro_matchers/true.rs similarity index 100% rename from tests/source/configs/format_macro_matchers/true.rs rename to rustfmt-core/tests/source/configs/format_macro_matchers/true.rs diff --git a/tests/source/configs/format_strings/false.rs b/rustfmt-core/tests/source/configs/format_strings/false.rs similarity index 100% rename from tests/source/configs/format_strings/false.rs rename to rustfmt-core/tests/source/configs/format_strings/false.rs diff --git a/tests/source/configs/format_strings/true.rs b/rustfmt-core/tests/source/configs/format_strings/true.rs similarity index 100% rename from tests/source/configs/format_strings/true.rs rename to rustfmt-core/tests/source/configs/format_strings/true.rs diff --git a/tests/source/configs/hard_tabs/false.rs b/rustfmt-core/tests/source/configs/hard_tabs/false.rs similarity index 100% rename from tests/source/configs/hard_tabs/false.rs rename to rustfmt-core/tests/source/configs/hard_tabs/false.rs diff --git a/tests/source/configs/hard_tabs/true.rs b/rustfmt-core/tests/source/configs/hard_tabs/true.rs similarity index 100% rename from tests/source/configs/hard_tabs/true.rs rename to rustfmt-core/tests/source/configs/hard_tabs/true.rs diff --git a/tests/source/configs/imports_layout/merge_mixed.rs b/rustfmt-core/tests/source/configs/imports_layout/merge_mixed.rs similarity index 100% rename from tests/source/configs/imports_layout/merge_mixed.rs rename to rustfmt-core/tests/source/configs/imports_layout/merge_mixed.rs diff --git a/tests/source/configs/indent_style/block_args.rs b/rustfmt-core/tests/source/configs/indent_style/block_args.rs similarity index 100% rename from tests/source/configs/indent_style/block_args.rs rename to rustfmt-core/tests/source/configs/indent_style/block_args.rs diff --git a/tests/source/configs/indent_style/block_array.rs b/rustfmt-core/tests/source/configs/indent_style/block_array.rs similarity index 100% rename from tests/source/configs/indent_style/block_array.rs rename to rustfmt-core/tests/source/configs/indent_style/block_array.rs diff --git a/tests/source/configs/indent_style/block_call.rs b/rustfmt-core/tests/source/configs/indent_style/block_call.rs similarity index 100% rename from tests/source/configs/indent_style/block_call.rs rename to rustfmt-core/tests/source/configs/indent_style/block_call.rs diff --git a/tests/source/configs/indent_style/block_chain.rs b/rustfmt-core/tests/source/configs/indent_style/block_chain.rs similarity index 100% rename from tests/source/configs/indent_style/block_chain.rs rename to rustfmt-core/tests/source/configs/indent_style/block_chain.rs diff --git a/tests/source/configs/indent_style/block_generic.rs b/rustfmt-core/tests/source/configs/indent_style/block_generic.rs similarity index 100% rename from tests/source/configs/indent_style/block_generic.rs rename to rustfmt-core/tests/source/configs/indent_style/block_generic.rs diff --git a/tests/source/configs/indent_style/block_struct_lit.rs b/rustfmt-core/tests/source/configs/indent_style/block_struct_lit.rs similarity index 100% rename from tests/source/configs/indent_style/block_struct_lit.rs rename to rustfmt-core/tests/source/configs/indent_style/block_struct_lit.rs diff --git a/tests/source/configs/indent_style/block_trailing_comma_call/two.rs b/rustfmt-core/tests/source/configs/indent_style/block_trailing_comma_call/two.rs similarity index 100% rename from tests/source/configs/indent_style/block_trailing_comma_call/two.rs rename to rustfmt-core/tests/source/configs/indent_style/block_trailing_comma_call/two.rs diff --git a/tests/source/configs/indent_style/block_where_pred.rs b/rustfmt-core/tests/source/configs/indent_style/block_where_pred.rs similarity index 100% rename from tests/source/configs/indent_style/block_where_pred.rs rename to rustfmt-core/tests/source/configs/indent_style/block_where_pred.rs diff --git a/tests/source/configs/indent_style/default.rs b/rustfmt-core/tests/source/configs/indent_style/default.rs similarity index 100% rename from tests/source/configs/indent_style/default.rs rename to rustfmt-core/tests/source/configs/indent_style/default.rs diff --git a/tests/source/configs/indent_style/rfc_where.rs b/rustfmt-core/tests/source/configs/indent_style/rfc_where.rs similarity index 100% rename from tests/source/configs/indent_style/rfc_where.rs rename to rustfmt-core/tests/source/configs/indent_style/rfc_where.rs diff --git a/tests/source/configs/indent_style/visual_args.rs b/rustfmt-core/tests/source/configs/indent_style/visual_args.rs similarity index 100% rename from tests/source/configs/indent_style/visual_args.rs rename to rustfmt-core/tests/source/configs/indent_style/visual_args.rs diff --git a/tests/source/configs/indent_style/visual_array.rs b/rustfmt-core/tests/source/configs/indent_style/visual_array.rs similarity index 100% rename from tests/source/configs/indent_style/visual_array.rs rename to rustfmt-core/tests/source/configs/indent_style/visual_array.rs diff --git a/tests/source/configs/indent_style/visual_call.rs b/rustfmt-core/tests/source/configs/indent_style/visual_call.rs similarity index 100% rename from tests/source/configs/indent_style/visual_call.rs rename to rustfmt-core/tests/source/configs/indent_style/visual_call.rs diff --git a/tests/source/configs/indent_style/visual_chain.rs b/rustfmt-core/tests/source/configs/indent_style/visual_chain.rs similarity index 100% rename from tests/source/configs/indent_style/visual_chain.rs rename to rustfmt-core/tests/source/configs/indent_style/visual_chain.rs diff --git a/tests/source/configs/indent_style/visual_generics.rs b/rustfmt-core/tests/source/configs/indent_style/visual_generics.rs similarity index 100% rename from tests/source/configs/indent_style/visual_generics.rs rename to rustfmt-core/tests/source/configs/indent_style/visual_generics.rs diff --git a/tests/source/configs/indent_style/visual_struct_lit.rs b/rustfmt-core/tests/source/configs/indent_style/visual_struct_lit.rs similarity index 100% rename from tests/source/configs/indent_style/visual_struct_lit.rs rename to rustfmt-core/tests/source/configs/indent_style/visual_struct_lit.rs diff --git a/tests/source/configs/indent_style/visual_trailing_comma.rs b/rustfmt-core/tests/source/configs/indent_style/visual_trailing_comma.rs similarity index 100% rename from tests/source/configs/indent_style/visual_trailing_comma.rs rename to rustfmt-core/tests/source/configs/indent_style/visual_trailing_comma.rs diff --git a/tests/source/configs/indent_style/visual_where_pred.rs b/rustfmt-core/tests/source/configs/indent_style/visual_where_pred.rs similarity index 100% rename from tests/source/configs/indent_style/visual_where_pred.rs rename to rustfmt-core/tests/source/configs/indent_style/visual_where_pred.rs diff --git a/tests/source/configs/match_arm_blocks/false.rs b/rustfmt-core/tests/source/configs/match_arm_blocks/false.rs similarity index 100% rename from tests/source/configs/match_arm_blocks/false.rs rename to rustfmt-core/tests/source/configs/match_arm_blocks/false.rs diff --git a/tests/source/configs/match_arm_blocks/true.rs b/rustfmt-core/tests/source/configs/match_arm_blocks/true.rs similarity index 100% rename from tests/source/configs/match_arm_blocks/true.rs rename to rustfmt-core/tests/source/configs/match_arm_blocks/true.rs diff --git a/tests/source/configs/match_block_trailing_comma/false.rs b/rustfmt-core/tests/source/configs/match_block_trailing_comma/false.rs similarity index 100% rename from tests/source/configs/match_block_trailing_comma/false.rs rename to rustfmt-core/tests/source/configs/match_block_trailing_comma/false.rs diff --git a/tests/source/configs/match_block_trailing_comma/true.rs b/rustfmt-core/tests/source/configs/match_block_trailing_comma/true.rs similarity index 100% rename from tests/source/configs/match_block_trailing_comma/true.rs rename to rustfmt-core/tests/source/configs/match_block_trailing_comma/true.rs diff --git a/tests/source/configs/merge_derives/true.rs b/rustfmt-core/tests/source/configs/merge_derives/true.rs similarity index 100% rename from tests/source/configs/merge_derives/true.rs rename to rustfmt-core/tests/source/configs/merge_derives/true.rs diff --git a/tests/source/configs/normalize_comments/false.rs b/rustfmt-core/tests/source/configs/normalize_comments/false.rs similarity index 100% rename from tests/source/configs/normalize_comments/false.rs rename to rustfmt-core/tests/source/configs/normalize_comments/false.rs diff --git a/tests/source/configs/normalize_comments/true.rs b/rustfmt-core/tests/source/configs/normalize_comments/true.rs similarity index 100% rename from tests/source/configs/normalize_comments/true.rs rename to rustfmt-core/tests/source/configs/normalize_comments/true.rs diff --git a/tests/source/configs/normalize_doc_attributes/false.rs b/rustfmt-core/tests/source/configs/normalize_doc_attributes/false.rs similarity index 100% rename from tests/source/configs/normalize_doc_attributes/false.rs rename to rustfmt-core/tests/source/configs/normalize_doc_attributes/false.rs diff --git a/tests/source/configs/normalize_doc_attributes/true.rs b/rustfmt-core/tests/source/configs/normalize_doc_attributes/true.rs similarity index 100% rename from tests/source/configs/normalize_doc_attributes/true.rs rename to rustfmt-core/tests/source/configs/normalize_doc_attributes/true.rs diff --git a/tests/source/configs/recursive/disabled/foo.rs b/rustfmt-core/tests/source/configs/recursive/disabled/foo.rs similarity index 100% rename from tests/source/configs/recursive/disabled/foo.rs rename to rustfmt-core/tests/source/configs/recursive/disabled/foo.rs diff --git a/tests/source/configs/recursive/disabled/lib.rs b/rustfmt-core/tests/source/configs/recursive/disabled/lib.rs similarity index 100% rename from tests/source/configs/recursive/disabled/lib.rs rename to rustfmt-core/tests/source/configs/recursive/disabled/lib.rs diff --git a/tests/source/configs/recursive/enabled/foo.rs b/rustfmt-core/tests/source/configs/recursive/enabled/foo.rs similarity index 100% rename from tests/source/configs/recursive/enabled/foo.rs rename to rustfmt-core/tests/source/configs/recursive/enabled/foo.rs diff --git a/tests/source/configs/recursive/enabled/lib.rs b/rustfmt-core/tests/source/configs/recursive/enabled/lib.rs similarity index 100% rename from tests/source/configs/recursive/enabled/lib.rs rename to rustfmt-core/tests/source/configs/recursive/enabled/lib.rs diff --git a/tests/source/configs/remove_nested_parens/remove_nested_parens.rs b/rustfmt-core/tests/source/configs/remove_nested_parens/remove_nested_parens.rs similarity index 100% rename from tests/source/configs/remove_nested_parens/remove_nested_parens.rs rename to rustfmt-core/tests/source/configs/remove_nested_parens/remove_nested_parens.rs diff --git a/tests/source/configs/reorder_impl_items/false.rs b/rustfmt-core/tests/source/configs/reorder_impl_items/false.rs similarity index 100% rename from tests/source/configs/reorder_impl_items/false.rs rename to rustfmt-core/tests/source/configs/reorder_impl_items/false.rs diff --git a/tests/source/configs/reorder_impl_items/true.rs b/rustfmt-core/tests/source/configs/reorder_impl_items/true.rs similarity index 100% rename from tests/source/configs/reorder_impl_items/true.rs rename to rustfmt-core/tests/source/configs/reorder_impl_items/true.rs diff --git a/tests/source/configs/reorder_imports/false.rs b/rustfmt-core/tests/source/configs/reorder_imports/false.rs similarity index 100% rename from tests/source/configs/reorder_imports/false.rs rename to rustfmt-core/tests/source/configs/reorder_imports/false.rs diff --git a/tests/source/configs/reorder_imports/true.rs b/rustfmt-core/tests/source/configs/reorder_imports/true.rs similarity index 100% rename from tests/source/configs/reorder_imports/true.rs rename to rustfmt-core/tests/source/configs/reorder_imports/true.rs diff --git a/tests/source/configs/reorder_modules/dolor/mod.rs b/rustfmt-core/tests/source/configs/reorder_modules/dolor/mod.rs similarity index 100% rename from tests/source/configs/reorder_modules/dolor/mod.rs rename to rustfmt-core/tests/source/configs/reorder_modules/dolor/mod.rs diff --git a/tests/source/configs/reorder_modules/false.rs b/rustfmt-core/tests/source/configs/reorder_modules/false.rs similarity index 100% rename from tests/source/configs/reorder_modules/false.rs rename to rustfmt-core/tests/source/configs/reorder_modules/false.rs diff --git a/tests/source/configs/reorder_modules/ipsum/mod.rs b/rustfmt-core/tests/source/configs/reorder_modules/ipsum/mod.rs similarity index 100% rename from tests/source/configs/reorder_modules/ipsum/mod.rs rename to rustfmt-core/tests/source/configs/reorder_modules/ipsum/mod.rs diff --git a/tests/source/configs/reorder_modules/lorem/mod.rs b/rustfmt-core/tests/source/configs/reorder_modules/lorem/mod.rs similarity index 100% rename from tests/source/configs/reorder_modules/lorem/mod.rs rename to rustfmt-core/tests/source/configs/reorder_modules/lorem/mod.rs diff --git a/tests/source/configs/reorder_modules/sit/mod.rs b/rustfmt-core/tests/source/configs/reorder_modules/sit/mod.rs similarity index 100% rename from tests/source/configs/reorder_modules/sit/mod.rs rename to rustfmt-core/tests/source/configs/reorder_modules/sit/mod.rs diff --git a/tests/source/configs/reorder_modules/true.rs b/rustfmt-core/tests/source/configs/reorder_modules/true.rs similarity index 100% rename from tests/source/configs/reorder_modules/true.rs rename to rustfmt-core/tests/source/configs/reorder_modules/true.rs diff --git a/tests/source/configs/skip_children/foo/mod.rs b/rustfmt-core/tests/source/configs/skip_children/foo/mod.rs similarity index 100% rename from tests/source/configs/skip_children/foo/mod.rs rename to rustfmt-core/tests/source/configs/skip_children/foo/mod.rs diff --git a/tests/source/configs/skip_children/true.rs b/rustfmt-core/tests/source/configs/skip_children/true.rs similarity index 100% rename from tests/source/configs/skip_children/true.rs rename to rustfmt-core/tests/source/configs/skip_children/true.rs diff --git a/tests/source/configs/space_before_colon/true.rs b/rustfmt-core/tests/source/configs/space_before_colon/true.rs similarity index 100% rename from tests/source/configs/space_before_colon/true.rs rename to rustfmt-core/tests/source/configs/space_before_colon/true.rs diff --git a/tests/source/configs/spaces_around_ranges/false.rs b/rustfmt-core/tests/source/configs/spaces_around_ranges/false.rs similarity index 100% rename from tests/source/configs/spaces_around_ranges/false.rs rename to rustfmt-core/tests/source/configs/spaces_around_ranges/false.rs diff --git a/tests/source/configs/spaces_around_ranges/true.rs b/rustfmt-core/tests/source/configs/spaces_around_ranges/true.rs similarity index 100% rename from tests/source/configs/spaces_around_ranges/true.rs rename to rustfmt-core/tests/source/configs/spaces_around_ranges/true.rs diff --git a/tests/source/configs/struct_field_align_threshold/20.rs b/rustfmt-core/tests/source/configs/struct_field_align_threshold/20.rs similarity index 100% rename from tests/source/configs/struct_field_align_threshold/20.rs rename to rustfmt-core/tests/source/configs/struct_field_align_threshold/20.rs diff --git a/tests/source/configs/struct_lit_single_line/false.rs b/rustfmt-core/tests/source/configs/struct_lit_single_line/false.rs similarity index 100% rename from tests/source/configs/struct_lit_single_line/false.rs rename to rustfmt-core/tests/source/configs/struct_lit_single_line/false.rs diff --git a/tests/source/configs/tab_spaces/2.rs b/rustfmt-core/tests/source/configs/tab_spaces/2.rs similarity index 100% rename from tests/source/configs/tab_spaces/2.rs rename to rustfmt-core/tests/source/configs/tab_spaces/2.rs diff --git a/tests/source/configs/tab_spaces/4.rs b/rustfmt-core/tests/source/configs/tab_spaces/4.rs similarity index 100% rename from tests/source/configs/tab_spaces/4.rs rename to rustfmt-core/tests/source/configs/tab_spaces/4.rs diff --git a/tests/source/configs/trailing_comma/always.rs b/rustfmt-core/tests/source/configs/trailing_comma/always.rs similarity index 100% rename from tests/source/configs/trailing_comma/always.rs rename to rustfmt-core/tests/source/configs/trailing_comma/always.rs diff --git a/tests/source/configs/trailing_comma/never.rs b/rustfmt-core/tests/source/configs/trailing_comma/never.rs similarity index 100% rename from tests/source/configs/trailing_comma/never.rs rename to rustfmt-core/tests/source/configs/trailing_comma/never.rs diff --git a/tests/source/configs/trailing_comma/vertical.rs b/rustfmt-core/tests/source/configs/trailing_comma/vertical.rs similarity index 100% rename from tests/source/configs/trailing_comma/vertical.rs rename to rustfmt-core/tests/source/configs/trailing_comma/vertical.rs diff --git a/tests/source/configs/type_punctuation_density/compressed.rs b/rustfmt-core/tests/source/configs/type_punctuation_density/compressed.rs similarity index 100% rename from tests/source/configs/type_punctuation_density/compressed.rs rename to rustfmt-core/tests/source/configs/type_punctuation_density/compressed.rs diff --git a/tests/source/configs/type_punctuation_density/wide.rs b/rustfmt-core/tests/source/configs/type_punctuation_density/wide.rs similarity index 100% rename from tests/source/configs/type_punctuation_density/wide.rs rename to rustfmt-core/tests/source/configs/type_punctuation_density/wide.rs diff --git a/tests/source/configs/use_field_init_shorthand/false.rs b/rustfmt-core/tests/source/configs/use_field_init_shorthand/false.rs similarity index 100% rename from tests/source/configs/use_field_init_shorthand/false.rs rename to rustfmt-core/tests/source/configs/use_field_init_shorthand/false.rs diff --git a/tests/source/configs/use_field_init_shorthand/true.rs b/rustfmt-core/tests/source/configs/use_field_init_shorthand/true.rs similarity index 100% rename from tests/source/configs/use_field_init_shorthand/true.rs rename to rustfmt-core/tests/source/configs/use_field_init_shorthand/true.rs diff --git a/tests/source/configs/use_small_heuristics/max.rs b/rustfmt-core/tests/source/configs/use_small_heuristics/max.rs similarity index 100% rename from tests/source/configs/use_small_heuristics/max.rs rename to rustfmt-core/tests/source/configs/use_small_heuristics/max.rs diff --git a/tests/source/configs/use_try_shorthand/false.rs b/rustfmt-core/tests/source/configs/use_try_shorthand/false.rs similarity index 100% rename from tests/source/configs/use_try_shorthand/false.rs rename to rustfmt-core/tests/source/configs/use_try_shorthand/false.rs diff --git a/tests/source/configs/use_try_shorthand/true.rs b/rustfmt-core/tests/source/configs/use_try_shorthand/true.rs similarity index 100% rename from tests/source/configs/use_try_shorthand/true.rs rename to rustfmt-core/tests/source/configs/use_try_shorthand/true.rs diff --git a/tests/source/configs/use_try_shorthand/true_2015_edition.rs b/rustfmt-core/tests/source/configs/use_try_shorthand/true_2015_edition.rs similarity index 100% rename from tests/source/configs/use_try_shorthand/true_2015_edition.rs rename to rustfmt-core/tests/source/configs/use_try_shorthand/true_2015_edition.rs diff --git a/tests/source/configs/where_single_line/true.rs b/rustfmt-core/tests/source/configs/where_single_line/true.rs similarity index 100% rename from tests/source/configs/where_single_line/true.rs rename to rustfmt-core/tests/source/configs/where_single_line/true.rs diff --git a/tests/source/configs/wrap_comments/false.rs b/rustfmt-core/tests/source/configs/wrap_comments/false.rs similarity index 100% rename from tests/source/configs/wrap_comments/false.rs rename to rustfmt-core/tests/source/configs/wrap_comments/false.rs diff --git a/tests/source/configs/wrap_comments/true.rs b/rustfmt-core/tests/source/configs/wrap_comments/true.rs similarity index 100% rename from tests/source/configs/wrap_comments/true.rs rename to rustfmt-core/tests/source/configs/wrap_comments/true.rs diff --git a/tests/source/const_generics.rs b/rustfmt-core/tests/source/const_generics.rs similarity index 100% rename from tests/source/const_generics.rs rename to rustfmt-core/tests/source/const_generics.rs diff --git a/tests/source/control-brace-style-always-next-line.rs b/rustfmt-core/tests/source/control-brace-style-always-next-line.rs similarity index 100% rename from tests/source/control-brace-style-always-next-line.rs rename to rustfmt-core/tests/source/control-brace-style-always-next-line.rs diff --git a/tests/source/control-brace-style-always-same-line.rs b/rustfmt-core/tests/source/control-brace-style-always-same-line.rs similarity index 100% rename from tests/source/control-brace-style-always-same-line.rs rename to rustfmt-core/tests/source/control-brace-style-always-same-line.rs diff --git a/tests/source/doc-attrib.rs b/rustfmt-core/tests/source/doc-attrib.rs similarity index 100% rename from tests/source/doc-attrib.rs rename to rustfmt-core/tests/source/doc-attrib.rs diff --git a/tests/source/doc-comment-with-example.rs b/rustfmt-core/tests/source/doc-comment-with-example.rs similarity index 100% rename from tests/source/doc-comment-with-example.rs rename to rustfmt-core/tests/source/doc-comment-with-example.rs diff --git a/tests/source/doc.rs b/rustfmt-core/tests/source/doc.rs similarity index 100% rename from tests/source/doc.rs rename to rustfmt-core/tests/source/doc.rs diff --git a/tests/source/dyn_trait.rs b/rustfmt-core/tests/source/dyn_trait.rs similarity index 100% rename from tests/source/dyn_trait.rs rename to rustfmt-core/tests/source/dyn_trait.rs diff --git a/tests/source/else-if-brace-style-always-next-line.rs b/rustfmt-core/tests/source/else-if-brace-style-always-next-line.rs similarity index 100% rename from tests/source/else-if-brace-style-always-next-line.rs rename to rustfmt-core/tests/source/else-if-brace-style-always-next-line.rs diff --git a/tests/source/else-if-brace-style-always-same-line.rs b/rustfmt-core/tests/source/else-if-brace-style-always-same-line.rs similarity index 100% rename from tests/source/else-if-brace-style-always-same-line.rs rename to rustfmt-core/tests/source/else-if-brace-style-always-same-line.rs diff --git a/tests/source/else-if-brace-style-closing-next-line.rs b/rustfmt-core/tests/source/else-if-brace-style-closing-next-line.rs similarity index 100% rename from tests/source/else-if-brace-style-closing-next-line.rs rename to rustfmt-core/tests/source/else-if-brace-style-closing-next-line.rs diff --git a/tests/source/empty_file.rs b/rustfmt-core/tests/source/empty_file.rs similarity index 100% rename from tests/source/empty_file.rs rename to rustfmt-core/tests/source/empty_file.rs diff --git a/tests/source/enum.rs b/rustfmt-core/tests/source/enum.rs similarity index 100% rename from tests/source/enum.rs rename to rustfmt-core/tests/source/enum.rs diff --git a/tests/source/existential_type.rs b/rustfmt-core/tests/source/existential_type.rs similarity index 100% rename from tests/source/existential_type.rs rename to rustfmt-core/tests/source/existential_type.rs diff --git a/tests/source/expr-block.rs b/rustfmt-core/tests/source/expr-block.rs similarity index 100% rename from tests/source/expr-block.rs rename to rustfmt-core/tests/source/expr-block.rs diff --git a/tests/source/expr-overflow-delimited.rs b/rustfmt-core/tests/source/expr-overflow-delimited.rs similarity index 100% rename from tests/source/expr-overflow-delimited.rs rename to rustfmt-core/tests/source/expr-overflow-delimited.rs diff --git a/tests/source/expr.rs b/rustfmt-core/tests/source/expr.rs similarity index 100% rename from tests/source/expr.rs rename to rustfmt-core/tests/source/expr.rs diff --git a/tests/source/extern.rs b/rustfmt-core/tests/source/extern.rs similarity index 100% rename from tests/source/extern.rs rename to rustfmt-core/tests/source/extern.rs diff --git a/tests/source/extern_not_explicit.rs b/rustfmt-core/tests/source/extern_not_explicit.rs similarity index 100% rename from tests/source/extern_not_explicit.rs rename to rustfmt-core/tests/source/extern_not_explicit.rs diff --git a/tests/source/file-lines-1.rs b/rustfmt-core/tests/source/file-lines-1.rs similarity index 100% rename from tests/source/file-lines-1.rs rename to rustfmt-core/tests/source/file-lines-1.rs diff --git a/tests/source/file-lines-2.rs b/rustfmt-core/tests/source/file-lines-2.rs similarity index 100% rename from tests/source/file-lines-2.rs rename to rustfmt-core/tests/source/file-lines-2.rs diff --git a/tests/source/file-lines-3.rs b/rustfmt-core/tests/source/file-lines-3.rs similarity index 100% rename from tests/source/file-lines-3.rs rename to rustfmt-core/tests/source/file-lines-3.rs diff --git a/tests/source/file-lines-4.rs b/rustfmt-core/tests/source/file-lines-4.rs similarity index 100% rename from tests/source/file-lines-4.rs rename to rustfmt-core/tests/source/file-lines-4.rs diff --git a/tests/source/file-lines-5.rs b/rustfmt-core/tests/source/file-lines-5.rs similarity index 100% rename from tests/source/file-lines-5.rs rename to rustfmt-core/tests/source/file-lines-5.rs diff --git a/tests/source/file-lines-6.rs b/rustfmt-core/tests/source/file-lines-6.rs similarity index 100% rename from tests/source/file-lines-6.rs rename to rustfmt-core/tests/source/file-lines-6.rs diff --git a/tests/source/file-lines-7.rs b/rustfmt-core/tests/source/file-lines-7.rs similarity index 100% rename from tests/source/file-lines-7.rs rename to rustfmt-core/tests/source/file-lines-7.rs diff --git a/tests/source/file-lines-8.rs b/rustfmt-core/tests/source/file-lines-8.rs similarity index 100% rename from tests/source/file-lines-8.rs rename to rustfmt-core/tests/source/file-lines-8.rs diff --git a/tests/source/file-lines-item.rs b/rustfmt-core/tests/source/file-lines-item.rs similarity index 100% rename from tests/source/file-lines-item.rs rename to rustfmt-core/tests/source/file-lines-item.rs diff --git a/tests/source/fn-custom-2.rs b/rustfmt-core/tests/source/fn-custom-2.rs similarity index 100% rename from tests/source/fn-custom-2.rs rename to rustfmt-core/tests/source/fn-custom-2.rs diff --git a/tests/source/fn-custom-3.rs b/rustfmt-core/tests/source/fn-custom-3.rs similarity index 100% rename from tests/source/fn-custom-3.rs rename to rustfmt-core/tests/source/fn-custom-3.rs diff --git a/tests/source/fn-custom-4.rs b/rustfmt-core/tests/source/fn-custom-4.rs similarity index 100% rename from tests/source/fn-custom-4.rs rename to rustfmt-core/tests/source/fn-custom-4.rs diff --git a/tests/source/fn-custom-6.rs b/rustfmt-core/tests/source/fn-custom-6.rs similarity index 100% rename from tests/source/fn-custom-6.rs rename to rustfmt-core/tests/source/fn-custom-6.rs diff --git a/tests/source/fn-custom-7.rs b/rustfmt-core/tests/source/fn-custom-7.rs similarity index 100% rename from tests/source/fn-custom-7.rs rename to rustfmt-core/tests/source/fn-custom-7.rs diff --git a/tests/source/fn-custom-8.rs b/rustfmt-core/tests/source/fn-custom-8.rs similarity index 100% rename from tests/source/fn-custom-8.rs rename to rustfmt-core/tests/source/fn-custom-8.rs diff --git a/tests/source/fn-custom.rs b/rustfmt-core/tests/source/fn-custom.rs similarity index 100% rename from tests/source/fn-custom.rs rename to rustfmt-core/tests/source/fn-custom.rs diff --git a/tests/source/fn-param-attributes.rs b/rustfmt-core/tests/source/fn-param-attributes.rs similarity index 100% rename from tests/source/fn-param-attributes.rs rename to rustfmt-core/tests/source/fn-param-attributes.rs diff --git a/tests/source/fn-simple.rs b/rustfmt-core/tests/source/fn-simple.rs similarity index 100% rename from tests/source/fn-simple.rs rename to rustfmt-core/tests/source/fn-simple.rs diff --git a/tests/source/fn-single-line/version_two.rs b/rustfmt-core/tests/source/fn-single-line/version_two.rs similarity index 100% rename from tests/source/fn-single-line/version_two.rs rename to rustfmt-core/tests/source/fn-single-line/version_two.rs diff --git a/tests/source/fn_args_indent-block.rs b/rustfmt-core/tests/source/fn_args_indent-block.rs similarity index 100% rename from tests/source/fn_args_indent-block.rs rename to rustfmt-core/tests/source/fn_args_indent-block.rs diff --git a/tests/source/fn_args_layout-vertical.rs b/rustfmt-core/tests/source/fn_args_layout-vertical.rs similarity index 100% rename from tests/source/fn_args_layout-vertical.rs rename to rustfmt-core/tests/source/fn_args_layout-vertical.rs diff --git a/tests/source/hard-tabs.rs b/rustfmt-core/tests/source/hard-tabs.rs similarity index 100% rename from tests/source/hard-tabs.rs rename to rustfmt-core/tests/source/hard-tabs.rs diff --git a/tests/source/hello.rs b/rustfmt-core/tests/source/hello.rs similarity index 100% rename from tests/source/hello.rs rename to rustfmt-core/tests/source/hello.rs diff --git a/tests/source/hello2.rs b/rustfmt-core/tests/source/hello2.rs similarity index 100% rename from tests/source/hello2.rs rename to rustfmt-core/tests/source/hello2.rs diff --git a/tests/source/if_while_or_patterns.rs b/rustfmt-core/tests/source/if_while_or_patterns.rs similarity index 100% rename from tests/source/if_while_or_patterns.rs rename to rustfmt-core/tests/source/if_while_or_patterns.rs diff --git a/tests/source/immovable_generators.rs b/rustfmt-core/tests/source/immovable_generators.rs similarity index 100% rename from tests/source/immovable_generators.rs rename to rustfmt-core/tests/source/immovable_generators.rs diff --git a/tests/source/impls.rs b/rustfmt-core/tests/source/impls.rs similarity index 100% rename from tests/source/impls.rs rename to rustfmt-core/tests/source/impls.rs diff --git a/tests/source/imports-impl-only-use.rs b/rustfmt-core/tests/source/imports-impl-only-use.rs similarity index 100% rename from tests/source/imports-impl-only-use.rs rename to rustfmt-core/tests/source/imports-impl-only-use.rs diff --git a/tests/source/imports-reorder-lines-and-items.rs b/rustfmt-core/tests/source/imports-reorder-lines-and-items.rs similarity index 100% rename from tests/source/imports-reorder-lines-and-items.rs rename to rustfmt-core/tests/source/imports-reorder-lines-and-items.rs diff --git a/tests/source/imports-reorder-lines.rs b/rustfmt-core/tests/source/imports-reorder-lines.rs similarity index 100% rename from tests/source/imports-reorder-lines.rs rename to rustfmt-core/tests/source/imports-reorder-lines.rs diff --git a/tests/source/imports-reorder.rs b/rustfmt-core/tests/source/imports-reorder.rs similarity index 100% rename from tests/source/imports-reorder.rs rename to rustfmt-core/tests/source/imports-reorder.rs diff --git a/tests/source/imports.rs b/rustfmt-core/tests/source/imports.rs similarity index 100% rename from tests/source/imports.rs rename to rustfmt-core/tests/source/imports.rs diff --git a/tests/source/imports_2015_edition.rs b/rustfmt-core/tests/source/imports_2015_edition.rs similarity index 100% rename from tests/source/imports_2015_edition.rs rename to rustfmt-core/tests/source/imports_2015_edition.rs diff --git a/tests/source/imports_block_indent.rs b/rustfmt-core/tests/source/imports_block_indent.rs similarity index 100% rename from tests/source/imports_block_indent.rs rename to rustfmt-core/tests/source/imports_block_indent.rs diff --git a/tests/source/imports_raw_identifiers.rs b/rustfmt-core/tests/source/imports_raw_identifiers.rs similarity index 100% rename from tests/source/imports_raw_identifiers.rs rename to rustfmt-core/tests/source/imports_raw_identifiers.rs diff --git a/tests/source/invalid-rust-code-in-doc-comment.rs b/rustfmt-core/tests/source/invalid-rust-code-in-doc-comment.rs similarity index 100% rename from tests/source/invalid-rust-code-in-doc-comment.rs rename to rustfmt-core/tests/source/invalid-rust-code-in-doc-comment.rs diff --git a/tests/source/issue-1021.rs b/rustfmt-core/tests/source/issue-1021.rs similarity index 100% rename from tests/source/issue-1021.rs rename to rustfmt-core/tests/source/issue-1021.rs diff --git a/tests/source/issue-1049.rs b/rustfmt-core/tests/source/issue-1049.rs similarity index 100% rename from tests/source/issue-1049.rs rename to rustfmt-core/tests/source/issue-1049.rs diff --git a/tests/source/issue-1111.rs b/rustfmt-core/tests/source/issue-1111.rs similarity index 100% rename from tests/source/issue-1111.rs rename to rustfmt-core/tests/source/issue-1111.rs diff --git a/tests/source/issue-1120.rs b/rustfmt-core/tests/source/issue-1120.rs similarity index 100% rename from tests/source/issue-1120.rs rename to rustfmt-core/tests/source/issue-1120.rs diff --git a/tests/source/issue-1124.rs b/rustfmt-core/tests/source/issue-1124.rs similarity index 100% rename from tests/source/issue-1124.rs rename to rustfmt-core/tests/source/issue-1124.rs diff --git a/tests/source/issue-1127.rs b/rustfmt-core/tests/source/issue-1127.rs similarity index 100% rename from tests/source/issue-1127.rs rename to rustfmt-core/tests/source/issue-1127.rs diff --git a/tests/source/issue-1158.rs b/rustfmt-core/tests/source/issue-1158.rs similarity index 100% rename from tests/source/issue-1158.rs rename to rustfmt-core/tests/source/issue-1158.rs diff --git a/tests/source/issue-1177.rs b/rustfmt-core/tests/source/issue-1177.rs similarity index 100% rename from tests/source/issue-1177.rs rename to rustfmt-core/tests/source/issue-1177.rs diff --git a/tests/source/issue-1192.rs b/rustfmt-core/tests/source/issue-1192.rs similarity index 100% rename from tests/source/issue-1192.rs rename to rustfmt-core/tests/source/issue-1192.rs diff --git a/tests/source/issue-1210/a.rs b/rustfmt-core/tests/source/issue-1210/a.rs similarity index 100% rename from tests/source/issue-1210/a.rs rename to rustfmt-core/tests/source/issue-1210/a.rs diff --git a/tests/source/issue-1210/b.rs b/rustfmt-core/tests/source/issue-1210/b.rs similarity index 100% rename from tests/source/issue-1210/b.rs rename to rustfmt-core/tests/source/issue-1210/b.rs diff --git a/tests/source/issue-1210/c.rs b/rustfmt-core/tests/source/issue-1210/c.rs similarity index 100% rename from tests/source/issue-1210/c.rs rename to rustfmt-core/tests/source/issue-1210/c.rs diff --git a/tests/source/issue-1210/d.rs b/rustfmt-core/tests/source/issue-1210/d.rs similarity index 100% rename from tests/source/issue-1210/d.rs rename to rustfmt-core/tests/source/issue-1210/d.rs diff --git a/tests/source/issue-1210/e.rs b/rustfmt-core/tests/source/issue-1210/e.rs similarity index 100% rename from tests/source/issue-1210/e.rs rename to rustfmt-core/tests/source/issue-1210/e.rs diff --git a/tests/source/issue-1211.rs b/rustfmt-core/tests/source/issue-1211.rs similarity index 100% rename from tests/source/issue-1211.rs rename to rustfmt-core/tests/source/issue-1211.rs diff --git a/tests/source/issue-1216.rs b/rustfmt-core/tests/source/issue-1216.rs similarity index 100% rename from tests/source/issue-1216.rs rename to rustfmt-core/tests/source/issue-1216.rs diff --git a/tests/source/issue-1239.rs b/rustfmt-core/tests/source/issue-1239.rs similarity index 100% rename from tests/source/issue-1239.rs rename to rustfmt-core/tests/source/issue-1239.rs diff --git a/tests/source/issue-1278.rs b/rustfmt-core/tests/source/issue-1278.rs similarity index 100% rename from tests/source/issue-1278.rs rename to rustfmt-core/tests/source/issue-1278.rs diff --git a/tests/source/issue-1350.rs b/rustfmt-core/tests/source/issue-1350.rs similarity index 100% rename from tests/source/issue-1350.rs rename to rustfmt-core/tests/source/issue-1350.rs diff --git a/tests/source/issue-1366.rs b/rustfmt-core/tests/source/issue-1366.rs similarity index 100% rename from tests/source/issue-1366.rs rename to rustfmt-core/tests/source/issue-1366.rs diff --git a/tests/source/issue-1468.rs b/rustfmt-core/tests/source/issue-1468.rs similarity index 100% rename from tests/source/issue-1468.rs rename to rustfmt-core/tests/source/issue-1468.rs diff --git a/tests/source/issue-1693.rs b/rustfmt-core/tests/source/issue-1693.rs similarity index 100% rename from tests/source/issue-1693.rs rename to rustfmt-core/tests/source/issue-1693.rs diff --git a/tests/source/issue-1800.rs b/rustfmt-core/tests/source/issue-1800.rs similarity index 100% rename from tests/source/issue-1800.rs rename to rustfmt-core/tests/source/issue-1800.rs diff --git a/tests/source/issue-1914.rs b/rustfmt-core/tests/source/issue-1914.rs similarity index 100% rename from tests/source/issue-1914.rs rename to rustfmt-core/tests/source/issue-1914.rs diff --git a/tests/source/issue-2025.rs b/rustfmt-core/tests/source/issue-2025.rs similarity index 100% rename from tests/source/issue-2025.rs rename to rustfmt-core/tests/source/issue-2025.rs diff --git a/tests/source/issue-2111.rs b/rustfmt-core/tests/source/issue-2111.rs similarity index 100% rename from tests/source/issue-2111.rs rename to rustfmt-core/tests/source/issue-2111.rs diff --git a/tests/source/issue-2164.rs b/rustfmt-core/tests/source/issue-2164.rs similarity index 100% rename from tests/source/issue-2164.rs rename to rustfmt-core/tests/source/issue-2164.rs diff --git a/tests/source/issue-2179/two.rs b/rustfmt-core/tests/source/issue-2179/two.rs similarity index 100% rename from tests/source/issue-2179/two.rs rename to rustfmt-core/tests/source/issue-2179/two.rs diff --git a/tests/source/issue-2256.rs b/rustfmt-core/tests/source/issue-2256.rs similarity index 100% rename from tests/source/issue-2256.rs rename to rustfmt-core/tests/source/issue-2256.rs diff --git a/tests/source/issue-2342.rs b/rustfmt-core/tests/source/issue-2342.rs similarity index 100% rename from tests/source/issue-2342.rs rename to rustfmt-core/tests/source/issue-2342.rs diff --git a/tests/source/issue-2445.rs b/rustfmt-core/tests/source/issue-2445.rs similarity index 100% rename from tests/source/issue-2445.rs rename to rustfmt-core/tests/source/issue-2445.rs diff --git a/tests/source/issue-2446.rs b/rustfmt-core/tests/source/issue-2446.rs similarity index 100% rename from tests/source/issue-2446.rs rename to rustfmt-core/tests/source/issue-2446.rs diff --git a/tests/source/issue-2479.rs b/rustfmt-core/tests/source/issue-2479.rs similarity index 100% rename from tests/source/issue-2479.rs rename to rustfmt-core/tests/source/issue-2479.rs diff --git a/tests/source/issue-2482/a.rs b/rustfmt-core/tests/source/issue-2482/a.rs similarity index 100% rename from tests/source/issue-2482/a.rs rename to rustfmt-core/tests/source/issue-2482/a.rs diff --git a/tests/source/issue-2482/b.rs b/rustfmt-core/tests/source/issue-2482/b.rs similarity index 100% rename from tests/source/issue-2482/b.rs rename to rustfmt-core/tests/source/issue-2482/b.rs diff --git a/tests/source/issue-2482/c.rs b/rustfmt-core/tests/source/issue-2482/c.rs similarity index 100% rename from tests/source/issue-2482/c.rs rename to rustfmt-core/tests/source/issue-2482/c.rs diff --git a/tests/source/issue-2496.rs b/rustfmt-core/tests/source/issue-2496.rs similarity index 100% rename from tests/source/issue-2496.rs rename to rustfmt-core/tests/source/issue-2496.rs diff --git a/tests/source/issue-2520.rs b/rustfmt-core/tests/source/issue-2520.rs similarity index 100% rename from tests/source/issue-2520.rs rename to rustfmt-core/tests/source/issue-2520.rs diff --git a/tests/source/issue-2523.rs b/rustfmt-core/tests/source/issue-2523.rs similarity index 100% rename from tests/source/issue-2523.rs rename to rustfmt-core/tests/source/issue-2523.rs diff --git a/tests/source/issue-2582.rs b/rustfmt-core/tests/source/issue-2582.rs similarity index 100% rename from tests/source/issue-2582.rs rename to rustfmt-core/tests/source/issue-2582.rs diff --git a/tests/source/issue-2641.rs b/rustfmt-core/tests/source/issue-2641.rs similarity index 100% rename from tests/source/issue-2641.rs rename to rustfmt-core/tests/source/issue-2641.rs diff --git a/tests/source/issue-2644.rs b/rustfmt-core/tests/source/issue-2644.rs similarity index 100% rename from tests/source/issue-2644.rs rename to rustfmt-core/tests/source/issue-2644.rs diff --git a/tests/source/issue-2728.rs b/rustfmt-core/tests/source/issue-2728.rs similarity index 100% rename from tests/source/issue-2728.rs rename to rustfmt-core/tests/source/issue-2728.rs diff --git a/tests/source/issue-2761.rs b/rustfmt-core/tests/source/issue-2761.rs similarity index 100% rename from tests/source/issue-2761.rs rename to rustfmt-core/tests/source/issue-2761.rs diff --git a/tests/source/issue-2794.rs b/rustfmt-core/tests/source/issue-2794.rs similarity index 100% rename from tests/source/issue-2794.rs rename to rustfmt-core/tests/source/issue-2794.rs diff --git a/tests/source/issue-2835.rs b/rustfmt-core/tests/source/issue-2835.rs similarity index 100% rename from tests/source/issue-2835.rs rename to rustfmt-core/tests/source/issue-2835.rs diff --git a/tests/source/issue-2863.rs b/rustfmt-core/tests/source/issue-2863.rs similarity index 100% rename from tests/source/issue-2863.rs rename to rustfmt-core/tests/source/issue-2863.rs diff --git a/tests/source/issue-2869.rs b/rustfmt-core/tests/source/issue-2869.rs similarity index 100% rename from tests/source/issue-2869.rs rename to rustfmt-core/tests/source/issue-2869.rs diff --git a/tests/source/issue-2896.rs b/rustfmt-core/tests/source/issue-2896.rs similarity index 100% rename from tests/source/issue-2896.rs rename to rustfmt-core/tests/source/issue-2896.rs diff --git a/tests/source/issue-2917/packed_simd.rs b/rustfmt-core/tests/source/issue-2917/packed_simd.rs similarity index 100% rename from tests/source/issue-2917/packed_simd.rs rename to rustfmt-core/tests/source/issue-2917/packed_simd.rs diff --git a/tests/source/issue-2922.rs b/rustfmt-core/tests/source/issue-2922.rs similarity index 100% rename from tests/source/issue-2922.rs rename to rustfmt-core/tests/source/issue-2922.rs diff --git a/tests/source/issue-2927-2.rs b/rustfmt-core/tests/source/issue-2927-2.rs similarity index 100% rename from tests/source/issue-2927-2.rs rename to rustfmt-core/tests/source/issue-2927-2.rs diff --git a/tests/source/issue-2927.rs b/rustfmt-core/tests/source/issue-2927.rs similarity index 100% rename from tests/source/issue-2927.rs rename to rustfmt-core/tests/source/issue-2927.rs diff --git a/tests/source/issue-2930.rs b/rustfmt-core/tests/source/issue-2930.rs similarity index 100% rename from tests/source/issue-2930.rs rename to rustfmt-core/tests/source/issue-2930.rs diff --git a/tests/source/issue-2936.rs b/rustfmt-core/tests/source/issue-2936.rs similarity index 100% rename from tests/source/issue-2936.rs rename to rustfmt-core/tests/source/issue-2936.rs diff --git a/tests/source/issue-2955.rs b/rustfmt-core/tests/source/issue-2955.rs similarity index 100% rename from tests/source/issue-2955.rs rename to rustfmt-core/tests/source/issue-2955.rs diff --git a/tests/source/issue-2973.rs b/rustfmt-core/tests/source/issue-2973.rs similarity index 100% rename from tests/source/issue-2973.rs rename to rustfmt-core/tests/source/issue-2973.rs diff --git a/tests/source/issue-2977/impl.rs b/rustfmt-core/tests/source/issue-2977/impl.rs similarity index 100% rename from tests/source/issue-2977/impl.rs rename to rustfmt-core/tests/source/issue-2977/impl.rs diff --git a/tests/source/issue-2977/trait.rs b/rustfmt-core/tests/source/issue-2977/trait.rs similarity index 100% rename from tests/source/issue-2977/trait.rs rename to rustfmt-core/tests/source/issue-2977/trait.rs diff --git a/tests/source/issue-2985.rs b/rustfmt-core/tests/source/issue-2985.rs similarity index 100% rename from tests/source/issue-2985.rs rename to rustfmt-core/tests/source/issue-2985.rs diff --git a/tests/source/issue-2995.rs b/rustfmt-core/tests/source/issue-2995.rs similarity index 100% rename from tests/source/issue-2995.rs rename to rustfmt-core/tests/source/issue-2995.rs diff --git a/tests/source/issue-3029.rs b/rustfmt-core/tests/source/issue-3029.rs similarity index 100% rename from tests/source/issue-3029.rs rename to rustfmt-core/tests/source/issue-3029.rs diff --git a/tests/source/issue-3038.rs b/rustfmt-core/tests/source/issue-3038.rs similarity index 100% rename from tests/source/issue-3038.rs rename to rustfmt-core/tests/source/issue-3038.rs diff --git a/tests/source/issue-3049.rs b/rustfmt-core/tests/source/issue-3049.rs similarity index 100% rename from tests/source/issue-3049.rs rename to rustfmt-core/tests/source/issue-3049.rs diff --git a/tests/source/issue-3055/original.rs b/rustfmt-core/tests/source/issue-3055/original.rs similarity index 100% rename from tests/source/issue-3055/original.rs rename to rustfmt-core/tests/source/issue-3055/original.rs diff --git a/tests/source/issue-3059.rs b/rustfmt-core/tests/source/issue-3059.rs similarity index 100% rename from tests/source/issue-3059.rs rename to rustfmt-core/tests/source/issue-3059.rs diff --git a/tests/source/issue-3066.rs b/rustfmt-core/tests/source/issue-3066.rs similarity index 100% rename from tests/source/issue-3066.rs rename to rustfmt-core/tests/source/issue-3066.rs diff --git a/tests/source/issue-3131.rs b/rustfmt-core/tests/source/issue-3131.rs similarity index 100% rename from tests/source/issue-3131.rs rename to rustfmt-core/tests/source/issue-3131.rs diff --git a/tests/source/issue-3153.rs b/rustfmt-core/tests/source/issue-3153.rs similarity index 100% rename from tests/source/issue-3153.rs rename to rustfmt-core/tests/source/issue-3153.rs diff --git a/tests/source/issue-3170.rs b/rustfmt-core/tests/source/issue-3170.rs similarity index 100% rename from tests/source/issue-3170.rs rename to rustfmt-core/tests/source/issue-3170.rs diff --git a/tests/source/issue-3194.rs b/rustfmt-core/tests/source/issue-3194.rs similarity index 100% rename from tests/source/issue-3194.rs rename to rustfmt-core/tests/source/issue-3194.rs diff --git a/tests/source/issue-3198.rs b/rustfmt-core/tests/source/issue-3198.rs similarity index 100% rename from tests/source/issue-3198.rs rename to rustfmt-core/tests/source/issue-3198.rs diff --git a/tests/source/issue-3213/version_two.rs b/rustfmt-core/tests/source/issue-3213/version_two.rs similarity index 100% rename from tests/source/issue-3213/version_two.rs rename to rustfmt-core/tests/source/issue-3213/version_two.rs diff --git a/tests/source/issue-3217.rs b/rustfmt-core/tests/source/issue-3217.rs similarity index 100% rename from tests/source/issue-3217.rs rename to rustfmt-core/tests/source/issue-3217.rs diff --git a/tests/source/issue-3227/two.rs b/rustfmt-core/tests/source/issue-3227/two.rs similarity index 100% rename from tests/source/issue-3227/two.rs rename to rustfmt-core/tests/source/issue-3227/two.rs diff --git a/tests/source/issue-3234.rs b/rustfmt-core/tests/source/issue-3234.rs similarity index 100% rename from tests/source/issue-3234.rs rename to rustfmt-core/tests/source/issue-3234.rs diff --git a/tests/source/issue-3241.rs b/rustfmt-core/tests/source/issue-3241.rs similarity index 100% rename from tests/source/issue-3241.rs rename to rustfmt-core/tests/source/issue-3241.rs diff --git a/tests/source/issue-3253/bar.rs b/rustfmt-core/tests/source/issue-3253/bar.rs similarity index 100% rename from tests/source/issue-3253/bar.rs rename to rustfmt-core/tests/source/issue-3253/bar.rs diff --git a/tests/source/issue-3253/foo.rs b/rustfmt-core/tests/source/issue-3253/foo.rs similarity index 100% rename from tests/source/issue-3253/foo.rs rename to rustfmt-core/tests/source/issue-3253/foo.rs diff --git a/tests/source/issue-3253/lib.rs b/rustfmt-core/tests/source/issue-3253/lib.rs similarity index 100% rename from tests/source/issue-3253/lib.rs rename to rustfmt-core/tests/source/issue-3253/lib.rs diff --git a/tests/source/issue-3253/paths/bar_foo.rs b/rustfmt-core/tests/source/issue-3253/paths/bar_foo.rs similarity index 100% rename from tests/source/issue-3253/paths/bar_foo.rs rename to rustfmt-core/tests/source/issue-3253/paths/bar_foo.rs diff --git a/tests/source/issue-3253/paths/excluded.rs b/rustfmt-core/tests/source/issue-3253/paths/excluded.rs similarity index 100% rename from tests/source/issue-3253/paths/excluded.rs rename to rustfmt-core/tests/source/issue-3253/paths/excluded.rs diff --git a/tests/source/issue-3253/paths/foo_bar.rs b/rustfmt-core/tests/source/issue-3253/paths/foo_bar.rs similarity index 100% rename from tests/source/issue-3253/paths/foo_bar.rs rename to rustfmt-core/tests/source/issue-3253/paths/foo_bar.rs diff --git a/tests/source/issue-3265.rs b/rustfmt-core/tests/source/issue-3265.rs similarity index 100% rename from tests/source/issue-3265.rs rename to rustfmt-core/tests/source/issue-3265.rs diff --git a/tests/source/issue-3270/two.rs b/rustfmt-core/tests/source/issue-3270/two.rs similarity index 100% rename from tests/source/issue-3270/two.rs rename to rustfmt-core/tests/source/issue-3270/two.rs diff --git a/tests/source/issue-3272/v2.rs b/rustfmt-core/tests/source/issue-3272/v2.rs similarity index 100% rename from tests/source/issue-3272/v2.rs rename to rustfmt-core/tests/source/issue-3272/v2.rs diff --git a/tests/source/issue-3278/version_two.rs b/rustfmt-core/tests/source/issue-3278/version_two.rs similarity index 100% rename from tests/source/issue-3278/version_two.rs rename to rustfmt-core/tests/source/issue-3278/version_two.rs diff --git a/tests/source/issue-3295/two.rs b/rustfmt-core/tests/source/issue-3295/two.rs similarity index 100% rename from tests/source/issue-3295/two.rs rename to rustfmt-core/tests/source/issue-3295/two.rs diff --git a/tests/source/issue-3302.rs b/rustfmt-core/tests/source/issue-3302.rs similarity index 100% rename from tests/source/issue-3302.rs rename to rustfmt-core/tests/source/issue-3302.rs diff --git a/tests/source/issue-3343.rs b/rustfmt-core/tests/source/issue-3343.rs similarity index 100% rename from tests/source/issue-3343.rs rename to rustfmt-core/tests/source/issue-3343.rs diff --git a/tests/source/issue-3423.rs b/rustfmt-core/tests/source/issue-3423.rs similarity index 100% rename from tests/source/issue-3423.rs rename to rustfmt-core/tests/source/issue-3423.rs diff --git a/tests/source/issue-3434/lib.rs b/rustfmt-core/tests/source/issue-3434/lib.rs similarity index 100% rename from tests/source/issue-3434/lib.rs rename to rustfmt-core/tests/source/issue-3434/lib.rs diff --git a/tests/source/issue-3434/no_entry.rs b/rustfmt-core/tests/source/issue-3434/no_entry.rs similarity index 100% rename from tests/source/issue-3434/no_entry.rs rename to rustfmt-core/tests/source/issue-3434/no_entry.rs diff --git a/tests/source/issue-3434/not_skip_macro.rs b/rustfmt-core/tests/source/issue-3434/not_skip_macro.rs similarity index 100% rename from tests/source/issue-3434/not_skip_macro.rs rename to rustfmt-core/tests/source/issue-3434/not_skip_macro.rs diff --git a/tests/source/issue-3465.rs b/rustfmt-core/tests/source/issue-3465.rs similarity index 100% rename from tests/source/issue-3465.rs rename to rustfmt-core/tests/source/issue-3465.rs diff --git a/tests/source/issue-3494/crlf.rs b/rustfmt-core/tests/source/issue-3494/crlf.rs similarity index 100% rename from tests/source/issue-3494/crlf.rs rename to rustfmt-core/tests/source/issue-3494/crlf.rs diff --git a/tests/source/issue-3494/lf.rs b/rustfmt-core/tests/source/issue-3494/lf.rs similarity index 100% rename from tests/source/issue-3494/lf.rs rename to rustfmt-core/tests/source/issue-3494/lf.rs diff --git a/tests/source/issue-3508.rs b/rustfmt-core/tests/source/issue-3508.rs similarity index 100% rename from tests/source/issue-3508.rs rename to rustfmt-core/tests/source/issue-3508.rs diff --git a/tests/source/issue-3515.rs b/rustfmt-core/tests/source/issue-3515.rs similarity index 100% rename from tests/source/issue-3515.rs rename to rustfmt-core/tests/source/issue-3515.rs diff --git a/tests/source/issue-3532.rs b/rustfmt-core/tests/source/issue-3532.rs similarity index 100% rename from tests/source/issue-3532.rs rename to rustfmt-core/tests/source/issue-3532.rs diff --git a/tests/source/issue-3585/extern_crate.rs b/rustfmt-core/tests/source/issue-3585/extern_crate.rs similarity index 100% rename from tests/source/issue-3585/extern_crate.rs rename to rustfmt-core/tests/source/issue-3585/extern_crate.rs diff --git a/tests/source/issue-3585/reorder_imports_disabled.rs b/rustfmt-core/tests/source/issue-3585/reorder_imports_disabled.rs similarity index 100% rename from tests/source/issue-3585/reorder_imports_disabled.rs rename to rustfmt-core/tests/source/issue-3585/reorder_imports_disabled.rs diff --git a/tests/source/issue-3585/reorder_imports_enabled.rs b/rustfmt-core/tests/source/issue-3585/reorder_imports_enabled.rs similarity index 100% rename from tests/source/issue-3585/reorder_imports_enabled.rs rename to rustfmt-core/tests/source/issue-3585/reorder_imports_enabled.rs diff --git a/tests/source/issue-3585/use.rs b/rustfmt-core/tests/source/issue-3585/use.rs similarity index 100% rename from tests/source/issue-3585/use.rs rename to rustfmt-core/tests/source/issue-3585/use.rs diff --git a/tests/source/issue-3636.rs b/rustfmt-core/tests/source/issue-3636.rs similarity index 100% rename from tests/source/issue-3636.rs rename to rustfmt-core/tests/source/issue-3636.rs diff --git a/tests/source/issue-3639.rs b/rustfmt-core/tests/source/issue-3639.rs similarity index 100% rename from tests/source/issue-3639.rs rename to rustfmt-core/tests/source/issue-3639.rs diff --git a/tests/source/issue-3651.rs b/rustfmt-core/tests/source/issue-3651.rs similarity index 100% rename from tests/source/issue-3651.rs rename to rustfmt-core/tests/source/issue-3651.rs diff --git a/tests/source/issue-3665/lib.rs b/rustfmt-core/tests/source/issue-3665/lib.rs similarity index 100% rename from tests/source/issue-3665/lib.rs rename to rustfmt-core/tests/source/issue-3665/lib.rs diff --git a/tests/source/issue-3665/not_skip_attribute.rs b/rustfmt-core/tests/source/issue-3665/not_skip_attribute.rs similarity index 100% rename from tests/source/issue-3665/not_skip_attribute.rs rename to rustfmt-core/tests/source/issue-3665/not_skip_attribute.rs diff --git a/tests/source/issue-3665/sub_mod.rs b/rustfmt-core/tests/source/issue-3665/sub_mod.rs similarity index 100% rename from tests/source/issue-3665/sub_mod.rs rename to rustfmt-core/tests/source/issue-3665/sub_mod.rs diff --git a/tests/source/issue-3672.rs b/rustfmt-core/tests/source/issue-3672.rs similarity index 100% rename from tests/source/issue-3672.rs rename to rustfmt-core/tests/source/issue-3672.rs diff --git a/tests/source/issue-3675.rs b/rustfmt-core/tests/source/issue-3675.rs similarity index 100% rename from tests/source/issue-3675.rs rename to rustfmt-core/tests/source/issue-3675.rs diff --git a/tests/source/issue-3701/two.rs b/rustfmt-core/tests/source/issue-3701/two.rs similarity index 100% rename from tests/source/issue-3701/two.rs rename to rustfmt-core/tests/source/issue-3701/two.rs diff --git a/tests/source/issue-3709.rs b/rustfmt-core/tests/source/issue-3709.rs similarity index 100% rename from tests/source/issue-3709.rs rename to rustfmt-core/tests/source/issue-3709.rs diff --git a/tests/source/issue-3740.rs b/rustfmt-core/tests/source/issue-3740.rs similarity index 100% rename from tests/source/issue-3740.rs rename to rustfmt-core/tests/source/issue-3740.rs diff --git a/tests/source/issue-3750.rs b/rustfmt-core/tests/source/issue-3750.rs similarity index 100% rename from tests/source/issue-3750.rs rename to rustfmt-core/tests/source/issue-3750.rs diff --git a/tests/source/issue-3751.rs b/rustfmt-core/tests/source/issue-3751.rs similarity index 100% rename from tests/source/issue-3751.rs rename to rustfmt-core/tests/source/issue-3751.rs diff --git a/tests/source/issue-3779/ice.rs b/rustfmt-core/tests/source/issue-3779/ice.rs similarity index 100% rename from tests/source/issue-3779/ice.rs rename to rustfmt-core/tests/source/issue-3779/ice.rs diff --git a/tests/source/issue-3779/lib.rs b/rustfmt-core/tests/source/issue-3779/lib.rs similarity index 100% rename from tests/source/issue-3779/lib.rs rename to rustfmt-core/tests/source/issue-3779/lib.rs diff --git a/tests/source/issue-3786.rs b/rustfmt-core/tests/source/issue-3786.rs similarity index 100% rename from tests/source/issue-3786.rs rename to rustfmt-core/tests/source/issue-3786.rs diff --git a/tests/source/issue-3787.rs b/rustfmt-core/tests/source/issue-3787.rs similarity index 100% rename from tests/source/issue-3787.rs rename to rustfmt-core/tests/source/issue-3787.rs diff --git a/tests/source/issue-3840/version-two_hard-tabs.rs b/rustfmt-core/tests/source/issue-3840/version-two_hard-tabs.rs similarity index 100% rename from tests/source/issue-3840/version-two_hard-tabs.rs rename to rustfmt-core/tests/source/issue-3840/version-two_hard-tabs.rs diff --git a/tests/source/issue-3840/version-two_soft-tabs.rs b/rustfmt-core/tests/source/issue-3840/version-two_soft-tabs.rs similarity index 100% rename from tests/source/issue-3840/version-two_soft-tabs.rs rename to rustfmt-core/tests/source/issue-3840/version-two_soft-tabs.rs diff --git a/tests/source/issue-3851.rs b/rustfmt-core/tests/source/issue-3851.rs similarity index 100% rename from tests/source/issue-3851.rs rename to rustfmt-core/tests/source/issue-3851.rs diff --git a/tests/source/issue-3904/two.rs b/rustfmt-core/tests/source/issue-3904/two.rs similarity index 100% rename from tests/source/issue-3904/two.rs rename to rustfmt-core/tests/source/issue-3904/two.rs diff --git a/tests/source/issue-3908.rs b/rustfmt-core/tests/source/issue-3908.rs similarity index 100% rename from tests/source/issue-3908.rs rename to rustfmt-core/tests/source/issue-3908.rs diff --git a/tests/source/issue-3923.rs b/rustfmt-core/tests/source/issue-3923.rs similarity index 100% rename from tests/source/issue-3923.rs rename to rustfmt-core/tests/source/issue-3923.rs diff --git a/tests/source/issue-3929.rs b/rustfmt-core/tests/source/issue-3929.rs similarity index 100% rename from tests/source/issue-3929.rs rename to rustfmt-core/tests/source/issue-3929.rs diff --git a/tests/source/issue-3933/imp-a.rs b/rustfmt-core/tests/source/issue-3933/imp-a.rs similarity index 100% rename from tests/source/issue-3933/imp-a.rs rename to rustfmt-core/tests/source/issue-3933/imp-a.rs diff --git a/tests/source/issue-3933/imp-b.rs b/rustfmt-core/tests/source/issue-3933/imp-b.rs similarity index 100% rename from tests/source/issue-3933/imp-b.rs rename to rustfmt-core/tests/source/issue-3933/imp-b.rs diff --git a/tests/source/issue-3933/lib.rs b/rustfmt-core/tests/source/issue-3933/lib.rs similarity index 100% rename from tests/source/issue-3933/lib.rs rename to rustfmt-core/tests/source/issue-3933/lib.rs diff --git a/tests/source/issue-3933/utils.rs b/rustfmt-core/tests/source/issue-3933/utils.rs similarity index 100% rename from tests/source/issue-3933/utils.rs rename to rustfmt-core/tests/source/issue-3933/utils.rs diff --git a/tests/source/issue-447.rs b/rustfmt-core/tests/source/issue-447.rs similarity index 100% rename from tests/source/issue-447.rs rename to rustfmt-core/tests/source/issue-447.rs diff --git a/tests/source/issue-510.rs b/rustfmt-core/tests/source/issue-510.rs similarity index 100% rename from tests/source/issue-510.rs rename to rustfmt-core/tests/source/issue-510.rs diff --git a/tests/source/issue-539.rs b/rustfmt-core/tests/source/issue-539.rs similarity index 100% rename from tests/source/issue-539.rs rename to rustfmt-core/tests/source/issue-539.rs diff --git a/tests/source/issue-683.rs b/rustfmt-core/tests/source/issue-683.rs similarity index 100% rename from tests/source/issue-683.rs rename to rustfmt-core/tests/source/issue-683.rs diff --git a/tests/source/issue-811.rs b/rustfmt-core/tests/source/issue-811.rs similarity index 100% rename from tests/source/issue-811.rs rename to rustfmt-core/tests/source/issue-811.rs diff --git a/tests/source/issue-850.rs b/rustfmt-core/tests/source/issue-850.rs similarity index 100% rename from tests/source/issue-850.rs rename to rustfmt-core/tests/source/issue-850.rs diff --git a/tests/source/issue-855.rs b/rustfmt-core/tests/source/issue-855.rs similarity index 100% rename from tests/source/issue-855.rs rename to rustfmt-core/tests/source/issue-855.rs diff --git a/tests/source/issue-913.rs b/rustfmt-core/tests/source/issue-913.rs similarity index 100% rename from tests/source/issue-913.rs rename to rustfmt-core/tests/source/issue-913.rs diff --git a/tests/source/issue-945.rs b/rustfmt-core/tests/source/issue-945.rs similarity index 100% rename from tests/source/issue-945.rs rename to rustfmt-core/tests/source/issue-945.rs diff --git a/tests/source/issue-977.rs b/rustfmt-core/tests/source/issue-977.rs similarity index 100% rename from tests/source/issue-977.rs rename to rustfmt-core/tests/source/issue-977.rs diff --git a/tests/source/issue_3839.rs b/rustfmt-core/tests/source/issue_3839.rs similarity index 100% rename from tests/source/issue_3839.rs rename to rustfmt-core/tests/source/issue_3839.rs diff --git a/tests/source/issue_3844.rs b/rustfmt-core/tests/source/issue_3844.rs similarity index 100% rename from tests/source/issue_3844.rs rename to rustfmt-core/tests/source/issue_3844.rs diff --git a/tests/source/issue_3853.rs b/rustfmt-core/tests/source/issue_3853.rs similarity index 100% rename from tests/source/issue_3853.rs rename to rustfmt-core/tests/source/issue_3853.rs diff --git a/tests/source/issue_3868.rs b/rustfmt-core/tests/source/issue_3868.rs similarity index 100% rename from tests/source/issue_3868.rs rename to rustfmt-core/tests/source/issue_3868.rs diff --git a/tests/source/item-brace-style-always-next-line.rs b/rustfmt-core/tests/source/item-brace-style-always-next-line.rs similarity index 100% rename from tests/source/item-brace-style-always-next-line.rs rename to rustfmt-core/tests/source/item-brace-style-always-next-line.rs diff --git a/tests/source/item-brace-style-prefer-same-line.rs b/rustfmt-core/tests/source/item-brace-style-prefer-same-line.rs similarity index 100% rename from tests/source/item-brace-style-prefer-same-line.rs rename to rustfmt-core/tests/source/item-brace-style-prefer-same-line.rs diff --git a/tests/source/item-brace-style-same-line-where.rs b/rustfmt-core/tests/source/item-brace-style-same-line-where.rs similarity index 100% rename from tests/source/item-brace-style-same-line-where.rs rename to rustfmt-core/tests/source/item-brace-style-same-line-where.rs diff --git a/tests/source/itemized-blocks/no_wrap.rs b/rustfmt-core/tests/source/itemized-blocks/no_wrap.rs similarity index 100% rename from tests/source/itemized-blocks/no_wrap.rs rename to rustfmt-core/tests/source/itemized-blocks/no_wrap.rs diff --git a/tests/source/itemized-blocks/rewrite_fail.rs b/rustfmt-core/tests/source/itemized-blocks/rewrite_fail.rs similarity index 100% rename from tests/source/itemized-blocks/rewrite_fail.rs rename to rustfmt-core/tests/source/itemized-blocks/rewrite_fail.rs diff --git a/tests/source/itemized-blocks/urls.rs b/rustfmt-core/tests/source/itemized-blocks/urls.rs similarity index 100% rename from tests/source/itemized-blocks/urls.rs rename to rustfmt-core/tests/source/itemized-blocks/urls.rs diff --git a/tests/source/itemized-blocks/wrap.rs b/rustfmt-core/tests/source/itemized-blocks/wrap.rs similarity index 100% rename from tests/source/itemized-blocks/wrap.rs rename to rustfmt-core/tests/source/itemized-blocks/wrap.rs diff --git a/tests/source/label_break.rs b/rustfmt-core/tests/source/label_break.rs similarity index 100% rename from tests/source/label_break.rs rename to rustfmt-core/tests/source/label_break.rs diff --git a/tests/source/large-block.rs b/rustfmt-core/tests/source/large-block.rs similarity index 100% rename from tests/source/large-block.rs rename to rustfmt-core/tests/source/large-block.rs diff --git a/tests/source/large_vec.rs b/rustfmt-core/tests/source/large_vec.rs similarity index 100% rename from tests/source/large_vec.rs rename to rustfmt-core/tests/source/large_vec.rs diff --git a/tests/source/lazy_static.rs b/rustfmt-core/tests/source/lazy_static.rs similarity index 100% rename from tests/source/lazy_static.rs rename to rustfmt-core/tests/source/lazy_static.rs diff --git a/tests/source/license-templates/empty_license_path.rs b/rustfmt-core/tests/source/license-templates/empty_license_path.rs similarity index 100% rename from tests/source/license-templates/empty_license_path.rs rename to rustfmt-core/tests/source/license-templates/empty_license_path.rs diff --git a/tests/source/license-templates/license.rs b/rustfmt-core/tests/source/license-templates/license.rs similarity index 100% rename from tests/source/license-templates/license.rs rename to rustfmt-core/tests/source/license-templates/license.rs diff --git a/tests/source/long-fn-1/version_two.rs b/rustfmt-core/tests/source/long-fn-1/version_two.rs similarity index 100% rename from tests/source/long-fn-1/version_two.rs rename to rustfmt-core/tests/source/long-fn-1/version_two.rs diff --git a/tests/source/long-match-arms-brace-newline.rs b/rustfmt-core/tests/source/long-match-arms-brace-newline.rs similarity index 100% rename from tests/source/long-match-arms-brace-newline.rs rename to rustfmt-core/tests/source/long-match-arms-brace-newline.rs diff --git a/tests/source/long-use-statement-issue-3154.rs b/rustfmt-core/tests/source/long-use-statement-issue-3154.rs similarity index 100% rename from tests/source/long-use-statement-issue-3154.rs rename to rustfmt-core/tests/source/long-use-statement-issue-3154.rs diff --git a/tests/source/long_field_access.rs b/rustfmt-core/tests/source/long_field_access.rs similarity index 100% rename from tests/source/long_field_access.rs rename to rustfmt-core/tests/source/long_field_access.rs diff --git a/tests/source/loop.rs b/rustfmt-core/tests/source/loop.rs similarity index 100% rename from tests/source/loop.rs rename to rustfmt-core/tests/source/loop.rs diff --git a/tests/source/macro_not_expr.rs b/rustfmt-core/tests/source/macro_not_expr.rs similarity index 100% rename from tests/source/macro_not_expr.rs rename to rustfmt-core/tests/source/macro_not_expr.rs diff --git a/tests/source/macro_rules.rs b/rustfmt-core/tests/source/macro_rules.rs similarity index 100% rename from tests/source/macro_rules.rs rename to rustfmt-core/tests/source/macro_rules.rs diff --git a/tests/source/macros.rs b/rustfmt-core/tests/source/macros.rs similarity index 100% rename from tests/source/macros.rs rename to rustfmt-core/tests/source/macros.rs diff --git a/tests/source/markdown-comment-with-options.rs b/rustfmt-core/tests/source/markdown-comment-with-options.rs similarity index 100% rename from tests/source/markdown-comment-with-options.rs rename to rustfmt-core/tests/source/markdown-comment-with-options.rs diff --git a/tests/source/markdown-comment.rs b/rustfmt-core/tests/source/markdown-comment.rs similarity index 100% rename from tests/source/markdown-comment.rs rename to rustfmt-core/tests/source/markdown-comment.rs diff --git a/tests/source/match-block-trailing-comma.rs b/rustfmt-core/tests/source/match-block-trailing-comma.rs similarity index 100% rename from tests/source/match-block-trailing-comma.rs rename to rustfmt-core/tests/source/match-block-trailing-comma.rs diff --git a/tests/source/match-flattening.rs b/rustfmt-core/tests/source/match-flattening.rs similarity index 100% rename from tests/source/match-flattening.rs rename to rustfmt-core/tests/source/match-flattening.rs diff --git a/tests/source/match-nowrap-trailing-comma.rs b/rustfmt-core/tests/source/match-nowrap-trailing-comma.rs similarity index 100% rename from tests/source/match-nowrap-trailing-comma.rs rename to rustfmt-core/tests/source/match-nowrap-trailing-comma.rs diff --git a/tests/source/match-nowrap.rs b/rustfmt-core/tests/source/match-nowrap.rs similarity index 100% rename from tests/source/match-nowrap.rs rename to rustfmt-core/tests/source/match-nowrap.rs diff --git a/tests/source/match.rs b/rustfmt-core/tests/source/match.rs similarity index 100% rename from tests/source/match.rs rename to rustfmt-core/tests/source/match.rs diff --git a/tests/source/match_overflow_expr.rs b/rustfmt-core/tests/source/match_overflow_expr.rs similarity index 100% rename from tests/source/match_overflow_expr.rs rename to rustfmt-core/tests/source/match_overflow_expr.rs diff --git a/tests/source/max-line-length-in-chars.rs b/rustfmt-core/tests/source/max-line-length-in-chars.rs similarity index 100% rename from tests/source/max-line-length-in-chars.rs rename to rustfmt-core/tests/source/max-line-length-in-chars.rs diff --git a/tests/source/merge_imports.rs b/rustfmt-core/tests/source/merge_imports.rs similarity index 100% rename from tests/source/merge_imports.rs rename to rustfmt-core/tests/source/merge_imports.rs diff --git a/tests/source/mod-1.rs b/rustfmt-core/tests/source/mod-1.rs similarity index 100% rename from tests/source/mod-1.rs rename to rustfmt-core/tests/source/mod-1.rs diff --git a/tests/source/mod-2.rs b/rustfmt-core/tests/source/mod-2.rs similarity index 100% rename from tests/source/mod-2.rs rename to rustfmt-core/tests/source/mod-2.rs diff --git a/tests/source/mod_skip_child.rs b/rustfmt-core/tests/source/mod_skip_child.rs similarity index 100% rename from tests/source/mod_skip_child.rs rename to rustfmt-core/tests/source/mod_skip_child.rs diff --git a/tests/source/multiple.rs b/rustfmt-core/tests/source/multiple.rs similarity index 100% rename from tests/source/multiple.rs rename to rustfmt-core/tests/source/multiple.rs diff --git a/tests/source/nested-if-else.rs b/rustfmt-core/tests/source/nested-if-else.rs similarity index 100% rename from tests/source/nested-if-else.rs rename to rustfmt-core/tests/source/nested-if-else.rs diff --git a/tests/source/nested_skipped/mod.rs b/rustfmt-core/tests/source/nested_skipped/mod.rs similarity index 100% rename from tests/source/nested_skipped/mod.rs rename to rustfmt-core/tests/source/nested_skipped/mod.rs diff --git a/tests/source/nestedmod/mod.rs b/rustfmt-core/tests/source/nestedmod/mod.rs similarity index 100% rename from tests/source/nestedmod/mod.rs rename to rustfmt-core/tests/source/nestedmod/mod.rs diff --git a/tests/source/nestedmod/mod2a.rs b/rustfmt-core/tests/source/nestedmod/mod2a.rs similarity index 100% rename from tests/source/nestedmod/mod2a.rs rename to rustfmt-core/tests/source/nestedmod/mod2a.rs diff --git a/tests/source/nestedmod/mod2b.rs b/rustfmt-core/tests/source/nestedmod/mod2b.rs similarity index 100% rename from tests/source/nestedmod/mod2b.rs rename to rustfmt-core/tests/source/nestedmod/mod2b.rs diff --git a/tests/source/nestedmod/mod2c.rs b/rustfmt-core/tests/source/nestedmod/mod2c.rs similarity index 100% rename from tests/source/nestedmod/mod2c.rs rename to rustfmt-core/tests/source/nestedmod/mod2c.rs diff --git a/tests/source/nestedmod/mymod1/mod3a.rs b/rustfmt-core/tests/source/nestedmod/mymod1/mod3a.rs similarity index 100% rename from tests/source/nestedmod/mymod1/mod3a.rs rename to rustfmt-core/tests/source/nestedmod/mymod1/mod3a.rs diff --git a/tests/source/nestedmod/submod2/a.rs b/rustfmt-core/tests/source/nestedmod/submod2/a.rs similarity index 100% rename from tests/source/nestedmod/submod2/a.rs rename to rustfmt-core/tests/source/nestedmod/submod2/a.rs diff --git a/tests/source/nestedmod/submod2/mod.rs b/rustfmt-core/tests/source/nestedmod/submod2/mod.rs similarity index 100% rename from tests/source/nestedmod/submod2/mod.rs rename to rustfmt-core/tests/source/nestedmod/submod2/mod.rs diff --git a/tests/source/no_arg_with_commnet.rs b/rustfmt-core/tests/source/no_arg_with_commnet.rs similarity index 100% rename from tests/source/no_arg_with_commnet.rs rename to rustfmt-core/tests/source/no_arg_with_commnet.rs diff --git a/tests/source/no_new_line_beginning.rs b/rustfmt-core/tests/source/no_new_line_beginning.rs similarity index 100% rename from tests/source/no_new_line_beginning.rs rename to rustfmt-core/tests/source/no_new_line_beginning.rs diff --git a/tests/source/normalize_doc_attributes_should_not_imply_format_doc_comments.rs b/rustfmt-core/tests/source/normalize_doc_attributes_should_not_imply_format_doc_comments.rs similarity index 100% rename from tests/source/normalize_doc_attributes_should_not_imply_format_doc_comments.rs rename to rustfmt-core/tests/source/normalize_doc_attributes_should_not_imply_format_doc_comments.rs diff --git a/tests/source/normalize_multiline_doc_attribute.rs b/rustfmt-core/tests/source/normalize_multiline_doc_attribute.rs similarity index 100% rename from tests/source/normalize_multiline_doc_attribute.rs rename to rustfmt-core/tests/source/normalize_multiline_doc_attribute.rs diff --git a/tests/source/one_line_if_v2.rs b/rustfmt-core/tests/source/one_line_if_v2.rs similarity index 100% rename from tests/source/one_line_if_v2.rs rename to rustfmt-core/tests/source/one_line_if_v2.rs diff --git a/tests/source/other.rs b/rustfmt-core/tests/source/other.rs similarity index 100% rename from tests/source/other.rs rename to rustfmt-core/tests/source/other.rs diff --git a/tests/source/paren.rs b/rustfmt-core/tests/source/paren.rs similarity index 100% rename from tests/source/paren.rs rename to rustfmt-core/tests/source/paren.rs diff --git a/tests/source/path_clarity/foo.rs b/rustfmt-core/tests/source/path_clarity/foo.rs similarity index 100% rename from tests/source/path_clarity/foo.rs rename to rustfmt-core/tests/source/path_clarity/foo.rs diff --git a/tests/source/path_clarity/foo/bar.rs b/rustfmt-core/tests/source/path_clarity/foo/bar.rs similarity index 100% rename from tests/source/path_clarity/foo/bar.rs rename to rustfmt-core/tests/source/path_clarity/foo/bar.rs diff --git a/tests/source/paths.rs b/rustfmt-core/tests/source/paths.rs similarity index 100% rename from tests/source/paths.rs rename to rustfmt-core/tests/source/paths.rs diff --git a/tests/source/pattern-condense-wildcards.rs b/rustfmt-core/tests/source/pattern-condense-wildcards.rs similarity index 100% rename from tests/source/pattern-condense-wildcards.rs rename to rustfmt-core/tests/source/pattern-condense-wildcards.rs diff --git a/tests/source/pattern.rs b/rustfmt-core/tests/source/pattern.rs similarity index 100% rename from tests/source/pattern.rs rename to rustfmt-core/tests/source/pattern.rs diff --git a/tests/source/preserves_carriage_return_for_unix.rs b/rustfmt-core/tests/source/preserves_carriage_return_for_unix.rs similarity index 100% rename from tests/source/preserves_carriage_return_for_unix.rs rename to rustfmt-core/tests/source/preserves_carriage_return_for_unix.rs diff --git a/tests/source/preserves_carriage_return_for_windows.rs b/rustfmt-core/tests/source/preserves_carriage_return_for_windows.rs similarity index 100% rename from tests/source/preserves_carriage_return_for_windows.rs rename to rustfmt-core/tests/source/preserves_carriage_return_for_windows.rs diff --git a/tests/source/pub-restricted.rs b/rustfmt-core/tests/source/pub-restricted.rs similarity index 100% rename from tests/source/pub-restricted.rs rename to rustfmt-core/tests/source/pub-restricted.rs diff --git a/tests/source/remove_blank_lines.rs b/rustfmt-core/tests/source/remove_blank_lines.rs similarity index 100% rename from tests/source/remove_blank_lines.rs rename to rustfmt-core/tests/source/remove_blank_lines.rs diff --git a/tests/source/reorder-impl-items.rs b/rustfmt-core/tests/source/reorder-impl-items.rs similarity index 100% rename from tests/source/reorder-impl-items.rs rename to rustfmt-core/tests/source/reorder-impl-items.rs diff --git a/tests/source/single-line-if-else.rs b/rustfmt-core/tests/source/single-line-if-else.rs similarity index 100% rename from tests/source/single-line-if-else.rs rename to rustfmt-core/tests/source/single-line-if-else.rs diff --git a/tests/source/single-line-macro/v2.rs b/rustfmt-core/tests/source/single-line-macro/v2.rs similarity index 100% rename from tests/source/single-line-macro/v2.rs rename to rustfmt-core/tests/source/single-line-macro/v2.rs diff --git a/tests/source/soft-wrapping.rs b/rustfmt-core/tests/source/soft-wrapping.rs similarity index 100% rename from tests/source/soft-wrapping.rs rename to rustfmt-core/tests/source/soft-wrapping.rs diff --git a/tests/source/space-not-before-newline.rs b/rustfmt-core/tests/source/space-not-before-newline.rs similarity index 100% rename from tests/source/space-not-before-newline.rs rename to rustfmt-core/tests/source/space-not-before-newline.rs diff --git a/tests/source/spaces-around-ranges.rs b/rustfmt-core/tests/source/spaces-around-ranges.rs similarity index 100% rename from tests/source/spaces-around-ranges.rs rename to rustfmt-core/tests/source/spaces-around-ranges.rs diff --git a/tests/source/static.rs b/rustfmt-core/tests/source/static.rs similarity index 100% rename from tests/source/static.rs rename to rustfmt-core/tests/source/static.rs diff --git a/tests/source/string-lit-2.rs b/rustfmt-core/tests/source/string-lit-2.rs similarity index 100% rename from tests/source/string-lit-2.rs rename to rustfmt-core/tests/source/string-lit-2.rs diff --git a/tests/source/string-lit.rs b/rustfmt-core/tests/source/string-lit.rs similarity index 100% rename from tests/source/string-lit.rs rename to rustfmt-core/tests/source/string-lit.rs diff --git a/tests/source/string_punctuation.rs b/rustfmt-core/tests/source/string_punctuation.rs similarity index 100% rename from tests/source/string_punctuation.rs rename to rustfmt-core/tests/source/string_punctuation.rs diff --git a/tests/source/struct-field-attributes.rs b/rustfmt-core/tests/source/struct-field-attributes.rs similarity index 100% rename from tests/source/struct-field-attributes.rs rename to rustfmt-core/tests/source/struct-field-attributes.rs diff --git a/tests/source/struct_lits.rs b/rustfmt-core/tests/source/struct_lits.rs similarity index 100% rename from tests/source/struct_lits.rs rename to rustfmt-core/tests/source/struct_lits.rs diff --git a/tests/source/struct_lits_multiline.rs b/rustfmt-core/tests/source/struct_lits_multiline.rs similarity index 100% rename from tests/source/struct_lits_multiline.rs rename to rustfmt-core/tests/source/struct_lits_multiline.rs diff --git a/tests/source/struct_lits_visual.rs b/rustfmt-core/tests/source/struct_lits_visual.rs similarity index 100% rename from tests/source/struct_lits_visual.rs rename to rustfmt-core/tests/source/struct_lits_visual.rs diff --git a/tests/source/struct_lits_visual_multiline.rs b/rustfmt-core/tests/source/struct_lits_visual_multiline.rs similarity index 100% rename from tests/source/struct_lits_visual_multiline.rs rename to rustfmt-core/tests/source/struct_lits_visual_multiline.rs diff --git a/tests/source/struct_tuple_visual.rs b/rustfmt-core/tests/source/struct_tuple_visual.rs similarity index 100% rename from tests/source/struct_tuple_visual.rs rename to rustfmt-core/tests/source/struct_tuple_visual.rs diff --git a/tests/source/structs.rs b/rustfmt-core/tests/source/structs.rs similarity index 100% rename from tests/source/structs.rs rename to rustfmt-core/tests/source/structs.rs diff --git a/tests/source/trailing-comma-never.rs b/rustfmt-core/tests/source/trailing-comma-never.rs similarity index 100% rename from tests/source/trailing-comma-never.rs rename to rustfmt-core/tests/source/trailing-comma-never.rs diff --git a/tests/source/trailing_commas.rs b/rustfmt-core/tests/source/trailing_commas.rs similarity index 100% rename from tests/source/trailing_commas.rs rename to rustfmt-core/tests/source/trailing_commas.rs diff --git a/tests/source/trailing_comments/hard_tabs.rs b/rustfmt-core/tests/source/trailing_comments/hard_tabs.rs similarity index 100% rename from tests/source/trailing_comments/hard_tabs.rs rename to rustfmt-core/tests/source/trailing_comments/hard_tabs.rs diff --git a/tests/source/trailing_comments/soft_tabs.rs b/rustfmt-core/tests/source/trailing_comments/soft_tabs.rs similarity index 100% rename from tests/source/trailing_comments/soft_tabs.rs rename to rustfmt-core/tests/source/trailing_comments/soft_tabs.rs diff --git a/tests/source/trait.rs b/rustfmt-core/tests/source/trait.rs similarity index 100% rename from tests/source/trait.rs rename to rustfmt-core/tests/source/trait.rs diff --git a/tests/source/trait_2015_edition.rs b/rustfmt-core/tests/source/trait_2015_edition.rs similarity index 100% rename from tests/source/trait_2015_edition.rs rename to rustfmt-core/tests/source/trait_2015_edition.rs diff --git a/tests/source/try-conversion.rs b/rustfmt-core/tests/source/try-conversion.rs similarity index 100% rename from tests/source/try-conversion.rs rename to rustfmt-core/tests/source/try-conversion.rs diff --git a/tests/source/tuple.rs b/rustfmt-core/tests/source/tuple.rs similarity index 100% rename from tests/source/tuple.rs rename to rustfmt-core/tests/source/tuple.rs diff --git a/tests/source/type-ascription.rs b/rustfmt-core/tests/source/type-ascription.rs similarity index 100% rename from tests/source/type-ascription.rs rename to rustfmt-core/tests/source/type-ascription.rs diff --git a/tests/source/type.rs b/rustfmt-core/tests/source/type.rs similarity index 100% rename from tests/source/type.rs rename to rustfmt-core/tests/source/type.rs diff --git a/tests/source/type_alias.rs b/rustfmt-core/tests/source/type_alias.rs similarity index 100% rename from tests/source/type_alias.rs rename to rustfmt-core/tests/source/type_alias.rs diff --git a/tests/source/unicode.rs b/rustfmt-core/tests/source/unicode.rs similarity index 100% rename from tests/source/unicode.rs rename to rustfmt-core/tests/source/unicode.rs diff --git a/tests/source/unions.rs b/rustfmt-core/tests/source/unions.rs similarity index 100% rename from tests/source/unions.rs rename to rustfmt-core/tests/source/unions.rs diff --git a/tests/source/visibility.rs b/rustfmt-core/tests/source/visibility.rs similarity index 100% rename from tests/source/visibility.rs rename to rustfmt-core/tests/source/visibility.rs diff --git a/tests/source/visual-fn-type.rs b/rustfmt-core/tests/source/visual-fn-type.rs similarity index 100% rename from tests/source/visual-fn-type.rs rename to rustfmt-core/tests/source/visual-fn-type.rs diff --git a/tests/source/where-clause-rfc.rs b/rustfmt-core/tests/source/where-clause-rfc.rs similarity index 100% rename from tests/source/where-clause-rfc.rs rename to rustfmt-core/tests/source/where-clause-rfc.rs diff --git a/tests/source/where-clause.rs b/rustfmt-core/tests/source/where-clause.rs similarity index 100% rename from tests/source/where-clause.rs rename to rustfmt-core/tests/source/where-clause.rs diff --git a/tests/source/width-heuristics.rs b/rustfmt-core/tests/source/width-heuristics.rs similarity index 100% rename from tests/source/width-heuristics.rs rename to rustfmt-core/tests/source/width-heuristics.rs diff --git a/tests/source/wrap_comments_should_not_imply_format_doc_comments.rs b/rustfmt-core/tests/source/wrap_comments_should_not_imply_format_doc_comments.rs similarity index 100% rename from tests/source/wrap_comments_should_not_imply_format_doc_comments.rs rename to rustfmt-core/tests/source/wrap_comments_should_not_imply_format_doc_comments.rs diff --git a/tests/target/alignment_2633/block_style.rs b/rustfmt-core/tests/target/alignment_2633/block_style.rs similarity index 100% rename from tests/target/alignment_2633/block_style.rs rename to rustfmt-core/tests/target/alignment_2633/block_style.rs diff --git a/tests/target/alignment_2633/horizontal_tactic.rs b/rustfmt-core/tests/target/alignment_2633/horizontal_tactic.rs similarity index 100% rename from tests/target/alignment_2633/horizontal_tactic.rs rename to rustfmt-core/tests/target/alignment_2633/horizontal_tactic.rs diff --git a/tests/target/alignment_2633/visual_style.rs b/rustfmt-core/tests/target/alignment_2633/visual_style.rs similarity index 100% rename from tests/target/alignment_2633/visual_style.rs rename to rustfmt-core/tests/target/alignment_2633/visual_style.rs diff --git a/tests/target/array_comment.rs b/rustfmt-core/tests/target/array_comment.rs similarity index 100% rename from tests/target/array_comment.rs rename to rustfmt-core/tests/target/array_comment.rs diff --git a/tests/target/assignment.rs b/rustfmt-core/tests/target/assignment.rs similarity index 100% rename from tests/target/assignment.rs rename to rustfmt-core/tests/target/assignment.rs diff --git a/tests/target/associated-items.rs b/rustfmt-core/tests/target/associated-items.rs similarity index 100% rename from tests/target/associated-items.rs rename to rustfmt-core/tests/target/associated-items.rs diff --git a/tests/target/associated-types-bounds-wrapping.rs b/rustfmt-core/tests/target/associated-types-bounds-wrapping.rs similarity index 100% rename from tests/target/associated-types-bounds-wrapping.rs rename to rustfmt-core/tests/target/associated-types-bounds-wrapping.rs diff --git a/tests/target/associated_type_bounds.rs b/rustfmt-core/tests/target/associated_type_bounds.rs similarity index 100% rename from tests/target/associated_type_bounds.rs rename to rustfmt-core/tests/target/associated_type_bounds.rs diff --git a/tests/target/associated_type_defaults.rs b/rustfmt-core/tests/target/associated_type_defaults.rs similarity index 100% rename from tests/target/associated_type_defaults.rs rename to rustfmt-core/tests/target/associated_type_defaults.rs diff --git a/tests/target/async_block.rs b/rustfmt-core/tests/target/async_block.rs similarity index 100% rename from tests/target/async_block.rs rename to rustfmt-core/tests/target/async_block.rs diff --git a/tests/target/async_closure.rs b/rustfmt-core/tests/target/async_closure.rs similarity index 100% rename from tests/target/async_closure.rs rename to rustfmt-core/tests/target/async_closure.rs diff --git a/tests/target/async_fn.rs b/rustfmt-core/tests/target/async_fn.rs similarity index 100% rename from tests/target/async_fn.rs rename to rustfmt-core/tests/target/async_fn.rs diff --git a/tests/target/attrib-block-expr.rs b/rustfmt-core/tests/target/attrib-block-expr.rs similarity index 100% rename from tests/target/attrib-block-expr.rs rename to rustfmt-core/tests/target/attrib-block-expr.rs diff --git a/tests/target/attrib-extern-crate.rs b/rustfmt-core/tests/target/attrib-extern-crate.rs similarity index 100% rename from tests/target/attrib-extern-crate.rs rename to rustfmt-core/tests/target/attrib-extern-crate.rs diff --git a/tests/target/attrib.rs b/rustfmt-core/tests/target/attrib.rs similarity index 100% rename from tests/target/attrib.rs rename to rustfmt-core/tests/target/attrib.rs diff --git a/tests/target/big-impl-block.rs b/rustfmt-core/tests/target/big-impl-block.rs similarity index 100% rename from tests/target/big-impl-block.rs rename to rustfmt-core/tests/target/big-impl-block.rs diff --git a/tests/target/big-impl-visual.rs b/rustfmt-core/tests/target/big-impl-visual.rs similarity index 100% rename from tests/target/big-impl-visual.rs rename to rustfmt-core/tests/target/big-impl-visual.rs diff --git a/tests/target/binary-expr.rs b/rustfmt-core/tests/target/binary-expr.rs similarity index 100% rename from tests/target/binary-expr.rs rename to rustfmt-core/tests/target/binary-expr.rs diff --git a/tests/target/break-and-continue.rs b/rustfmt-core/tests/target/break-and-continue.rs similarity index 100% rename from tests/target/break-and-continue.rs rename to rustfmt-core/tests/target/break-and-continue.rs diff --git a/tests/target/catch.rs b/rustfmt-core/tests/target/catch.rs similarity index 100% rename from tests/target/catch.rs rename to rustfmt-core/tests/target/catch.rs diff --git a/tests/target/cfg_if/detect/arch/aarch64.rs b/rustfmt-core/tests/target/cfg_if/detect/arch/aarch64.rs similarity index 100% rename from tests/target/cfg_if/detect/arch/aarch64.rs rename to rustfmt-core/tests/target/cfg_if/detect/arch/aarch64.rs diff --git a/tests/target/cfg_if/detect/arch/arm.rs b/rustfmt-core/tests/target/cfg_if/detect/arch/arm.rs similarity index 100% rename from tests/target/cfg_if/detect/arch/arm.rs rename to rustfmt-core/tests/target/cfg_if/detect/arch/arm.rs diff --git a/tests/target/cfg_if/detect/arch/mips.rs b/rustfmt-core/tests/target/cfg_if/detect/arch/mips.rs similarity index 100% rename from tests/target/cfg_if/detect/arch/mips.rs rename to rustfmt-core/tests/target/cfg_if/detect/arch/mips.rs diff --git a/tests/target/cfg_if/detect/arch/mips64.rs b/rustfmt-core/tests/target/cfg_if/detect/arch/mips64.rs similarity index 100% rename from tests/target/cfg_if/detect/arch/mips64.rs rename to rustfmt-core/tests/target/cfg_if/detect/arch/mips64.rs diff --git a/tests/target/cfg_if/detect/arch/powerpc.rs b/rustfmt-core/tests/target/cfg_if/detect/arch/powerpc.rs similarity index 100% rename from tests/target/cfg_if/detect/arch/powerpc.rs rename to rustfmt-core/tests/target/cfg_if/detect/arch/powerpc.rs diff --git a/tests/target/cfg_if/detect/arch/powerpc64.rs b/rustfmt-core/tests/target/cfg_if/detect/arch/powerpc64.rs similarity index 100% rename from tests/target/cfg_if/detect/arch/powerpc64.rs rename to rustfmt-core/tests/target/cfg_if/detect/arch/powerpc64.rs diff --git a/tests/target/cfg_if/detect/arch/x86.rs b/rustfmt-core/tests/target/cfg_if/detect/arch/x86.rs similarity index 100% rename from tests/target/cfg_if/detect/arch/x86.rs rename to rustfmt-core/tests/target/cfg_if/detect/arch/x86.rs diff --git a/tests/target/cfg_if/detect/bit.rs b/rustfmt-core/tests/target/cfg_if/detect/bit.rs similarity index 100% rename from tests/target/cfg_if/detect/bit.rs rename to rustfmt-core/tests/target/cfg_if/detect/bit.rs diff --git a/tests/target/cfg_if/detect/cache.rs b/rustfmt-core/tests/target/cfg_if/detect/cache.rs similarity index 100% rename from tests/target/cfg_if/detect/cache.rs rename to rustfmt-core/tests/target/cfg_if/detect/cache.rs diff --git a/tests/target/cfg_if/detect/error_macros.rs b/rustfmt-core/tests/target/cfg_if/detect/error_macros.rs similarity index 100% rename from tests/target/cfg_if/detect/error_macros.rs rename to rustfmt-core/tests/target/cfg_if/detect/error_macros.rs diff --git a/tests/target/cfg_if/detect/mod.rs b/rustfmt-core/tests/target/cfg_if/detect/mod.rs similarity index 100% rename from tests/target/cfg_if/detect/mod.rs rename to rustfmt-core/tests/target/cfg_if/detect/mod.rs diff --git a/tests/target/cfg_if/detect/os/aarch64.rs b/rustfmt-core/tests/target/cfg_if/detect/os/aarch64.rs similarity index 100% rename from tests/target/cfg_if/detect/os/aarch64.rs rename to rustfmt-core/tests/target/cfg_if/detect/os/aarch64.rs diff --git a/tests/target/cfg_if/detect/os/freebsd/aarch64.rs b/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/aarch64.rs similarity index 100% rename from tests/target/cfg_if/detect/os/freebsd/aarch64.rs rename to rustfmt-core/tests/target/cfg_if/detect/os/freebsd/aarch64.rs diff --git a/tests/target/cfg_if/detect/os/freebsd/arm.rs b/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/arm.rs similarity index 100% rename from tests/target/cfg_if/detect/os/freebsd/arm.rs rename to rustfmt-core/tests/target/cfg_if/detect/os/freebsd/arm.rs diff --git a/tests/target/cfg_if/detect/os/freebsd/auxvec.rs b/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/auxvec.rs similarity index 100% rename from tests/target/cfg_if/detect/os/freebsd/auxvec.rs rename to rustfmt-core/tests/target/cfg_if/detect/os/freebsd/auxvec.rs diff --git a/tests/target/cfg_if/detect/os/freebsd/mod.rs b/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/mod.rs similarity index 100% rename from tests/target/cfg_if/detect/os/freebsd/mod.rs rename to rustfmt-core/tests/target/cfg_if/detect/os/freebsd/mod.rs diff --git a/tests/target/cfg_if/detect/os/freebsd/powerpc.rs b/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/powerpc.rs similarity index 100% rename from tests/target/cfg_if/detect/os/freebsd/powerpc.rs rename to rustfmt-core/tests/target/cfg_if/detect/os/freebsd/powerpc.rs diff --git a/tests/target/cfg_if/detect/os/linux/aarch64.rs b/rustfmt-core/tests/target/cfg_if/detect/os/linux/aarch64.rs similarity index 100% rename from tests/target/cfg_if/detect/os/linux/aarch64.rs rename to rustfmt-core/tests/target/cfg_if/detect/os/linux/aarch64.rs diff --git a/tests/target/cfg_if/detect/os/linux/arm.rs b/rustfmt-core/tests/target/cfg_if/detect/os/linux/arm.rs similarity index 100% rename from tests/target/cfg_if/detect/os/linux/arm.rs rename to rustfmt-core/tests/target/cfg_if/detect/os/linux/arm.rs diff --git a/tests/target/cfg_if/detect/os/linux/auxvec.rs b/rustfmt-core/tests/target/cfg_if/detect/os/linux/auxvec.rs similarity index 100% rename from tests/target/cfg_if/detect/os/linux/auxvec.rs rename to rustfmt-core/tests/target/cfg_if/detect/os/linux/auxvec.rs diff --git a/tests/target/cfg_if/detect/os/linux/cpuinfo.rs b/rustfmt-core/tests/target/cfg_if/detect/os/linux/cpuinfo.rs similarity index 100% rename from tests/target/cfg_if/detect/os/linux/cpuinfo.rs rename to rustfmt-core/tests/target/cfg_if/detect/os/linux/cpuinfo.rs diff --git a/tests/target/cfg_if/detect/os/linux/mips.rs b/rustfmt-core/tests/target/cfg_if/detect/os/linux/mips.rs similarity index 100% rename from tests/target/cfg_if/detect/os/linux/mips.rs rename to rustfmt-core/tests/target/cfg_if/detect/os/linux/mips.rs diff --git a/tests/target/cfg_if/detect/os/linux/mod.rs b/rustfmt-core/tests/target/cfg_if/detect/os/linux/mod.rs similarity index 100% rename from tests/target/cfg_if/detect/os/linux/mod.rs rename to rustfmt-core/tests/target/cfg_if/detect/os/linux/mod.rs diff --git a/tests/target/cfg_if/detect/os/linux/powerpc.rs b/rustfmt-core/tests/target/cfg_if/detect/os/linux/powerpc.rs similarity index 100% rename from tests/target/cfg_if/detect/os/linux/powerpc.rs rename to rustfmt-core/tests/target/cfg_if/detect/os/linux/powerpc.rs diff --git a/tests/target/cfg_if/detect/os/other.rs b/rustfmt-core/tests/target/cfg_if/detect/os/other.rs similarity index 100% rename from tests/target/cfg_if/detect/os/other.rs rename to rustfmt-core/tests/target/cfg_if/detect/os/other.rs diff --git a/tests/target/cfg_if/detect/os/x86.rs b/rustfmt-core/tests/target/cfg_if/detect/os/x86.rs similarity index 100% rename from tests/target/cfg_if/detect/os/x86.rs rename to rustfmt-core/tests/target/cfg_if/detect/os/x86.rs diff --git a/tests/target/cfg_if/lib.rs b/rustfmt-core/tests/target/cfg_if/lib.rs similarity index 100% rename from tests/target/cfg_if/lib.rs rename to rustfmt-core/tests/target/cfg_if/lib.rs diff --git a/tests/target/cfg_if/mod.rs b/rustfmt-core/tests/target/cfg_if/mod.rs similarity index 100% rename from tests/target/cfg_if/mod.rs rename to rustfmt-core/tests/target/cfg_if/mod.rs diff --git a/tests/target/cfg_mod/bar.rs b/rustfmt-core/tests/target/cfg_mod/bar.rs similarity index 100% rename from tests/target/cfg_mod/bar.rs rename to rustfmt-core/tests/target/cfg_mod/bar.rs diff --git a/tests/target/cfg_mod/dir/dir1/dir2/wasm32.rs b/rustfmt-core/tests/target/cfg_mod/dir/dir1/dir2/wasm32.rs similarity index 100% rename from tests/target/cfg_mod/dir/dir1/dir2/wasm32.rs rename to rustfmt-core/tests/target/cfg_mod/dir/dir1/dir2/wasm32.rs diff --git a/tests/target/cfg_mod/dir/dir1/dir3/wasm32.rs b/rustfmt-core/tests/target/cfg_mod/dir/dir1/dir3/wasm32.rs similarity index 100% rename from tests/target/cfg_mod/dir/dir1/dir3/wasm32.rs rename to rustfmt-core/tests/target/cfg_mod/dir/dir1/dir3/wasm32.rs diff --git a/tests/target/cfg_mod/foo.rs b/rustfmt-core/tests/target/cfg_mod/foo.rs similarity index 100% rename from tests/target/cfg_mod/foo.rs rename to rustfmt-core/tests/target/cfg_mod/foo.rs diff --git a/tests/target/cfg_mod/mod.rs b/rustfmt-core/tests/target/cfg_mod/mod.rs similarity index 100% rename from tests/target/cfg_mod/mod.rs rename to rustfmt-core/tests/target/cfg_mod/mod.rs diff --git a/tests/target/cfg_mod/other.rs b/rustfmt-core/tests/target/cfg_mod/other.rs similarity index 100% rename from tests/target/cfg_mod/other.rs rename to rustfmt-core/tests/target/cfg_mod/other.rs diff --git a/tests/target/cfg_mod/wasm32.rs b/rustfmt-core/tests/target/cfg_mod/wasm32.rs similarity index 100% rename from tests/target/cfg_mod/wasm32.rs rename to rustfmt-core/tests/target/cfg_mod/wasm32.rs diff --git a/tests/target/chains-visual.rs b/rustfmt-core/tests/target/chains-visual.rs similarity index 100% rename from tests/target/chains-visual.rs rename to rustfmt-core/tests/target/chains-visual.rs diff --git a/tests/target/chains.rs b/rustfmt-core/tests/target/chains.rs similarity index 100% rename from tests/target/chains.rs rename to rustfmt-core/tests/target/chains.rs diff --git a/tests/target/chains_with_comment.rs b/rustfmt-core/tests/target/chains_with_comment.rs similarity index 100% rename from tests/target/chains_with_comment.rs rename to rustfmt-core/tests/target/chains_with_comment.rs diff --git a/tests/target/closure-block-inside-macro.rs b/rustfmt-core/tests/target/closure-block-inside-macro.rs similarity index 100% rename from tests/target/closure-block-inside-macro.rs rename to rustfmt-core/tests/target/closure-block-inside-macro.rs diff --git a/tests/target/closure_block_style.rs b/rustfmt-core/tests/target/closure_block_style.rs similarity index 100% rename from tests/target/closure_block_style.rs rename to rustfmt-core/tests/target/closure_block_style.rs diff --git a/tests/target/closure_block_style_no_comma.rs b/rustfmt-core/tests/target/closure_block_style_no_comma.rs similarity index 100% rename from tests/target/closure_block_style_no_comma.rs rename to rustfmt-core/tests/target/closure_block_style_no_comma.rs diff --git a/tests/target/closure_visual_style.rs b/rustfmt-core/tests/target/closure_visual_style.rs similarity index 100% rename from tests/target/closure_visual_style.rs rename to rustfmt-core/tests/target/closure_visual_style.rs diff --git a/tests/target/comment-inside-const.rs b/rustfmt-core/tests/target/comment-inside-const.rs similarity index 100% rename from tests/target/comment-inside-const.rs rename to rustfmt-core/tests/target/comment-inside-const.rs diff --git a/tests/target/comment-not-disappear.rs b/rustfmt-core/tests/target/comment-not-disappear.rs similarity index 100% rename from tests/target/comment-not-disappear.rs rename to rustfmt-core/tests/target/comment-not-disappear.rs diff --git a/tests/target/comment.rs b/rustfmt-core/tests/target/comment.rs similarity index 100% rename from tests/target/comment.rs rename to rustfmt-core/tests/target/comment.rs diff --git a/tests/target/comment2.rs b/rustfmt-core/tests/target/comment2.rs similarity index 100% rename from tests/target/comment2.rs rename to rustfmt-core/tests/target/comment2.rs diff --git a/tests/target/comment3.rs b/rustfmt-core/tests/target/comment3.rs similarity index 100% rename from tests/target/comment3.rs rename to rustfmt-core/tests/target/comment3.rs diff --git a/tests/target/comment4.rs b/rustfmt-core/tests/target/comment4.rs similarity index 100% rename from tests/target/comment4.rs rename to rustfmt-core/tests/target/comment4.rs diff --git a/tests/target/comment5.rs b/rustfmt-core/tests/target/comment5.rs similarity index 100% rename from tests/target/comment5.rs rename to rustfmt-core/tests/target/comment5.rs diff --git a/tests/target/comment6.rs b/rustfmt-core/tests/target/comment6.rs similarity index 100% rename from tests/target/comment6.rs rename to rustfmt-core/tests/target/comment6.rs diff --git a/tests/target/comment_crlf_newline.rs b/rustfmt-core/tests/target/comment_crlf_newline.rs similarity index 100% rename from tests/target/comment_crlf_newline.rs rename to rustfmt-core/tests/target/comment_crlf_newline.rs diff --git a/tests/target/comments-fn.rs b/rustfmt-core/tests/target/comments-fn.rs similarity index 100% rename from tests/target/comments-fn.rs rename to rustfmt-core/tests/target/comments-fn.rs diff --git a/tests/target/configs/blank_lines_lower_bound/1.rs b/rustfmt-core/tests/target/configs/blank_lines_lower_bound/1.rs similarity index 100% rename from tests/target/configs/blank_lines_lower_bound/1.rs rename to rustfmt-core/tests/target/configs/blank_lines_lower_bound/1.rs diff --git a/tests/target/configs/brace_style/fn_always_next_line.rs b/rustfmt-core/tests/target/configs/brace_style/fn_always_next_line.rs similarity index 100% rename from tests/target/configs/brace_style/fn_always_next_line.rs rename to rustfmt-core/tests/target/configs/brace_style/fn_always_next_line.rs diff --git a/tests/target/configs/brace_style/fn_prefer_same_line.rs b/rustfmt-core/tests/target/configs/brace_style/fn_prefer_same_line.rs similarity index 100% rename from tests/target/configs/brace_style/fn_prefer_same_line.rs rename to rustfmt-core/tests/target/configs/brace_style/fn_prefer_same_line.rs diff --git a/tests/target/configs/brace_style/fn_same_line_where.rs b/rustfmt-core/tests/target/configs/brace_style/fn_same_line_where.rs similarity index 100% rename from tests/target/configs/brace_style/fn_same_line_where.rs rename to rustfmt-core/tests/target/configs/brace_style/fn_same_line_where.rs diff --git a/tests/target/configs/brace_style/item_always_next_line.rs b/rustfmt-core/tests/target/configs/brace_style/item_always_next_line.rs similarity index 100% rename from tests/target/configs/brace_style/item_always_next_line.rs rename to rustfmt-core/tests/target/configs/brace_style/item_always_next_line.rs diff --git a/tests/target/configs/brace_style/item_prefer_same_line.rs b/rustfmt-core/tests/target/configs/brace_style/item_prefer_same_line.rs similarity index 100% rename from tests/target/configs/brace_style/item_prefer_same_line.rs rename to rustfmt-core/tests/target/configs/brace_style/item_prefer_same_line.rs diff --git a/tests/target/configs/brace_style/item_same_line_where.rs b/rustfmt-core/tests/target/configs/brace_style/item_same_line_where.rs similarity index 100% rename from tests/target/configs/brace_style/item_same_line_where.rs rename to rustfmt-core/tests/target/configs/brace_style/item_same_line_where.rs diff --git a/tests/target/configs/combine_control_expr/false.rs b/rustfmt-core/tests/target/configs/combine_control_expr/false.rs similarity index 100% rename from tests/target/configs/combine_control_expr/false.rs rename to rustfmt-core/tests/target/configs/combine_control_expr/false.rs diff --git a/tests/target/configs/combine_control_expr/true.rs b/rustfmt-core/tests/target/configs/combine_control_expr/true.rs similarity index 100% rename from tests/target/configs/combine_control_expr/true.rs rename to rustfmt-core/tests/target/configs/combine_control_expr/true.rs diff --git a/tests/target/configs/comment_width/above.rs b/rustfmt-core/tests/target/configs/comment_width/above.rs similarity index 100% rename from tests/target/configs/comment_width/above.rs rename to rustfmt-core/tests/target/configs/comment_width/above.rs diff --git a/tests/target/configs/comment_width/below.rs b/rustfmt-core/tests/target/configs/comment_width/below.rs similarity index 100% rename from tests/target/configs/comment_width/below.rs rename to rustfmt-core/tests/target/configs/comment_width/below.rs diff --git a/tests/target/configs/comment_width/ignore.rs b/rustfmt-core/tests/target/configs/comment_width/ignore.rs similarity index 100% rename from tests/target/configs/comment_width/ignore.rs rename to rustfmt-core/tests/target/configs/comment_width/ignore.rs diff --git a/tests/target/configs/condense_wildcard_suffixes/false.rs b/rustfmt-core/tests/target/configs/condense_wildcard_suffixes/false.rs similarity index 100% rename from tests/target/configs/condense_wildcard_suffixes/false.rs rename to rustfmt-core/tests/target/configs/condense_wildcard_suffixes/false.rs diff --git a/tests/target/configs/condense_wildcard_suffixes/true.rs b/rustfmt-core/tests/target/configs/condense_wildcard_suffixes/true.rs similarity index 100% rename from tests/target/configs/condense_wildcard_suffixes/true.rs rename to rustfmt-core/tests/target/configs/condense_wildcard_suffixes/true.rs diff --git a/tests/target/configs/control_brace_style/always_next_line.rs b/rustfmt-core/tests/target/configs/control_brace_style/always_next_line.rs similarity index 100% rename from tests/target/configs/control_brace_style/always_next_line.rs rename to rustfmt-core/tests/target/configs/control_brace_style/always_next_line.rs diff --git a/tests/target/configs/control_brace_style/always_same_line.rs b/rustfmt-core/tests/target/configs/control_brace_style/always_same_line.rs similarity index 100% rename from tests/target/configs/control_brace_style/always_same_line.rs rename to rustfmt-core/tests/target/configs/control_brace_style/always_same_line.rs diff --git a/tests/target/configs/control_brace_style/closing_next_line.rs b/rustfmt-core/tests/target/configs/control_brace_style/closing_next_line.rs similarity index 100% rename from tests/target/configs/control_brace_style/closing_next_line.rs rename to rustfmt-core/tests/target/configs/control_brace_style/closing_next_line.rs diff --git a/tests/target/configs/disable_all_formatting/false.rs b/rustfmt-core/tests/target/configs/disable_all_formatting/false.rs similarity index 100% rename from tests/target/configs/disable_all_formatting/false.rs rename to rustfmt-core/tests/target/configs/disable_all_formatting/false.rs diff --git a/tests/target/configs/disable_all_formatting/true.rs b/rustfmt-core/tests/target/configs/disable_all_formatting/true.rs similarity index 100% rename from tests/target/configs/disable_all_formatting/true.rs rename to rustfmt-core/tests/target/configs/disable_all_formatting/true.rs diff --git a/tests/target/configs/empty_item_single_line/false.rs b/rustfmt-core/tests/target/configs/empty_item_single_line/false.rs similarity index 100% rename from tests/target/configs/empty_item_single_line/false.rs rename to rustfmt-core/tests/target/configs/empty_item_single_line/false.rs diff --git a/tests/target/configs/empty_item_single_line/true.rs b/rustfmt-core/tests/target/configs/empty_item_single_line/true.rs similarity index 100% rename from tests/target/configs/empty_item_single_line/true.rs rename to rustfmt-core/tests/target/configs/empty_item_single_line/true.rs diff --git a/tests/target/configs/enum_discrim_align_threshold/40.rs b/rustfmt-core/tests/target/configs/enum_discrim_align_threshold/40.rs similarity index 100% rename from tests/target/configs/enum_discrim_align_threshold/40.rs rename to rustfmt-core/tests/target/configs/enum_discrim_align_threshold/40.rs diff --git a/tests/target/configs/error_on_line_overflow/false.rs b/rustfmt-core/tests/target/configs/error_on_line_overflow/false.rs similarity index 100% rename from tests/target/configs/error_on_line_overflow/false.rs rename to rustfmt-core/tests/target/configs/error_on_line_overflow/false.rs diff --git a/tests/target/configs/error_on_unformatted/false.rs b/rustfmt-core/tests/target/configs/error_on_unformatted/false.rs similarity index 100% rename from tests/target/configs/error_on_unformatted/false.rs rename to rustfmt-core/tests/target/configs/error_on_unformatted/false.rs diff --git a/tests/target/configs/fn_args_layout/compressed.rs b/rustfmt-core/tests/target/configs/fn_args_layout/compressed.rs similarity index 100% rename from tests/target/configs/fn_args_layout/compressed.rs rename to rustfmt-core/tests/target/configs/fn_args_layout/compressed.rs diff --git a/tests/target/configs/fn_args_layout/tall.rs b/rustfmt-core/tests/target/configs/fn_args_layout/tall.rs similarity index 100% rename from tests/target/configs/fn_args_layout/tall.rs rename to rustfmt-core/tests/target/configs/fn_args_layout/tall.rs diff --git a/tests/target/configs/fn_args_layout/vertical.rs b/rustfmt-core/tests/target/configs/fn_args_layout/vertical.rs similarity index 100% rename from tests/target/configs/fn_args_layout/vertical.rs rename to rustfmt-core/tests/target/configs/fn_args_layout/vertical.rs diff --git a/tests/target/configs/fn_single_line/false.rs b/rustfmt-core/tests/target/configs/fn_single_line/false.rs similarity index 100% rename from tests/target/configs/fn_single_line/false.rs rename to rustfmt-core/tests/target/configs/fn_single_line/false.rs diff --git a/tests/target/configs/fn_single_line/true.rs b/rustfmt-core/tests/target/configs/fn_single_line/true.rs similarity index 100% rename from tests/target/configs/fn_single_line/true.rs rename to rustfmt-core/tests/target/configs/fn_single_line/true.rs diff --git a/tests/target/configs/force_explicit_abi/false.rs b/rustfmt-core/tests/target/configs/force_explicit_abi/false.rs similarity index 100% rename from tests/target/configs/force_explicit_abi/false.rs rename to rustfmt-core/tests/target/configs/force_explicit_abi/false.rs diff --git a/tests/target/configs/force_explicit_abi/true.rs b/rustfmt-core/tests/target/configs/force_explicit_abi/true.rs similarity index 100% rename from tests/target/configs/force_explicit_abi/true.rs rename to rustfmt-core/tests/target/configs/force_explicit_abi/true.rs diff --git a/tests/target/configs/force_multiline_block/false.rs b/rustfmt-core/tests/target/configs/force_multiline_block/false.rs similarity index 100% rename from tests/target/configs/force_multiline_block/false.rs rename to rustfmt-core/tests/target/configs/force_multiline_block/false.rs diff --git a/tests/target/configs/force_multiline_block/true.rs b/rustfmt-core/tests/target/configs/force_multiline_block/true.rs similarity index 100% rename from tests/target/configs/force_multiline_block/true.rs rename to rustfmt-core/tests/target/configs/force_multiline_block/true.rs diff --git a/tests/target/configs/format_macro_bodies/false.rs b/rustfmt-core/tests/target/configs/format_macro_bodies/false.rs similarity index 100% rename from tests/target/configs/format_macro_bodies/false.rs rename to rustfmt-core/tests/target/configs/format_macro_bodies/false.rs diff --git a/tests/target/configs/format_macro_bodies/true.rs b/rustfmt-core/tests/target/configs/format_macro_bodies/true.rs similarity index 100% rename from tests/target/configs/format_macro_bodies/true.rs rename to rustfmt-core/tests/target/configs/format_macro_bodies/true.rs diff --git a/tests/target/configs/format_macro_matchers/false.rs b/rustfmt-core/tests/target/configs/format_macro_matchers/false.rs similarity index 100% rename from tests/target/configs/format_macro_matchers/false.rs rename to rustfmt-core/tests/target/configs/format_macro_matchers/false.rs diff --git a/tests/target/configs/format_macro_matchers/true.rs b/rustfmt-core/tests/target/configs/format_macro_matchers/true.rs similarity index 100% rename from tests/target/configs/format_macro_matchers/true.rs rename to rustfmt-core/tests/target/configs/format_macro_matchers/true.rs diff --git a/tests/target/configs/format_strings/false.rs b/rustfmt-core/tests/target/configs/format_strings/false.rs similarity index 100% rename from tests/target/configs/format_strings/false.rs rename to rustfmt-core/tests/target/configs/format_strings/false.rs diff --git a/tests/target/configs/format_strings/true.rs b/rustfmt-core/tests/target/configs/format_strings/true.rs similarity index 100% rename from tests/target/configs/format_strings/true.rs rename to rustfmt-core/tests/target/configs/format_strings/true.rs diff --git a/tests/target/configs/hard_tabs/false.rs b/rustfmt-core/tests/target/configs/hard_tabs/false.rs similarity index 100% rename from tests/target/configs/hard_tabs/false.rs rename to rustfmt-core/tests/target/configs/hard_tabs/false.rs diff --git a/tests/target/configs/hard_tabs/true.rs b/rustfmt-core/tests/target/configs/hard_tabs/true.rs similarity index 100% rename from tests/target/configs/hard_tabs/true.rs rename to rustfmt-core/tests/target/configs/hard_tabs/true.rs diff --git a/tests/target/configs/imports_indent/block.rs b/rustfmt-core/tests/target/configs/imports_indent/block.rs similarity index 100% rename from tests/target/configs/imports_indent/block.rs rename to rustfmt-core/tests/target/configs/imports_indent/block.rs diff --git a/tests/target/configs/imports_layout/horizontal_vertical.rs b/rustfmt-core/tests/target/configs/imports_layout/horizontal_vertical.rs similarity index 100% rename from tests/target/configs/imports_layout/horizontal_vertical.rs rename to rustfmt-core/tests/target/configs/imports_layout/horizontal_vertical.rs diff --git a/tests/target/configs/imports_layout/merge_mixed.rs b/rustfmt-core/tests/target/configs/imports_layout/merge_mixed.rs similarity index 100% rename from tests/target/configs/imports_layout/merge_mixed.rs rename to rustfmt-core/tests/target/configs/imports_layout/merge_mixed.rs diff --git a/tests/target/configs/imports_layout/mixed.rs b/rustfmt-core/tests/target/configs/imports_layout/mixed.rs similarity index 100% rename from tests/target/configs/imports_layout/mixed.rs rename to rustfmt-core/tests/target/configs/imports_layout/mixed.rs diff --git a/tests/target/configs/indent_style/block_args.rs b/rustfmt-core/tests/target/configs/indent_style/block_args.rs similarity index 100% rename from tests/target/configs/indent_style/block_args.rs rename to rustfmt-core/tests/target/configs/indent_style/block_args.rs diff --git a/tests/target/configs/indent_style/block_array.rs b/rustfmt-core/tests/target/configs/indent_style/block_array.rs similarity index 100% rename from tests/target/configs/indent_style/block_array.rs rename to rustfmt-core/tests/target/configs/indent_style/block_array.rs diff --git a/tests/target/configs/indent_style/block_call.rs b/rustfmt-core/tests/target/configs/indent_style/block_call.rs similarity index 100% rename from tests/target/configs/indent_style/block_call.rs rename to rustfmt-core/tests/target/configs/indent_style/block_call.rs diff --git a/tests/target/configs/indent_style/block_chain.rs b/rustfmt-core/tests/target/configs/indent_style/block_chain.rs similarity index 100% rename from tests/target/configs/indent_style/block_chain.rs rename to rustfmt-core/tests/target/configs/indent_style/block_chain.rs diff --git a/tests/target/configs/indent_style/block_generic.rs b/rustfmt-core/tests/target/configs/indent_style/block_generic.rs similarity index 100% rename from tests/target/configs/indent_style/block_generic.rs rename to rustfmt-core/tests/target/configs/indent_style/block_generic.rs diff --git a/tests/target/configs/indent_style/block_struct_lit.rs b/rustfmt-core/tests/target/configs/indent_style/block_struct_lit.rs similarity index 100% rename from tests/target/configs/indent_style/block_struct_lit.rs rename to rustfmt-core/tests/target/configs/indent_style/block_struct_lit.rs diff --git a/tests/target/configs/indent_style/block_tab_spaces_call.rs b/rustfmt-core/tests/target/configs/indent_style/block_tab_spaces_call.rs similarity index 100% rename from tests/target/configs/indent_style/block_tab_spaces_call.rs rename to rustfmt-core/tests/target/configs/indent_style/block_tab_spaces_call.rs diff --git a/tests/target/configs/indent_style/block_trailing_comma_call/two.rs b/rustfmt-core/tests/target/configs/indent_style/block_trailing_comma_call/two.rs similarity index 100% rename from tests/target/configs/indent_style/block_trailing_comma_call/two.rs rename to rustfmt-core/tests/target/configs/indent_style/block_trailing_comma_call/two.rs diff --git a/tests/target/configs/indent_style/block_where_pred.rs b/rustfmt-core/tests/target/configs/indent_style/block_where_pred.rs similarity index 100% rename from tests/target/configs/indent_style/block_where_pred.rs rename to rustfmt-core/tests/target/configs/indent_style/block_where_pred.rs diff --git a/tests/target/configs/indent_style/default.rs b/rustfmt-core/tests/target/configs/indent_style/default.rs similarity index 100% rename from tests/target/configs/indent_style/default.rs rename to rustfmt-core/tests/target/configs/indent_style/default.rs diff --git a/tests/target/configs/indent_style/rfc_control.rs b/rustfmt-core/tests/target/configs/indent_style/rfc_control.rs similarity index 100% rename from tests/target/configs/indent_style/rfc_control.rs rename to rustfmt-core/tests/target/configs/indent_style/rfc_control.rs diff --git a/tests/target/configs/indent_style/rfc_where.rs b/rustfmt-core/tests/target/configs/indent_style/rfc_where.rs similarity index 100% rename from tests/target/configs/indent_style/rfc_where.rs rename to rustfmt-core/tests/target/configs/indent_style/rfc_where.rs diff --git a/tests/target/configs/indent_style/visual_args.rs b/rustfmt-core/tests/target/configs/indent_style/visual_args.rs similarity index 100% rename from tests/target/configs/indent_style/visual_args.rs rename to rustfmt-core/tests/target/configs/indent_style/visual_args.rs diff --git a/tests/target/configs/indent_style/visual_array.rs b/rustfmt-core/tests/target/configs/indent_style/visual_array.rs similarity index 100% rename from tests/target/configs/indent_style/visual_array.rs rename to rustfmt-core/tests/target/configs/indent_style/visual_array.rs diff --git a/tests/target/configs/indent_style/visual_call.rs b/rustfmt-core/tests/target/configs/indent_style/visual_call.rs similarity index 100% rename from tests/target/configs/indent_style/visual_call.rs rename to rustfmt-core/tests/target/configs/indent_style/visual_call.rs diff --git a/tests/target/configs/indent_style/visual_chain.rs b/rustfmt-core/tests/target/configs/indent_style/visual_chain.rs similarity index 100% rename from tests/target/configs/indent_style/visual_chain.rs rename to rustfmt-core/tests/target/configs/indent_style/visual_chain.rs diff --git a/tests/target/configs/indent_style/visual_generics.rs b/rustfmt-core/tests/target/configs/indent_style/visual_generics.rs similarity index 100% rename from tests/target/configs/indent_style/visual_generics.rs rename to rustfmt-core/tests/target/configs/indent_style/visual_generics.rs diff --git a/tests/target/configs/indent_style/visual_struct_lit.rs b/rustfmt-core/tests/target/configs/indent_style/visual_struct_lit.rs similarity index 100% rename from tests/target/configs/indent_style/visual_struct_lit.rs rename to rustfmt-core/tests/target/configs/indent_style/visual_struct_lit.rs diff --git a/tests/target/configs/indent_style/visual_trailing_comma.rs b/rustfmt-core/tests/target/configs/indent_style/visual_trailing_comma.rs similarity index 100% rename from tests/target/configs/indent_style/visual_trailing_comma.rs rename to rustfmt-core/tests/target/configs/indent_style/visual_trailing_comma.rs diff --git a/tests/target/configs/indent_style/visual_where_pred.rs b/rustfmt-core/tests/target/configs/indent_style/visual_where_pred.rs similarity index 100% rename from tests/target/configs/indent_style/visual_where_pred.rs rename to rustfmt-core/tests/target/configs/indent_style/visual_where_pred.rs diff --git a/tests/target/configs/match_arm_blocks/false.rs b/rustfmt-core/tests/target/configs/match_arm_blocks/false.rs similarity index 100% rename from tests/target/configs/match_arm_blocks/false.rs rename to rustfmt-core/tests/target/configs/match_arm_blocks/false.rs diff --git a/tests/target/configs/match_arm_blocks/true.rs b/rustfmt-core/tests/target/configs/match_arm_blocks/true.rs similarity index 100% rename from tests/target/configs/match_arm_blocks/true.rs rename to rustfmt-core/tests/target/configs/match_arm_blocks/true.rs diff --git a/tests/target/configs/match_block_trailing_comma/false.rs b/rustfmt-core/tests/target/configs/match_block_trailing_comma/false.rs similarity index 100% rename from tests/target/configs/match_block_trailing_comma/false.rs rename to rustfmt-core/tests/target/configs/match_block_trailing_comma/false.rs diff --git a/tests/target/configs/match_block_trailing_comma/true.rs b/rustfmt-core/tests/target/configs/match_block_trailing_comma/true.rs similarity index 100% rename from tests/target/configs/match_block_trailing_comma/true.rs rename to rustfmt-core/tests/target/configs/match_block_trailing_comma/true.rs diff --git a/tests/target/configs/merge_derives/true.rs b/rustfmt-core/tests/target/configs/merge_derives/true.rs similarity index 100% rename from tests/target/configs/merge_derives/true.rs rename to rustfmt-core/tests/target/configs/merge_derives/true.rs diff --git a/tests/target/configs/normalize_comments/false.rs b/rustfmt-core/tests/target/configs/normalize_comments/false.rs similarity index 100% rename from tests/target/configs/normalize_comments/false.rs rename to rustfmt-core/tests/target/configs/normalize_comments/false.rs diff --git a/tests/target/configs/normalize_comments/true.rs b/rustfmt-core/tests/target/configs/normalize_comments/true.rs similarity index 100% rename from tests/target/configs/normalize_comments/true.rs rename to rustfmt-core/tests/target/configs/normalize_comments/true.rs diff --git a/tests/target/configs/normalize_doc_attributes/false.rs b/rustfmt-core/tests/target/configs/normalize_doc_attributes/false.rs similarity index 100% rename from tests/target/configs/normalize_doc_attributes/false.rs rename to rustfmt-core/tests/target/configs/normalize_doc_attributes/false.rs diff --git a/tests/target/configs/normalize_doc_attributes/true.rs b/rustfmt-core/tests/target/configs/normalize_doc_attributes/true.rs similarity index 100% rename from tests/target/configs/normalize_doc_attributes/true.rs rename to rustfmt-core/tests/target/configs/normalize_doc_attributes/true.rs diff --git a/tests/target/configs/recursive/disabled/foo.rs b/rustfmt-core/tests/target/configs/recursive/disabled/foo.rs similarity index 100% rename from tests/target/configs/recursive/disabled/foo.rs rename to rustfmt-core/tests/target/configs/recursive/disabled/foo.rs diff --git a/tests/target/configs/recursive/disabled/lib.rs b/rustfmt-core/tests/target/configs/recursive/disabled/lib.rs similarity index 100% rename from tests/target/configs/recursive/disabled/lib.rs rename to rustfmt-core/tests/target/configs/recursive/disabled/lib.rs diff --git a/tests/target/configs/recursive/enabled/foo.rs b/rustfmt-core/tests/target/configs/recursive/enabled/foo.rs similarity index 100% rename from tests/target/configs/recursive/enabled/foo.rs rename to rustfmt-core/tests/target/configs/recursive/enabled/foo.rs diff --git a/tests/target/configs/recursive/enabled/lib.rs b/rustfmt-core/tests/target/configs/recursive/enabled/lib.rs similarity index 100% rename from tests/target/configs/recursive/enabled/lib.rs rename to rustfmt-core/tests/target/configs/recursive/enabled/lib.rs diff --git a/tests/target/configs/remove_nested_parens/remove_nested_parens.rs b/rustfmt-core/tests/target/configs/remove_nested_parens/remove_nested_parens.rs similarity index 100% rename from tests/target/configs/remove_nested_parens/remove_nested_parens.rs rename to rustfmt-core/tests/target/configs/remove_nested_parens/remove_nested_parens.rs diff --git a/tests/target/configs/reorder_impl_items/false.rs b/rustfmt-core/tests/target/configs/reorder_impl_items/false.rs similarity index 100% rename from tests/target/configs/reorder_impl_items/false.rs rename to rustfmt-core/tests/target/configs/reorder_impl_items/false.rs diff --git a/tests/target/configs/reorder_impl_items/true.rs b/rustfmt-core/tests/target/configs/reorder_impl_items/true.rs similarity index 100% rename from tests/target/configs/reorder_impl_items/true.rs rename to rustfmt-core/tests/target/configs/reorder_impl_items/true.rs diff --git a/tests/target/configs/reorder_imports/false.rs b/rustfmt-core/tests/target/configs/reorder_imports/false.rs similarity index 100% rename from tests/target/configs/reorder_imports/false.rs rename to rustfmt-core/tests/target/configs/reorder_imports/false.rs diff --git a/tests/target/configs/reorder_imports/true.rs b/rustfmt-core/tests/target/configs/reorder_imports/true.rs similarity index 100% rename from tests/target/configs/reorder_imports/true.rs rename to rustfmt-core/tests/target/configs/reorder_imports/true.rs diff --git a/tests/target/configs/reorder_modules/dolor/mod.rs b/rustfmt-core/tests/target/configs/reorder_modules/dolor/mod.rs similarity index 100% rename from tests/target/configs/reorder_modules/dolor/mod.rs rename to rustfmt-core/tests/target/configs/reorder_modules/dolor/mod.rs diff --git a/tests/target/configs/reorder_modules/false.rs b/rustfmt-core/tests/target/configs/reorder_modules/false.rs similarity index 100% rename from tests/target/configs/reorder_modules/false.rs rename to rustfmt-core/tests/target/configs/reorder_modules/false.rs diff --git a/tests/target/configs/reorder_modules/ipsum/mod.rs b/rustfmt-core/tests/target/configs/reorder_modules/ipsum/mod.rs similarity index 100% rename from tests/target/configs/reorder_modules/ipsum/mod.rs rename to rustfmt-core/tests/target/configs/reorder_modules/ipsum/mod.rs diff --git a/tests/target/configs/reorder_modules/lorem/mod.rs b/rustfmt-core/tests/target/configs/reorder_modules/lorem/mod.rs similarity index 100% rename from tests/target/configs/reorder_modules/lorem/mod.rs rename to rustfmt-core/tests/target/configs/reorder_modules/lorem/mod.rs diff --git a/tests/target/configs/reorder_modules/sit/mod.rs b/rustfmt-core/tests/target/configs/reorder_modules/sit/mod.rs similarity index 100% rename from tests/target/configs/reorder_modules/sit/mod.rs rename to rustfmt-core/tests/target/configs/reorder_modules/sit/mod.rs diff --git a/tests/target/configs/reorder_modules/true.rs b/rustfmt-core/tests/target/configs/reorder_modules/true.rs similarity index 100% rename from tests/target/configs/reorder_modules/true.rs rename to rustfmt-core/tests/target/configs/reorder_modules/true.rs diff --git a/tests/target/configs/skip_children/foo/mod.rs b/rustfmt-core/tests/target/configs/skip_children/foo/mod.rs similarity index 100% rename from tests/target/configs/skip_children/foo/mod.rs rename to rustfmt-core/tests/target/configs/skip_children/foo/mod.rs diff --git a/tests/target/configs/skip_children/true.rs b/rustfmt-core/tests/target/configs/skip_children/true.rs similarity index 100% rename from tests/target/configs/skip_children/true.rs rename to rustfmt-core/tests/target/configs/skip_children/true.rs diff --git a/tests/target/configs/space_before_colon/true.rs b/rustfmt-core/tests/target/configs/space_before_colon/true.rs similarity index 100% rename from tests/target/configs/space_before_colon/true.rs rename to rustfmt-core/tests/target/configs/space_before_colon/true.rs diff --git a/tests/target/configs/spaces_around_ranges/false.rs b/rustfmt-core/tests/target/configs/spaces_around_ranges/false.rs similarity index 100% rename from tests/target/configs/spaces_around_ranges/false.rs rename to rustfmt-core/tests/target/configs/spaces_around_ranges/false.rs diff --git a/tests/target/configs/spaces_around_ranges/true.rs b/rustfmt-core/tests/target/configs/spaces_around_ranges/true.rs similarity index 100% rename from tests/target/configs/spaces_around_ranges/true.rs rename to rustfmt-core/tests/target/configs/spaces_around_ranges/true.rs diff --git a/tests/target/configs/struct_field_align_threshold/20.rs b/rustfmt-core/tests/target/configs/struct_field_align_threshold/20.rs similarity index 100% rename from tests/target/configs/struct_field_align_threshold/20.rs rename to rustfmt-core/tests/target/configs/struct_field_align_threshold/20.rs diff --git a/tests/target/configs/struct_lit_single_line/false.rs b/rustfmt-core/tests/target/configs/struct_lit_single_line/false.rs similarity index 100% rename from tests/target/configs/struct_lit_single_line/false.rs rename to rustfmt-core/tests/target/configs/struct_lit_single_line/false.rs diff --git a/tests/target/configs/tab_spaces/2.rs b/rustfmt-core/tests/target/configs/tab_spaces/2.rs similarity index 100% rename from tests/target/configs/tab_spaces/2.rs rename to rustfmt-core/tests/target/configs/tab_spaces/2.rs diff --git a/tests/target/configs/tab_spaces/4.rs b/rustfmt-core/tests/target/configs/tab_spaces/4.rs similarity index 100% rename from tests/target/configs/tab_spaces/4.rs rename to rustfmt-core/tests/target/configs/tab_spaces/4.rs diff --git a/tests/target/configs/trailing_comma/always.rs b/rustfmt-core/tests/target/configs/trailing_comma/always.rs similarity index 100% rename from tests/target/configs/trailing_comma/always.rs rename to rustfmt-core/tests/target/configs/trailing_comma/always.rs diff --git a/tests/target/configs/trailing_comma/never.rs b/rustfmt-core/tests/target/configs/trailing_comma/never.rs similarity index 100% rename from tests/target/configs/trailing_comma/never.rs rename to rustfmt-core/tests/target/configs/trailing_comma/never.rs diff --git a/tests/target/configs/trailing_comma/vertical.rs b/rustfmt-core/tests/target/configs/trailing_comma/vertical.rs similarity index 100% rename from tests/target/configs/trailing_comma/vertical.rs rename to rustfmt-core/tests/target/configs/trailing_comma/vertical.rs diff --git a/tests/target/configs/trailing_semicolon/false.rs b/rustfmt-core/tests/target/configs/trailing_semicolon/false.rs similarity index 100% rename from tests/target/configs/trailing_semicolon/false.rs rename to rustfmt-core/tests/target/configs/trailing_semicolon/false.rs diff --git a/tests/target/configs/trailing_semicolon/true.rs b/rustfmt-core/tests/target/configs/trailing_semicolon/true.rs similarity index 100% rename from tests/target/configs/trailing_semicolon/true.rs rename to rustfmt-core/tests/target/configs/trailing_semicolon/true.rs diff --git a/tests/target/configs/type_punctuation_density/compressed.rs b/rustfmt-core/tests/target/configs/type_punctuation_density/compressed.rs similarity index 100% rename from tests/target/configs/type_punctuation_density/compressed.rs rename to rustfmt-core/tests/target/configs/type_punctuation_density/compressed.rs diff --git a/tests/target/configs/type_punctuation_density/wide.rs b/rustfmt-core/tests/target/configs/type_punctuation_density/wide.rs similarity index 100% rename from tests/target/configs/type_punctuation_density/wide.rs rename to rustfmt-core/tests/target/configs/type_punctuation_density/wide.rs diff --git a/tests/target/configs/use_field_init_shorthand/false.rs b/rustfmt-core/tests/target/configs/use_field_init_shorthand/false.rs similarity index 100% rename from tests/target/configs/use_field_init_shorthand/false.rs rename to rustfmt-core/tests/target/configs/use_field_init_shorthand/false.rs diff --git a/tests/target/configs/use_field_init_shorthand/true.rs b/rustfmt-core/tests/target/configs/use_field_init_shorthand/true.rs similarity index 100% rename from tests/target/configs/use_field_init_shorthand/true.rs rename to rustfmt-core/tests/target/configs/use_field_init_shorthand/true.rs diff --git a/tests/target/configs/use_small_heuristics/max.rs b/rustfmt-core/tests/target/configs/use_small_heuristics/max.rs similarity index 100% rename from tests/target/configs/use_small_heuristics/max.rs rename to rustfmt-core/tests/target/configs/use_small_heuristics/max.rs diff --git a/tests/target/configs/use_try_shorthand/false.rs b/rustfmt-core/tests/target/configs/use_try_shorthand/false.rs similarity index 100% rename from tests/target/configs/use_try_shorthand/false.rs rename to rustfmt-core/tests/target/configs/use_try_shorthand/false.rs diff --git a/tests/target/configs/use_try_shorthand/true.rs b/rustfmt-core/tests/target/configs/use_try_shorthand/true.rs similarity index 100% rename from tests/target/configs/use_try_shorthand/true.rs rename to rustfmt-core/tests/target/configs/use_try_shorthand/true.rs diff --git a/tests/target/configs/use_try_shorthand/true_2015_edition.rs b/rustfmt-core/tests/target/configs/use_try_shorthand/true_2015_edition.rs similarity index 100% rename from tests/target/configs/use_try_shorthand/true_2015_edition.rs rename to rustfmt-core/tests/target/configs/use_try_shorthand/true_2015_edition.rs diff --git a/tests/target/configs/where_single_line/true.rs b/rustfmt-core/tests/target/configs/where_single_line/true.rs similarity index 100% rename from tests/target/configs/where_single_line/true.rs rename to rustfmt-core/tests/target/configs/where_single_line/true.rs diff --git a/tests/target/configs/wrap_comments/false.rs b/rustfmt-core/tests/target/configs/wrap_comments/false.rs similarity index 100% rename from tests/target/configs/wrap_comments/false.rs rename to rustfmt-core/tests/target/configs/wrap_comments/false.rs diff --git a/tests/target/configs/wrap_comments/true.rs b/rustfmt-core/tests/target/configs/wrap_comments/true.rs similarity index 100% rename from tests/target/configs/wrap_comments/true.rs rename to rustfmt-core/tests/target/configs/wrap_comments/true.rs diff --git a/tests/target/const_generics.rs b/rustfmt-core/tests/target/const_generics.rs similarity index 100% rename from tests/target/const_generics.rs rename to rustfmt-core/tests/target/const_generics.rs diff --git a/tests/target/control-brace-style-always-next-line.rs b/rustfmt-core/tests/target/control-brace-style-always-next-line.rs similarity index 100% rename from tests/target/control-brace-style-always-next-line.rs rename to rustfmt-core/tests/target/control-brace-style-always-next-line.rs diff --git a/tests/target/control-brace-style-always-same-line.rs b/rustfmt-core/tests/target/control-brace-style-always-same-line.rs similarity index 100% rename from tests/target/control-brace-style-always-same-line.rs rename to rustfmt-core/tests/target/control-brace-style-always-same-line.rs diff --git a/tests/target/doc-attrib.rs b/rustfmt-core/tests/target/doc-attrib.rs similarity index 100% rename from tests/target/doc-attrib.rs rename to rustfmt-core/tests/target/doc-attrib.rs diff --git a/tests/target/doc-comment-with-example.rs b/rustfmt-core/tests/target/doc-comment-with-example.rs similarity index 100% rename from tests/target/doc-comment-with-example.rs rename to rustfmt-core/tests/target/doc-comment-with-example.rs diff --git a/tests/target/doc.rs b/rustfmt-core/tests/target/doc.rs similarity index 100% rename from tests/target/doc.rs rename to rustfmt-core/tests/target/doc.rs diff --git a/tests/target/dyn_trait.rs b/rustfmt-core/tests/target/dyn_trait.rs similarity index 100% rename from tests/target/dyn_trait.rs rename to rustfmt-core/tests/target/dyn_trait.rs diff --git a/tests/target/else-if-brace-style-always-next-line.rs b/rustfmt-core/tests/target/else-if-brace-style-always-next-line.rs similarity index 100% rename from tests/target/else-if-brace-style-always-next-line.rs rename to rustfmt-core/tests/target/else-if-brace-style-always-next-line.rs diff --git a/tests/target/else-if-brace-style-always-same-line.rs b/rustfmt-core/tests/target/else-if-brace-style-always-same-line.rs similarity index 100% rename from tests/target/else-if-brace-style-always-same-line.rs rename to rustfmt-core/tests/target/else-if-brace-style-always-same-line.rs diff --git a/tests/target/else-if-brace-style-closing-next-line.rs b/rustfmt-core/tests/target/else-if-brace-style-closing-next-line.rs similarity index 100% rename from tests/target/else-if-brace-style-closing-next-line.rs rename to rustfmt-core/tests/target/else-if-brace-style-closing-next-line.rs diff --git a/tests/target/empty-tuple-no-conversion-to-unit-struct.rs b/rustfmt-core/tests/target/empty-tuple-no-conversion-to-unit-struct.rs similarity index 100% rename from tests/target/empty-tuple-no-conversion-to-unit-struct.rs rename to rustfmt-core/tests/target/empty-tuple-no-conversion-to-unit-struct.rs diff --git a/tests/target/empty_file.rs b/rustfmt-core/tests/target/empty_file.rs similarity index 100% rename from tests/target/empty_file.rs rename to rustfmt-core/tests/target/empty_file.rs diff --git a/tests/target/enum.rs b/rustfmt-core/tests/target/enum.rs similarity index 100% rename from tests/target/enum.rs rename to rustfmt-core/tests/target/enum.rs diff --git a/tests/target/existential_type.rs b/rustfmt-core/tests/target/existential_type.rs similarity index 100% rename from tests/target/existential_type.rs rename to rustfmt-core/tests/target/existential_type.rs diff --git a/tests/target/expr-block.rs b/rustfmt-core/tests/target/expr-block.rs similarity index 100% rename from tests/target/expr-block.rs rename to rustfmt-core/tests/target/expr-block.rs diff --git a/tests/target/expr-overflow-delimited.rs b/rustfmt-core/tests/target/expr-overflow-delimited.rs similarity index 100% rename from tests/target/expr-overflow-delimited.rs rename to rustfmt-core/tests/target/expr-overflow-delimited.rs diff --git a/tests/target/expr.rs b/rustfmt-core/tests/target/expr.rs similarity index 100% rename from tests/target/expr.rs rename to rustfmt-core/tests/target/expr.rs diff --git a/tests/target/extern.rs b/rustfmt-core/tests/target/extern.rs similarity index 100% rename from tests/target/extern.rs rename to rustfmt-core/tests/target/extern.rs diff --git a/tests/target/extern_not_explicit.rs b/rustfmt-core/tests/target/extern_not_explicit.rs similarity index 100% rename from tests/target/extern_not_explicit.rs rename to rustfmt-core/tests/target/extern_not_explicit.rs diff --git a/tests/target/file-lines-1.rs b/rustfmt-core/tests/target/file-lines-1.rs similarity index 100% rename from tests/target/file-lines-1.rs rename to rustfmt-core/tests/target/file-lines-1.rs diff --git a/tests/target/file-lines-2.rs b/rustfmt-core/tests/target/file-lines-2.rs similarity index 100% rename from tests/target/file-lines-2.rs rename to rustfmt-core/tests/target/file-lines-2.rs diff --git a/tests/target/file-lines-3.rs b/rustfmt-core/tests/target/file-lines-3.rs similarity index 100% rename from tests/target/file-lines-3.rs rename to rustfmt-core/tests/target/file-lines-3.rs diff --git a/tests/target/file-lines-4.rs b/rustfmt-core/tests/target/file-lines-4.rs similarity index 100% rename from tests/target/file-lines-4.rs rename to rustfmt-core/tests/target/file-lines-4.rs diff --git a/tests/target/file-lines-5.rs b/rustfmt-core/tests/target/file-lines-5.rs similarity index 100% rename from tests/target/file-lines-5.rs rename to rustfmt-core/tests/target/file-lines-5.rs diff --git a/tests/target/file-lines-6.rs b/rustfmt-core/tests/target/file-lines-6.rs similarity index 100% rename from tests/target/file-lines-6.rs rename to rustfmt-core/tests/target/file-lines-6.rs diff --git a/tests/target/file-lines-7.rs b/rustfmt-core/tests/target/file-lines-7.rs similarity index 100% rename from tests/target/file-lines-7.rs rename to rustfmt-core/tests/target/file-lines-7.rs diff --git a/tests/target/file-lines-8.rs b/rustfmt-core/tests/target/file-lines-8.rs similarity index 100% rename from tests/target/file-lines-8.rs rename to rustfmt-core/tests/target/file-lines-8.rs diff --git a/tests/target/file-lines-item.rs b/rustfmt-core/tests/target/file-lines-item.rs similarity index 100% rename from tests/target/file-lines-item.rs rename to rustfmt-core/tests/target/file-lines-item.rs diff --git a/tests/target/fn-args-with-last-line-comment.rs b/rustfmt-core/tests/target/fn-args-with-last-line-comment.rs similarity index 100% rename from tests/target/fn-args-with-last-line-comment.rs rename to rustfmt-core/tests/target/fn-args-with-last-line-comment.rs diff --git a/tests/target/fn-custom-2.rs b/rustfmt-core/tests/target/fn-custom-2.rs similarity index 100% rename from tests/target/fn-custom-2.rs rename to rustfmt-core/tests/target/fn-custom-2.rs diff --git a/tests/target/fn-custom-3.rs b/rustfmt-core/tests/target/fn-custom-3.rs similarity index 100% rename from tests/target/fn-custom-3.rs rename to rustfmt-core/tests/target/fn-custom-3.rs diff --git a/tests/target/fn-custom-4.rs b/rustfmt-core/tests/target/fn-custom-4.rs similarity index 100% rename from tests/target/fn-custom-4.rs rename to rustfmt-core/tests/target/fn-custom-4.rs diff --git a/tests/target/fn-custom-6.rs b/rustfmt-core/tests/target/fn-custom-6.rs similarity index 100% rename from tests/target/fn-custom-6.rs rename to rustfmt-core/tests/target/fn-custom-6.rs diff --git a/tests/target/fn-custom-7.rs b/rustfmt-core/tests/target/fn-custom-7.rs similarity index 100% rename from tests/target/fn-custom-7.rs rename to rustfmt-core/tests/target/fn-custom-7.rs diff --git a/tests/target/fn-custom-8.rs b/rustfmt-core/tests/target/fn-custom-8.rs similarity index 100% rename from tests/target/fn-custom-8.rs rename to rustfmt-core/tests/target/fn-custom-8.rs diff --git a/tests/target/fn-custom.rs b/rustfmt-core/tests/target/fn-custom.rs similarity index 100% rename from tests/target/fn-custom.rs rename to rustfmt-core/tests/target/fn-custom.rs diff --git a/tests/target/fn-param-attributes.rs b/rustfmt-core/tests/target/fn-param-attributes.rs similarity index 100% rename from tests/target/fn-param-attributes.rs rename to rustfmt-core/tests/target/fn-param-attributes.rs diff --git a/tests/target/fn-simple.rs b/rustfmt-core/tests/target/fn-simple.rs similarity index 100% rename from tests/target/fn-simple.rs rename to rustfmt-core/tests/target/fn-simple.rs diff --git a/tests/target/fn-single-line/version_two.rs b/rustfmt-core/tests/target/fn-single-line/version_two.rs similarity index 100% rename from tests/target/fn-single-line/version_two.rs rename to rustfmt-core/tests/target/fn-single-line/version_two.rs diff --git a/tests/target/fn-ty.rs b/rustfmt-core/tests/target/fn-ty.rs similarity index 100% rename from tests/target/fn-ty.rs rename to rustfmt-core/tests/target/fn-ty.rs diff --git a/tests/target/fn.rs b/rustfmt-core/tests/target/fn.rs similarity index 100% rename from tests/target/fn.rs rename to rustfmt-core/tests/target/fn.rs diff --git a/tests/target/fn_args_indent-block.rs b/rustfmt-core/tests/target/fn_args_indent-block.rs similarity index 100% rename from tests/target/fn_args_indent-block.rs rename to rustfmt-core/tests/target/fn_args_indent-block.rs diff --git a/tests/target/fn_args_layout-vertical.rs b/rustfmt-core/tests/target/fn_args_layout-vertical.rs similarity index 100% rename from tests/target/fn_args_layout-vertical.rs rename to rustfmt-core/tests/target/fn_args_layout-vertical.rs diff --git a/tests/target/fn_once.rs b/rustfmt-core/tests/target/fn_once.rs similarity index 100% rename from tests/target/fn_once.rs rename to rustfmt-core/tests/target/fn_once.rs diff --git a/tests/target/format_strings/issue-202.rs b/rustfmt-core/tests/target/format_strings/issue-202.rs similarity index 100% rename from tests/target/format_strings/issue-202.rs rename to rustfmt-core/tests/target/format_strings/issue-202.rs diff --git a/tests/target/format_strings/issue-2833.rs b/rustfmt-core/tests/target/format_strings/issue-2833.rs similarity index 100% rename from tests/target/format_strings/issue-2833.rs rename to rustfmt-core/tests/target/format_strings/issue-2833.rs diff --git a/tests/target/format_strings/issue-3263.rs b/rustfmt-core/tests/target/format_strings/issue-3263.rs similarity index 100% rename from tests/target/format_strings/issue-3263.rs rename to rustfmt-core/tests/target/format_strings/issue-3263.rs diff --git a/tests/target/format_strings/issue-687.rs b/rustfmt-core/tests/target/format_strings/issue-687.rs similarity index 100% rename from tests/target/format_strings/issue-687.rs rename to rustfmt-core/tests/target/format_strings/issue-687.rs diff --git a/tests/target/format_strings/issue564.rs b/rustfmt-core/tests/target/format_strings/issue564.rs similarity index 100% rename from tests/target/format_strings/issue564.rs rename to rustfmt-core/tests/target/format_strings/issue564.rs diff --git a/tests/target/hard-tabs.rs b/rustfmt-core/tests/target/hard-tabs.rs similarity index 100% rename from tests/target/hard-tabs.rs rename to rustfmt-core/tests/target/hard-tabs.rs diff --git a/tests/target/hello.rs b/rustfmt-core/tests/target/hello.rs similarity index 100% rename from tests/target/hello.rs rename to rustfmt-core/tests/target/hello.rs diff --git a/tests/target/if_while_or_patterns.rs b/rustfmt-core/tests/target/if_while_or_patterns.rs similarity index 100% rename from tests/target/if_while_or_patterns.rs rename to rustfmt-core/tests/target/if_while_or_patterns.rs diff --git a/tests/target/immovable_generators.rs b/rustfmt-core/tests/target/immovable_generators.rs similarity index 100% rename from tests/target/immovable_generators.rs rename to rustfmt-core/tests/target/immovable_generators.rs diff --git a/tests/target/impl.rs b/rustfmt-core/tests/target/impl.rs similarity index 100% rename from tests/target/impl.rs rename to rustfmt-core/tests/target/impl.rs diff --git a/tests/target/impls.rs b/rustfmt-core/tests/target/impls.rs similarity index 100% rename from tests/target/impls.rs rename to rustfmt-core/tests/target/impls.rs diff --git a/tests/target/import-fencepost-length.rs b/rustfmt-core/tests/target/import-fencepost-length.rs similarity index 100% rename from tests/target/import-fencepost-length.rs rename to rustfmt-core/tests/target/import-fencepost-length.rs diff --git a/tests/target/imports-impl-only-use.rs b/rustfmt-core/tests/target/imports-impl-only-use.rs similarity index 100% rename from tests/target/imports-impl-only-use.rs rename to rustfmt-core/tests/target/imports-impl-only-use.rs diff --git a/tests/target/imports-reorder-lines-and-items.rs b/rustfmt-core/tests/target/imports-reorder-lines-and-items.rs similarity index 100% rename from tests/target/imports-reorder-lines-and-items.rs rename to rustfmt-core/tests/target/imports-reorder-lines-and-items.rs diff --git a/tests/target/imports-reorder-lines.rs b/rustfmt-core/tests/target/imports-reorder-lines.rs similarity index 100% rename from tests/target/imports-reorder-lines.rs rename to rustfmt-core/tests/target/imports-reorder-lines.rs diff --git a/tests/target/imports-reorder.rs b/rustfmt-core/tests/target/imports-reorder.rs similarity index 100% rename from tests/target/imports-reorder.rs rename to rustfmt-core/tests/target/imports-reorder.rs diff --git a/tests/target/imports.rs b/rustfmt-core/tests/target/imports.rs similarity index 100% rename from tests/target/imports.rs rename to rustfmt-core/tests/target/imports.rs diff --git a/tests/target/imports_2015_edition.rs b/rustfmt-core/tests/target/imports_2015_edition.rs similarity index 100% rename from tests/target/imports_2015_edition.rs rename to rustfmt-core/tests/target/imports_2015_edition.rs diff --git a/tests/target/imports_block_indent.rs b/rustfmt-core/tests/target/imports_block_indent.rs similarity index 100% rename from tests/target/imports_block_indent.rs rename to rustfmt-core/tests/target/imports_block_indent.rs diff --git a/tests/target/imports_raw_identifiers.rs b/rustfmt-core/tests/target/imports_raw_identifiers.rs similarity index 100% rename from tests/target/imports_raw_identifiers.rs rename to rustfmt-core/tests/target/imports_raw_identifiers.rs diff --git a/tests/target/indented-impl.rs b/rustfmt-core/tests/target/indented-impl.rs similarity index 100% rename from tests/target/indented-impl.rs rename to rustfmt-core/tests/target/indented-impl.rs diff --git a/tests/target/invalid-rust-code-in-doc-comment.rs b/rustfmt-core/tests/target/invalid-rust-code-in-doc-comment.rs similarity index 100% rename from tests/target/invalid-rust-code-in-doc-comment.rs rename to rustfmt-core/tests/target/invalid-rust-code-in-doc-comment.rs diff --git a/tests/target/issue-1021.rs b/rustfmt-core/tests/target/issue-1021.rs similarity index 100% rename from tests/target/issue-1021.rs rename to rustfmt-core/tests/target/issue-1021.rs diff --git a/tests/target/issue-1049.rs b/rustfmt-core/tests/target/issue-1049.rs similarity index 100% rename from tests/target/issue-1049.rs rename to rustfmt-core/tests/target/issue-1049.rs diff --git a/tests/target/issue-1055.rs b/rustfmt-core/tests/target/issue-1055.rs similarity index 100% rename from tests/target/issue-1055.rs rename to rustfmt-core/tests/target/issue-1055.rs diff --git a/tests/target/issue-1096.rs b/rustfmt-core/tests/target/issue-1096.rs similarity index 100% rename from tests/target/issue-1096.rs rename to rustfmt-core/tests/target/issue-1096.rs diff --git a/tests/target/issue-1111.rs b/rustfmt-core/tests/target/issue-1111.rs similarity index 100% rename from tests/target/issue-1111.rs rename to rustfmt-core/tests/target/issue-1111.rs diff --git a/tests/target/issue-1113.rs b/rustfmt-core/tests/target/issue-1113.rs similarity index 100% rename from tests/target/issue-1113.rs rename to rustfmt-core/tests/target/issue-1113.rs diff --git a/tests/target/issue-1120.rs b/rustfmt-core/tests/target/issue-1120.rs similarity index 100% rename from tests/target/issue-1120.rs rename to rustfmt-core/tests/target/issue-1120.rs diff --git a/tests/target/issue-1124.rs b/rustfmt-core/tests/target/issue-1124.rs similarity index 100% rename from tests/target/issue-1124.rs rename to rustfmt-core/tests/target/issue-1124.rs diff --git a/tests/target/issue-1127.rs b/rustfmt-core/tests/target/issue-1127.rs similarity index 100% rename from tests/target/issue-1127.rs rename to rustfmt-core/tests/target/issue-1127.rs diff --git a/tests/target/issue-1158.rs b/rustfmt-core/tests/target/issue-1158.rs similarity index 100% rename from tests/target/issue-1158.rs rename to rustfmt-core/tests/target/issue-1158.rs diff --git a/tests/target/issue-1177.rs b/rustfmt-core/tests/target/issue-1177.rs similarity index 100% rename from tests/target/issue-1177.rs rename to rustfmt-core/tests/target/issue-1177.rs diff --git a/tests/target/issue-1192.rs b/rustfmt-core/tests/target/issue-1192.rs similarity index 100% rename from tests/target/issue-1192.rs rename to rustfmt-core/tests/target/issue-1192.rs diff --git a/tests/target/issue-1210/a.rs b/rustfmt-core/tests/target/issue-1210/a.rs similarity index 100% rename from tests/target/issue-1210/a.rs rename to rustfmt-core/tests/target/issue-1210/a.rs diff --git a/tests/target/issue-1210/b.rs b/rustfmt-core/tests/target/issue-1210/b.rs similarity index 100% rename from tests/target/issue-1210/b.rs rename to rustfmt-core/tests/target/issue-1210/b.rs diff --git a/tests/target/issue-1210/c.rs b/rustfmt-core/tests/target/issue-1210/c.rs similarity index 100% rename from tests/target/issue-1210/c.rs rename to rustfmt-core/tests/target/issue-1210/c.rs diff --git a/tests/target/issue-1210/d.rs b/rustfmt-core/tests/target/issue-1210/d.rs similarity index 100% rename from tests/target/issue-1210/d.rs rename to rustfmt-core/tests/target/issue-1210/d.rs diff --git a/tests/target/issue-1210/e.rs b/rustfmt-core/tests/target/issue-1210/e.rs similarity index 100% rename from tests/target/issue-1210/e.rs rename to rustfmt-core/tests/target/issue-1210/e.rs diff --git a/tests/target/issue-1211.rs b/rustfmt-core/tests/target/issue-1211.rs similarity index 100% rename from tests/target/issue-1211.rs rename to rustfmt-core/tests/target/issue-1211.rs diff --git a/tests/target/issue-1214.rs b/rustfmt-core/tests/target/issue-1214.rs similarity index 100% rename from tests/target/issue-1214.rs rename to rustfmt-core/tests/target/issue-1214.rs diff --git a/tests/target/issue-1216.rs b/rustfmt-core/tests/target/issue-1216.rs similarity index 100% rename from tests/target/issue-1216.rs rename to rustfmt-core/tests/target/issue-1216.rs diff --git a/tests/target/issue-1239.rs b/rustfmt-core/tests/target/issue-1239.rs similarity index 100% rename from tests/target/issue-1239.rs rename to rustfmt-core/tests/target/issue-1239.rs diff --git a/tests/target/issue-1247.rs b/rustfmt-core/tests/target/issue-1247.rs similarity index 100% rename from tests/target/issue-1247.rs rename to rustfmt-core/tests/target/issue-1247.rs diff --git a/tests/target/issue-1255.rs b/rustfmt-core/tests/target/issue-1255.rs similarity index 100% rename from tests/target/issue-1255.rs rename to rustfmt-core/tests/target/issue-1255.rs diff --git a/tests/target/issue-1278.rs b/rustfmt-core/tests/target/issue-1278.rs similarity index 100% rename from tests/target/issue-1278.rs rename to rustfmt-core/tests/target/issue-1278.rs diff --git a/tests/target/issue-1350.rs b/rustfmt-core/tests/target/issue-1350.rs similarity index 100% rename from tests/target/issue-1350.rs rename to rustfmt-core/tests/target/issue-1350.rs diff --git a/tests/target/issue-1366.rs b/rustfmt-core/tests/target/issue-1366.rs similarity index 100% rename from tests/target/issue-1366.rs rename to rustfmt-core/tests/target/issue-1366.rs diff --git a/tests/target/issue-1397.rs b/rustfmt-core/tests/target/issue-1397.rs similarity index 100% rename from tests/target/issue-1397.rs rename to rustfmt-core/tests/target/issue-1397.rs diff --git a/tests/target/issue-1468.rs b/rustfmt-core/tests/target/issue-1468.rs similarity index 100% rename from tests/target/issue-1468.rs rename to rustfmt-core/tests/target/issue-1468.rs diff --git a/tests/target/issue-1598.rs b/rustfmt-core/tests/target/issue-1598.rs similarity index 100% rename from tests/target/issue-1598.rs rename to rustfmt-core/tests/target/issue-1598.rs diff --git a/tests/target/issue-1624.rs b/rustfmt-core/tests/target/issue-1624.rs similarity index 100% rename from tests/target/issue-1624.rs rename to rustfmt-core/tests/target/issue-1624.rs diff --git a/tests/target/issue-1681.rs b/rustfmt-core/tests/target/issue-1681.rs similarity index 100% rename from tests/target/issue-1681.rs rename to rustfmt-core/tests/target/issue-1681.rs diff --git a/tests/target/issue-1693.rs b/rustfmt-core/tests/target/issue-1693.rs similarity index 100% rename from tests/target/issue-1693.rs rename to rustfmt-core/tests/target/issue-1693.rs diff --git a/tests/target/issue-1703.rs b/rustfmt-core/tests/target/issue-1703.rs similarity index 100% rename from tests/target/issue-1703.rs rename to rustfmt-core/tests/target/issue-1703.rs diff --git a/tests/target/issue-1800.rs b/rustfmt-core/tests/target/issue-1800.rs similarity index 100% rename from tests/target/issue-1800.rs rename to rustfmt-core/tests/target/issue-1800.rs diff --git a/tests/target/issue-1802.rs b/rustfmt-core/tests/target/issue-1802.rs similarity index 100% rename from tests/target/issue-1802.rs rename to rustfmt-core/tests/target/issue-1802.rs diff --git a/tests/target/issue-1824.rs b/rustfmt-core/tests/target/issue-1824.rs similarity index 100% rename from tests/target/issue-1824.rs rename to rustfmt-core/tests/target/issue-1824.rs diff --git a/tests/target/issue-1914.rs b/rustfmt-core/tests/target/issue-1914.rs similarity index 100% rename from tests/target/issue-1914.rs rename to rustfmt-core/tests/target/issue-1914.rs diff --git a/tests/target/issue-2025.rs b/rustfmt-core/tests/target/issue-2025.rs similarity index 100% rename from tests/target/issue-2025.rs rename to rustfmt-core/tests/target/issue-2025.rs diff --git a/tests/target/issue-2103.rs b/rustfmt-core/tests/target/issue-2103.rs similarity index 100% rename from tests/target/issue-2103.rs rename to rustfmt-core/tests/target/issue-2103.rs diff --git a/tests/target/issue-2111.rs b/rustfmt-core/tests/target/issue-2111.rs similarity index 100% rename from tests/target/issue-2111.rs rename to rustfmt-core/tests/target/issue-2111.rs diff --git a/tests/target/issue-2123.rs b/rustfmt-core/tests/target/issue-2123.rs similarity index 100% rename from tests/target/issue-2123.rs rename to rustfmt-core/tests/target/issue-2123.rs diff --git a/tests/target/issue-2164.rs b/rustfmt-core/tests/target/issue-2164.rs similarity index 100% rename from tests/target/issue-2164.rs rename to rustfmt-core/tests/target/issue-2164.rs diff --git a/tests/target/issue-2179/two.rs b/rustfmt-core/tests/target/issue-2179/two.rs similarity index 100% rename from tests/target/issue-2179/two.rs rename to rustfmt-core/tests/target/issue-2179/two.rs diff --git a/tests/target/issue-2197.rs b/rustfmt-core/tests/target/issue-2197.rs similarity index 100% rename from tests/target/issue-2197.rs rename to rustfmt-core/tests/target/issue-2197.rs diff --git a/tests/target/issue-2256.rs b/rustfmt-core/tests/target/issue-2256.rs similarity index 100% rename from tests/target/issue-2256.rs rename to rustfmt-core/tests/target/issue-2256.rs diff --git a/tests/target/issue-2324.rs b/rustfmt-core/tests/target/issue-2324.rs similarity index 100% rename from tests/target/issue-2324.rs rename to rustfmt-core/tests/target/issue-2324.rs diff --git a/tests/target/issue-2329.rs b/rustfmt-core/tests/target/issue-2329.rs similarity index 100% rename from tests/target/issue-2329.rs rename to rustfmt-core/tests/target/issue-2329.rs diff --git a/tests/target/issue-2342.rs b/rustfmt-core/tests/target/issue-2342.rs similarity index 100% rename from tests/target/issue-2342.rs rename to rustfmt-core/tests/target/issue-2342.rs diff --git a/tests/target/issue-2346.rs b/rustfmt-core/tests/target/issue-2346.rs similarity index 100% rename from tests/target/issue-2346.rs rename to rustfmt-core/tests/target/issue-2346.rs diff --git a/tests/target/issue-2401.rs b/rustfmt-core/tests/target/issue-2401.rs similarity index 100% rename from tests/target/issue-2401.rs rename to rustfmt-core/tests/target/issue-2401.rs diff --git a/tests/target/issue-2445.rs b/rustfmt-core/tests/target/issue-2445.rs similarity index 100% rename from tests/target/issue-2445.rs rename to rustfmt-core/tests/target/issue-2445.rs diff --git a/tests/target/issue-2446.rs b/rustfmt-core/tests/target/issue-2446.rs similarity index 100% rename from tests/target/issue-2446.rs rename to rustfmt-core/tests/target/issue-2446.rs diff --git a/tests/target/issue-2479.rs b/rustfmt-core/tests/target/issue-2479.rs similarity index 100% rename from tests/target/issue-2479.rs rename to rustfmt-core/tests/target/issue-2479.rs diff --git a/tests/target/issue-2482/a.rs b/rustfmt-core/tests/target/issue-2482/a.rs similarity index 100% rename from tests/target/issue-2482/a.rs rename to rustfmt-core/tests/target/issue-2482/a.rs diff --git a/tests/target/issue-2482/b.rs b/rustfmt-core/tests/target/issue-2482/b.rs similarity index 100% rename from tests/target/issue-2482/b.rs rename to rustfmt-core/tests/target/issue-2482/b.rs diff --git a/tests/target/issue-2482/c.rs b/rustfmt-core/tests/target/issue-2482/c.rs similarity index 100% rename from tests/target/issue-2482/c.rs rename to rustfmt-core/tests/target/issue-2482/c.rs diff --git a/tests/target/issue-2496.rs b/rustfmt-core/tests/target/issue-2496.rs similarity index 100% rename from tests/target/issue-2496.rs rename to rustfmt-core/tests/target/issue-2496.rs diff --git a/tests/target/issue-2520.rs b/rustfmt-core/tests/target/issue-2520.rs similarity index 100% rename from tests/target/issue-2520.rs rename to rustfmt-core/tests/target/issue-2520.rs diff --git a/tests/target/issue-2523.rs b/rustfmt-core/tests/target/issue-2523.rs similarity index 100% rename from tests/target/issue-2523.rs rename to rustfmt-core/tests/target/issue-2523.rs diff --git a/tests/target/issue-2526.rs b/rustfmt-core/tests/target/issue-2526.rs similarity index 100% rename from tests/target/issue-2526.rs rename to rustfmt-core/tests/target/issue-2526.rs diff --git a/tests/target/issue-2551.rs b/rustfmt-core/tests/target/issue-2551.rs similarity index 100% rename from tests/target/issue-2551.rs rename to rustfmt-core/tests/target/issue-2551.rs diff --git a/tests/target/issue-2554.rs b/rustfmt-core/tests/target/issue-2554.rs similarity index 100% rename from tests/target/issue-2554.rs rename to rustfmt-core/tests/target/issue-2554.rs diff --git a/tests/target/issue-2582.rs b/rustfmt-core/tests/target/issue-2582.rs similarity index 100% rename from tests/target/issue-2582.rs rename to rustfmt-core/tests/target/issue-2582.rs diff --git a/tests/target/issue-2641.rs b/rustfmt-core/tests/target/issue-2641.rs similarity index 100% rename from tests/target/issue-2641.rs rename to rustfmt-core/tests/target/issue-2641.rs diff --git a/tests/target/issue-2644.rs b/rustfmt-core/tests/target/issue-2644.rs similarity index 100% rename from tests/target/issue-2644.rs rename to rustfmt-core/tests/target/issue-2644.rs diff --git a/tests/target/issue-2673-nonmodrs-mods/foo.rs b/rustfmt-core/tests/target/issue-2673-nonmodrs-mods/foo.rs similarity index 100% rename from tests/target/issue-2673-nonmodrs-mods/foo.rs rename to rustfmt-core/tests/target/issue-2673-nonmodrs-mods/foo.rs diff --git a/tests/target/issue-2673-nonmodrs-mods/foo/bar.rs b/rustfmt-core/tests/target/issue-2673-nonmodrs-mods/foo/bar.rs similarity index 100% rename from tests/target/issue-2673-nonmodrs-mods/foo/bar.rs rename to rustfmt-core/tests/target/issue-2673-nonmodrs-mods/foo/bar.rs diff --git a/tests/target/issue-2673-nonmodrs-mods/lib.rs b/rustfmt-core/tests/target/issue-2673-nonmodrs-mods/lib.rs similarity index 100% rename from tests/target/issue-2673-nonmodrs-mods/lib.rs rename to rustfmt-core/tests/target/issue-2673-nonmodrs-mods/lib.rs diff --git a/tests/target/issue-2728.rs b/rustfmt-core/tests/target/issue-2728.rs similarity index 100% rename from tests/target/issue-2728.rs rename to rustfmt-core/tests/target/issue-2728.rs diff --git a/tests/target/issue-2759.rs b/rustfmt-core/tests/target/issue-2759.rs similarity index 100% rename from tests/target/issue-2759.rs rename to rustfmt-core/tests/target/issue-2759.rs diff --git a/tests/target/issue-2761.rs b/rustfmt-core/tests/target/issue-2761.rs similarity index 100% rename from tests/target/issue-2761.rs rename to rustfmt-core/tests/target/issue-2761.rs diff --git a/tests/target/issue-2794.rs b/rustfmt-core/tests/target/issue-2794.rs similarity index 100% rename from tests/target/issue-2794.rs rename to rustfmt-core/tests/target/issue-2794.rs diff --git a/tests/target/issue-2810.rs b/rustfmt-core/tests/target/issue-2810.rs similarity index 100% rename from tests/target/issue-2810.rs rename to rustfmt-core/tests/target/issue-2810.rs diff --git a/tests/target/issue-2835.rs b/rustfmt-core/tests/target/issue-2835.rs similarity index 100% rename from tests/target/issue-2835.rs rename to rustfmt-core/tests/target/issue-2835.rs diff --git a/tests/target/issue-2863.rs b/rustfmt-core/tests/target/issue-2863.rs similarity index 100% rename from tests/target/issue-2863.rs rename to rustfmt-core/tests/target/issue-2863.rs diff --git a/tests/target/issue-2869.rs b/rustfmt-core/tests/target/issue-2869.rs similarity index 100% rename from tests/target/issue-2869.rs rename to rustfmt-core/tests/target/issue-2869.rs diff --git a/tests/target/issue-2896.rs b/rustfmt-core/tests/target/issue-2896.rs similarity index 100% rename from tests/target/issue-2896.rs rename to rustfmt-core/tests/target/issue-2896.rs diff --git a/tests/target/issue-2916.rs b/rustfmt-core/tests/target/issue-2916.rs similarity index 100% rename from tests/target/issue-2916.rs rename to rustfmt-core/tests/target/issue-2916.rs diff --git a/tests/target/issue-2917/minimal.rs b/rustfmt-core/tests/target/issue-2917/minimal.rs similarity index 100% rename from tests/target/issue-2917/minimal.rs rename to rustfmt-core/tests/target/issue-2917/minimal.rs diff --git a/tests/target/issue-2917/packed_simd.rs b/rustfmt-core/tests/target/issue-2917/packed_simd.rs similarity index 100% rename from tests/target/issue-2917/packed_simd.rs rename to rustfmt-core/tests/target/issue-2917/packed_simd.rs diff --git a/tests/target/issue-2922.rs b/rustfmt-core/tests/target/issue-2922.rs similarity index 100% rename from tests/target/issue-2922.rs rename to rustfmt-core/tests/target/issue-2922.rs diff --git a/tests/target/issue-2927-2.rs b/rustfmt-core/tests/target/issue-2927-2.rs similarity index 100% rename from tests/target/issue-2927-2.rs rename to rustfmt-core/tests/target/issue-2927-2.rs diff --git a/tests/target/issue-2927.rs b/rustfmt-core/tests/target/issue-2927.rs similarity index 100% rename from tests/target/issue-2927.rs rename to rustfmt-core/tests/target/issue-2927.rs diff --git a/tests/target/issue-2930.rs b/rustfmt-core/tests/target/issue-2930.rs similarity index 100% rename from tests/target/issue-2930.rs rename to rustfmt-core/tests/target/issue-2930.rs diff --git a/tests/target/issue-2936.rs b/rustfmt-core/tests/target/issue-2936.rs similarity index 100% rename from tests/target/issue-2936.rs rename to rustfmt-core/tests/target/issue-2936.rs diff --git a/tests/target/issue-2941.rs b/rustfmt-core/tests/target/issue-2941.rs similarity index 100% rename from tests/target/issue-2941.rs rename to rustfmt-core/tests/target/issue-2941.rs diff --git a/tests/target/issue-2955.rs b/rustfmt-core/tests/target/issue-2955.rs similarity index 100% rename from tests/target/issue-2955.rs rename to rustfmt-core/tests/target/issue-2955.rs diff --git a/tests/target/issue-2973.rs b/rustfmt-core/tests/target/issue-2973.rs similarity index 100% rename from tests/target/issue-2973.rs rename to rustfmt-core/tests/target/issue-2973.rs diff --git a/tests/target/issue-2976.rs b/rustfmt-core/tests/target/issue-2976.rs similarity index 100% rename from tests/target/issue-2976.rs rename to rustfmt-core/tests/target/issue-2976.rs diff --git a/tests/target/issue-2977/block.rs b/rustfmt-core/tests/target/issue-2977/block.rs similarity index 100% rename from tests/target/issue-2977/block.rs rename to rustfmt-core/tests/target/issue-2977/block.rs diff --git a/tests/target/issue-2977/impl.rs b/rustfmt-core/tests/target/issue-2977/impl.rs similarity index 100% rename from tests/target/issue-2977/impl.rs rename to rustfmt-core/tests/target/issue-2977/impl.rs diff --git a/tests/target/issue-2977/item.rs b/rustfmt-core/tests/target/issue-2977/item.rs similarity index 100% rename from tests/target/issue-2977/item.rs rename to rustfmt-core/tests/target/issue-2977/item.rs diff --git a/tests/target/issue-2977/trait.rs b/rustfmt-core/tests/target/issue-2977/trait.rs similarity index 100% rename from tests/target/issue-2977/trait.rs rename to rustfmt-core/tests/target/issue-2977/trait.rs diff --git a/tests/target/issue-2985.rs b/rustfmt-core/tests/target/issue-2985.rs similarity index 100% rename from tests/target/issue-2985.rs rename to rustfmt-core/tests/target/issue-2985.rs diff --git a/tests/target/issue-2995.rs b/rustfmt-core/tests/target/issue-2995.rs similarity index 100% rename from tests/target/issue-2995.rs rename to rustfmt-core/tests/target/issue-2995.rs diff --git a/tests/target/issue-3029.rs b/rustfmt-core/tests/target/issue-3029.rs similarity index 100% rename from tests/target/issue-3029.rs rename to rustfmt-core/tests/target/issue-3029.rs diff --git a/tests/target/issue-3032.rs b/rustfmt-core/tests/target/issue-3032.rs similarity index 100% rename from tests/target/issue-3032.rs rename to rustfmt-core/tests/target/issue-3032.rs diff --git a/tests/target/issue-3038.rs b/rustfmt-core/tests/target/issue-3038.rs similarity index 100% rename from tests/target/issue-3038.rs rename to rustfmt-core/tests/target/issue-3038.rs diff --git a/tests/target/issue-3043.rs b/rustfmt-core/tests/target/issue-3043.rs similarity index 100% rename from tests/target/issue-3043.rs rename to rustfmt-core/tests/target/issue-3043.rs diff --git a/tests/target/issue-3049.rs b/rustfmt-core/tests/target/issue-3049.rs similarity index 100% rename from tests/target/issue-3049.rs rename to rustfmt-core/tests/target/issue-3049.rs diff --git a/tests/target/issue-3055/backtick.rs b/rustfmt-core/tests/target/issue-3055/backtick.rs similarity index 100% rename from tests/target/issue-3055/backtick.rs rename to rustfmt-core/tests/target/issue-3055/backtick.rs diff --git a/tests/target/issue-3055/empty-code-block.rs b/rustfmt-core/tests/target/issue-3055/empty-code-block.rs similarity index 100% rename from tests/target/issue-3055/empty-code-block.rs rename to rustfmt-core/tests/target/issue-3055/empty-code-block.rs diff --git a/tests/target/issue-3055/original.rs b/rustfmt-core/tests/target/issue-3055/original.rs similarity index 100% rename from tests/target/issue-3055/original.rs rename to rustfmt-core/tests/target/issue-3055/original.rs diff --git a/tests/target/issue-3059.rs b/rustfmt-core/tests/target/issue-3059.rs similarity index 100% rename from tests/target/issue-3059.rs rename to rustfmt-core/tests/target/issue-3059.rs diff --git a/tests/target/issue-3066.rs b/rustfmt-core/tests/target/issue-3066.rs similarity index 100% rename from tests/target/issue-3066.rs rename to rustfmt-core/tests/target/issue-3066.rs diff --git a/tests/target/issue-3105.rs b/rustfmt-core/tests/target/issue-3105.rs similarity index 100% rename from tests/target/issue-3105.rs rename to rustfmt-core/tests/target/issue-3105.rs diff --git a/tests/target/issue-3118.rs b/rustfmt-core/tests/target/issue-3118.rs similarity index 100% rename from tests/target/issue-3118.rs rename to rustfmt-core/tests/target/issue-3118.rs diff --git a/tests/target/issue-3124.rs b/rustfmt-core/tests/target/issue-3124.rs similarity index 100% rename from tests/target/issue-3124.rs rename to rustfmt-core/tests/target/issue-3124.rs diff --git a/tests/target/issue-3131.rs b/rustfmt-core/tests/target/issue-3131.rs similarity index 100% rename from tests/target/issue-3131.rs rename to rustfmt-core/tests/target/issue-3131.rs diff --git a/tests/target/issue-3132.rs b/rustfmt-core/tests/target/issue-3132.rs similarity index 100% rename from tests/target/issue-3132.rs rename to rustfmt-core/tests/target/issue-3132.rs diff --git a/tests/target/issue-3153.rs b/rustfmt-core/tests/target/issue-3153.rs similarity index 100% rename from tests/target/issue-3153.rs rename to rustfmt-core/tests/target/issue-3153.rs diff --git a/tests/target/issue-3170.rs b/rustfmt-core/tests/target/issue-3170.rs similarity index 100% rename from tests/target/issue-3170.rs rename to rustfmt-core/tests/target/issue-3170.rs diff --git a/tests/target/issue-3182.rs b/rustfmt-core/tests/target/issue-3182.rs similarity index 100% rename from tests/target/issue-3182.rs rename to rustfmt-core/tests/target/issue-3182.rs diff --git a/tests/target/issue-3184.rs b/rustfmt-core/tests/target/issue-3184.rs similarity index 100% rename from tests/target/issue-3184.rs rename to rustfmt-core/tests/target/issue-3184.rs diff --git a/tests/target/issue-3194.rs b/rustfmt-core/tests/target/issue-3194.rs similarity index 100% rename from tests/target/issue-3194.rs rename to rustfmt-core/tests/target/issue-3194.rs diff --git a/tests/target/issue-3198.rs b/rustfmt-core/tests/target/issue-3198.rs similarity index 100% rename from tests/target/issue-3198.rs rename to rustfmt-core/tests/target/issue-3198.rs diff --git a/tests/target/issue-3213/version_two.rs b/rustfmt-core/tests/target/issue-3213/version_two.rs similarity index 100% rename from tests/target/issue-3213/version_two.rs rename to rustfmt-core/tests/target/issue-3213/version_two.rs diff --git a/tests/target/issue-3217.rs b/rustfmt-core/tests/target/issue-3217.rs similarity index 100% rename from tests/target/issue-3217.rs rename to rustfmt-core/tests/target/issue-3217.rs diff --git a/tests/target/issue-3224.rs b/rustfmt-core/tests/target/issue-3224.rs similarity index 100% rename from tests/target/issue-3224.rs rename to rustfmt-core/tests/target/issue-3224.rs diff --git a/tests/target/issue-3227/two.rs b/rustfmt-core/tests/target/issue-3227/two.rs similarity index 100% rename from tests/target/issue-3227/two.rs rename to rustfmt-core/tests/target/issue-3227/two.rs diff --git a/tests/target/issue-3234.rs b/rustfmt-core/tests/target/issue-3234.rs similarity index 100% rename from tests/target/issue-3234.rs rename to rustfmt-core/tests/target/issue-3234.rs diff --git a/tests/target/issue-3241.rs b/rustfmt-core/tests/target/issue-3241.rs similarity index 100% rename from tests/target/issue-3241.rs rename to rustfmt-core/tests/target/issue-3241.rs diff --git a/tests/target/issue-3253/bar.rs b/rustfmt-core/tests/target/issue-3253/bar.rs similarity index 100% rename from tests/target/issue-3253/bar.rs rename to rustfmt-core/tests/target/issue-3253/bar.rs diff --git a/tests/target/issue-3253/foo.rs b/rustfmt-core/tests/target/issue-3253/foo.rs similarity index 100% rename from tests/target/issue-3253/foo.rs rename to rustfmt-core/tests/target/issue-3253/foo.rs diff --git a/tests/target/issue-3253/lib.rs b/rustfmt-core/tests/target/issue-3253/lib.rs similarity index 100% rename from tests/target/issue-3253/lib.rs rename to rustfmt-core/tests/target/issue-3253/lib.rs diff --git a/tests/target/issue-3253/paths/bar_foo.rs b/rustfmt-core/tests/target/issue-3253/paths/bar_foo.rs similarity index 100% rename from tests/target/issue-3253/paths/bar_foo.rs rename to rustfmt-core/tests/target/issue-3253/paths/bar_foo.rs diff --git a/tests/target/issue-3253/paths/excluded.rs b/rustfmt-core/tests/target/issue-3253/paths/excluded.rs similarity index 100% rename from tests/target/issue-3253/paths/excluded.rs rename to rustfmt-core/tests/target/issue-3253/paths/excluded.rs diff --git a/tests/target/issue-3253/paths/foo_bar.rs b/rustfmt-core/tests/target/issue-3253/paths/foo_bar.rs similarity index 100% rename from tests/target/issue-3253/paths/foo_bar.rs rename to rustfmt-core/tests/target/issue-3253/paths/foo_bar.rs diff --git a/tests/target/issue-3265.rs b/rustfmt-core/tests/target/issue-3265.rs similarity index 100% rename from tests/target/issue-3265.rs rename to rustfmt-core/tests/target/issue-3265.rs diff --git a/tests/target/issue-3270/two.rs b/rustfmt-core/tests/target/issue-3270/two.rs similarity index 100% rename from tests/target/issue-3270/two.rs rename to rustfmt-core/tests/target/issue-3270/two.rs diff --git a/tests/target/issue-3270/wrap.rs b/rustfmt-core/tests/target/issue-3270/wrap.rs similarity index 100% rename from tests/target/issue-3270/wrap.rs rename to rustfmt-core/tests/target/issue-3270/wrap.rs diff --git a/tests/target/issue-3272/v2.rs b/rustfmt-core/tests/target/issue-3272/v2.rs similarity index 100% rename from tests/target/issue-3272/v2.rs rename to rustfmt-core/tests/target/issue-3272/v2.rs diff --git a/tests/target/issue-3278/version_two.rs b/rustfmt-core/tests/target/issue-3278/version_two.rs similarity index 100% rename from tests/target/issue-3278/version_two.rs rename to rustfmt-core/tests/target/issue-3278/version_two.rs diff --git a/tests/target/issue-3295/two.rs b/rustfmt-core/tests/target/issue-3295/two.rs similarity index 100% rename from tests/target/issue-3295/two.rs rename to rustfmt-core/tests/target/issue-3295/two.rs diff --git a/tests/target/issue-3302.rs b/rustfmt-core/tests/target/issue-3302.rs similarity index 100% rename from tests/target/issue-3302.rs rename to rustfmt-core/tests/target/issue-3302.rs diff --git a/tests/target/issue-3304.rs b/rustfmt-core/tests/target/issue-3304.rs similarity index 100% rename from tests/target/issue-3304.rs rename to rustfmt-core/tests/target/issue-3304.rs diff --git a/tests/target/issue-3314.rs b/rustfmt-core/tests/target/issue-3314.rs similarity index 100% rename from tests/target/issue-3314.rs rename to rustfmt-core/tests/target/issue-3314.rs diff --git a/tests/target/issue-3343.rs b/rustfmt-core/tests/target/issue-3343.rs similarity index 100% rename from tests/target/issue-3343.rs rename to rustfmt-core/tests/target/issue-3343.rs diff --git a/tests/target/issue-3423.rs b/rustfmt-core/tests/target/issue-3423.rs similarity index 100% rename from tests/target/issue-3423.rs rename to rustfmt-core/tests/target/issue-3423.rs diff --git a/tests/target/issue-3434/lib.rs b/rustfmt-core/tests/target/issue-3434/lib.rs similarity index 100% rename from tests/target/issue-3434/lib.rs rename to rustfmt-core/tests/target/issue-3434/lib.rs diff --git a/tests/target/issue-3434/no_entry.rs b/rustfmt-core/tests/target/issue-3434/no_entry.rs similarity index 100% rename from tests/target/issue-3434/no_entry.rs rename to rustfmt-core/tests/target/issue-3434/no_entry.rs diff --git a/tests/target/issue-3434/not_skip_macro.rs b/rustfmt-core/tests/target/issue-3434/not_skip_macro.rs similarity index 100% rename from tests/target/issue-3434/not_skip_macro.rs rename to rustfmt-core/tests/target/issue-3434/not_skip_macro.rs diff --git a/tests/target/issue-3442.rs b/rustfmt-core/tests/target/issue-3442.rs similarity index 100% rename from tests/target/issue-3442.rs rename to rustfmt-core/tests/target/issue-3442.rs diff --git a/tests/target/issue-3465.rs b/rustfmt-core/tests/target/issue-3465.rs similarity index 100% rename from tests/target/issue-3465.rs rename to rustfmt-core/tests/target/issue-3465.rs diff --git a/tests/target/issue-3494/crlf.rs b/rustfmt-core/tests/target/issue-3494/crlf.rs similarity index 100% rename from tests/target/issue-3494/crlf.rs rename to rustfmt-core/tests/target/issue-3494/crlf.rs diff --git a/tests/target/issue-3494/lf.rs b/rustfmt-core/tests/target/issue-3494/lf.rs similarity index 100% rename from tests/target/issue-3494/lf.rs rename to rustfmt-core/tests/target/issue-3494/lf.rs diff --git a/tests/target/issue-3499.rs b/rustfmt-core/tests/target/issue-3499.rs similarity index 100% rename from tests/target/issue-3499.rs rename to rustfmt-core/tests/target/issue-3499.rs diff --git a/tests/target/issue-3508.rs b/rustfmt-core/tests/target/issue-3508.rs similarity index 100% rename from tests/target/issue-3508.rs rename to rustfmt-core/tests/target/issue-3508.rs diff --git a/tests/target/issue-3515.rs b/rustfmt-core/tests/target/issue-3515.rs similarity index 100% rename from tests/target/issue-3515.rs rename to rustfmt-core/tests/target/issue-3515.rs diff --git a/tests/target/issue-3532.rs b/rustfmt-core/tests/target/issue-3532.rs similarity index 100% rename from tests/target/issue-3532.rs rename to rustfmt-core/tests/target/issue-3532.rs diff --git a/tests/target/issue-3539.rs b/rustfmt-core/tests/target/issue-3539.rs similarity index 100% rename from tests/target/issue-3539.rs rename to rustfmt-core/tests/target/issue-3539.rs diff --git a/tests/target/issue-3554.rs b/rustfmt-core/tests/target/issue-3554.rs similarity index 100% rename from tests/target/issue-3554.rs rename to rustfmt-core/tests/target/issue-3554.rs diff --git a/tests/target/issue-3567.rs b/rustfmt-core/tests/target/issue-3567.rs similarity index 100% rename from tests/target/issue-3567.rs rename to rustfmt-core/tests/target/issue-3567.rs diff --git a/tests/target/issue-3568.rs b/rustfmt-core/tests/target/issue-3568.rs similarity index 100% rename from tests/target/issue-3568.rs rename to rustfmt-core/tests/target/issue-3568.rs diff --git a/tests/target/issue-3585/extern_crate.rs b/rustfmt-core/tests/target/issue-3585/extern_crate.rs similarity index 100% rename from tests/target/issue-3585/extern_crate.rs rename to rustfmt-core/tests/target/issue-3585/extern_crate.rs diff --git a/tests/target/issue-3585/reorder_imports_disabled.rs b/rustfmt-core/tests/target/issue-3585/reorder_imports_disabled.rs similarity index 100% rename from tests/target/issue-3585/reorder_imports_disabled.rs rename to rustfmt-core/tests/target/issue-3585/reorder_imports_disabled.rs diff --git a/tests/target/issue-3585/reorder_imports_enabled.rs b/rustfmt-core/tests/target/issue-3585/reorder_imports_enabled.rs similarity index 100% rename from tests/target/issue-3585/reorder_imports_enabled.rs rename to rustfmt-core/tests/target/issue-3585/reorder_imports_enabled.rs diff --git a/tests/target/issue-3585/use.rs b/rustfmt-core/tests/target/issue-3585/use.rs similarity index 100% rename from tests/target/issue-3585/use.rs rename to rustfmt-core/tests/target/issue-3585/use.rs diff --git a/tests/target/issue-3592.rs b/rustfmt-core/tests/target/issue-3592.rs similarity index 100% rename from tests/target/issue-3592.rs rename to rustfmt-core/tests/target/issue-3592.rs diff --git a/tests/target/issue-3595.rs b/rustfmt-core/tests/target/issue-3595.rs similarity index 100% rename from tests/target/issue-3595.rs rename to rustfmt-core/tests/target/issue-3595.rs diff --git a/tests/target/issue-3601.rs b/rustfmt-core/tests/target/issue-3601.rs similarity index 100% rename from tests/target/issue-3601.rs rename to rustfmt-core/tests/target/issue-3601.rs diff --git a/tests/target/issue-3614/version_two.rs b/rustfmt-core/tests/target/issue-3614/version_two.rs similarity index 100% rename from tests/target/issue-3614/version_two.rs rename to rustfmt-core/tests/target/issue-3614/version_two.rs diff --git a/tests/target/issue-3636.rs b/rustfmt-core/tests/target/issue-3636.rs similarity index 100% rename from tests/target/issue-3636.rs rename to rustfmt-core/tests/target/issue-3636.rs diff --git a/tests/target/issue-3639.rs b/rustfmt-core/tests/target/issue-3639.rs similarity index 100% rename from tests/target/issue-3639.rs rename to rustfmt-core/tests/target/issue-3639.rs diff --git a/tests/target/issue-3645.rs b/rustfmt-core/tests/target/issue-3645.rs similarity index 100% rename from tests/target/issue-3645.rs rename to rustfmt-core/tests/target/issue-3645.rs diff --git a/tests/target/issue-3651.rs b/rustfmt-core/tests/target/issue-3651.rs similarity index 100% rename from tests/target/issue-3651.rs rename to rustfmt-core/tests/target/issue-3651.rs diff --git a/tests/target/issue-3665/lib.rs b/rustfmt-core/tests/target/issue-3665/lib.rs similarity index 100% rename from tests/target/issue-3665/lib.rs rename to rustfmt-core/tests/target/issue-3665/lib.rs diff --git a/tests/target/issue-3665/not_skip_attribute.rs b/rustfmt-core/tests/target/issue-3665/not_skip_attribute.rs similarity index 100% rename from tests/target/issue-3665/not_skip_attribute.rs rename to rustfmt-core/tests/target/issue-3665/not_skip_attribute.rs diff --git a/tests/target/issue-3665/sub_mod.rs b/rustfmt-core/tests/target/issue-3665/sub_mod.rs similarity index 100% rename from tests/target/issue-3665/sub_mod.rs rename to rustfmt-core/tests/target/issue-3665/sub_mod.rs diff --git a/tests/target/issue-3672.rs b/rustfmt-core/tests/target/issue-3672.rs similarity index 100% rename from tests/target/issue-3672.rs rename to rustfmt-core/tests/target/issue-3672.rs diff --git a/tests/target/issue-3675.rs b/rustfmt-core/tests/target/issue-3675.rs similarity index 100% rename from tests/target/issue-3675.rs rename to rustfmt-core/tests/target/issue-3675.rs diff --git a/tests/target/issue-3701/two.rs b/rustfmt-core/tests/target/issue-3701/two.rs similarity index 100% rename from tests/target/issue-3701/two.rs rename to rustfmt-core/tests/target/issue-3701/two.rs diff --git a/tests/target/issue-3709.rs b/rustfmt-core/tests/target/issue-3709.rs similarity index 100% rename from tests/target/issue-3709.rs rename to rustfmt-core/tests/target/issue-3709.rs diff --git a/tests/target/issue-3711.rs b/rustfmt-core/tests/target/issue-3711.rs similarity index 100% rename from tests/target/issue-3711.rs rename to rustfmt-core/tests/target/issue-3711.rs diff --git a/tests/target/issue-3717.rs b/rustfmt-core/tests/target/issue-3717.rs similarity index 100% rename from tests/target/issue-3717.rs rename to rustfmt-core/tests/target/issue-3717.rs diff --git a/tests/target/issue-3718.rs b/rustfmt-core/tests/target/issue-3718.rs similarity index 100% rename from tests/target/issue-3718.rs rename to rustfmt-core/tests/target/issue-3718.rs diff --git a/tests/target/issue-3740.rs b/rustfmt-core/tests/target/issue-3740.rs similarity index 100% rename from tests/target/issue-3740.rs rename to rustfmt-core/tests/target/issue-3740.rs diff --git a/tests/target/issue-3741.rs b/rustfmt-core/tests/target/issue-3741.rs similarity index 100% rename from tests/target/issue-3741.rs rename to rustfmt-core/tests/target/issue-3741.rs diff --git a/tests/target/issue-3750.rs b/rustfmt-core/tests/target/issue-3750.rs similarity index 100% rename from tests/target/issue-3750.rs rename to rustfmt-core/tests/target/issue-3750.rs diff --git a/tests/target/issue-3751.rs b/rustfmt-core/tests/target/issue-3751.rs similarity index 100% rename from tests/target/issue-3751.rs rename to rustfmt-core/tests/target/issue-3751.rs diff --git a/tests/target/issue-3759.rs b/rustfmt-core/tests/target/issue-3759.rs similarity index 100% rename from tests/target/issue-3759.rs rename to rustfmt-core/tests/target/issue-3759.rs diff --git a/tests/target/issue-3779/ice.rs b/rustfmt-core/tests/target/issue-3779/ice.rs similarity index 100% rename from tests/target/issue-3779/ice.rs rename to rustfmt-core/tests/target/issue-3779/ice.rs diff --git a/tests/target/issue-3779/lib.rs b/rustfmt-core/tests/target/issue-3779/lib.rs similarity index 100% rename from tests/target/issue-3779/lib.rs rename to rustfmt-core/tests/target/issue-3779/lib.rs diff --git a/tests/target/issue-3786.rs b/rustfmt-core/tests/target/issue-3786.rs similarity index 100% rename from tests/target/issue-3786.rs rename to rustfmt-core/tests/target/issue-3786.rs diff --git a/tests/target/issue-3787.rs b/rustfmt-core/tests/target/issue-3787.rs similarity index 100% rename from tests/target/issue-3787.rs rename to rustfmt-core/tests/target/issue-3787.rs diff --git a/tests/target/issue-3815.rs b/rustfmt-core/tests/target/issue-3815.rs similarity index 100% rename from tests/target/issue-3815.rs rename to rustfmt-core/tests/target/issue-3815.rs diff --git a/tests/target/issue-3840/version-two_hard-tabs.rs b/rustfmt-core/tests/target/issue-3840/version-two_hard-tabs.rs similarity index 100% rename from tests/target/issue-3840/version-two_hard-tabs.rs rename to rustfmt-core/tests/target/issue-3840/version-two_hard-tabs.rs diff --git a/tests/target/issue-3840/version-two_soft-tabs.rs b/rustfmt-core/tests/target/issue-3840/version-two_soft-tabs.rs similarity index 100% rename from tests/target/issue-3840/version-two_soft-tabs.rs rename to rustfmt-core/tests/target/issue-3840/version-two_soft-tabs.rs diff --git a/tests/target/issue-3845.rs b/rustfmt-core/tests/target/issue-3845.rs similarity index 100% rename from tests/target/issue-3845.rs rename to rustfmt-core/tests/target/issue-3845.rs diff --git a/tests/target/issue-3851.rs b/rustfmt-core/tests/target/issue-3851.rs similarity index 100% rename from tests/target/issue-3851.rs rename to rustfmt-core/tests/target/issue-3851.rs diff --git a/tests/target/issue-3882.rs b/rustfmt-core/tests/target/issue-3882.rs similarity index 100% rename from tests/target/issue-3882.rs rename to rustfmt-core/tests/target/issue-3882.rs diff --git a/tests/target/issue-3904/two.rs b/rustfmt-core/tests/target/issue-3904/two.rs similarity index 100% rename from tests/target/issue-3904/two.rs rename to rustfmt-core/tests/target/issue-3904/two.rs diff --git a/tests/target/issue-3908.rs b/rustfmt-core/tests/target/issue-3908.rs similarity index 100% rename from tests/target/issue-3908.rs rename to rustfmt-core/tests/target/issue-3908.rs diff --git a/tests/target/issue-3923.rs b/rustfmt-core/tests/target/issue-3923.rs similarity index 100% rename from tests/target/issue-3923.rs rename to rustfmt-core/tests/target/issue-3923.rs diff --git a/tests/target/issue-3929.rs b/rustfmt-core/tests/target/issue-3929.rs similarity index 100% rename from tests/target/issue-3929.rs rename to rustfmt-core/tests/target/issue-3929.rs diff --git a/tests/target/issue-3933/imp-a.rs b/rustfmt-core/tests/target/issue-3933/imp-a.rs similarity index 100% rename from tests/target/issue-3933/imp-a.rs rename to rustfmt-core/tests/target/issue-3933/imp-a.rs diff --git a/tests/target/issue-3933/imp-b.rs b/rustfmt-core/tests/target/issue-3933/imp-b.rs similarity index 100% rename from tests/target/issue-3933/imp-b.rs rename to rustfmt-core/tests/target/issue-3933/imp-b.rs diff --git a/tests/target/issue-3933/lib.rs b/rustfmt-core/tests/target/issue-3933/lib.rs similarity index 100% rename from tests/target/issue-3933/lib.rs rename to rustfmt-core/tests/target/issue-3933/lib.rs diff --git a/tests/target/issue-3933/utils.rs b/rustfmt-core/tests/target/issue-3933/utils.rs similarity index 100% rename from tests/target/issue-3933/utils.rs rename to rustfmt-core/tests/target/issue-3933/utils.rs diff --git a/tests/target/issue-3934.rs b/rustfmt-core/tests/target/issue-3934.rs similarity index 100% rename from tests/target/issue-3934.rs rename to rustfmt-core/tests/target/issue-3934.rs diff --git a/tests/target/issue-3956/graphics.rs b/rustfmt-core/tests/target/issue-3956/graphics.rs similarity index 100% rename from tests/target/issue-3956/graphics.rs rename to rustfmt-core/tests/target/issue-3956/graphics.rs diff --git a/tests/target/issue-3956/graphics_emu.rs b/rustfmt-core/tests/target/issue-3956/graphics_emu.rs similarity index 100% rename from tests/target/issue-3956/graphics_emu.rs rename to rustfmt-core/tests/target/issue-3956/graphics_emu.rs diff --git a/tests/target/issue-3956/lib.rs b/rustfmt-core/tests/target/issue-3956/lib.rs similarity index 100% rename from tests/target/issue-3956/lib.rs rename to rustfmt-core/tests/target/issue-3956/lib.rs diff --git a/tests/target/issue-3974.rs b/rustfmt-core/tests/target/issue-3974.rs similarity index 100% rename from tests/target/issue-3974.rs rename to rustfmt-core/tests/target/issue-3974.rs diff --git a/tests/target/issue-3992.rs b/rustfmt-core/tests/target/issue-3992.rs similarity index 100% rename from tests/target/issue-3992.rs rename to rustfmt-core/tests/target/issue-3992.rs diff --git a/tests/target/issue-447.rs b/rustfmt-core/tests/target/issue-447.rs similarity index 100% rename from tests/target/issue-447.rs rename to rustfmt-core/tests/target/issue-447.rs diff --git a/tests/target/issue-510.rs b/rustfmt-core/tests/target/issue-510.rs similarity index 100% rename from tests/target/issue-510.rs rename to rustfmt-core/tests/target/issue-510.rs diff --git a/tests/target/issue-539.rs b/rustfmt-core/tests/target/issue-539.rs similarity index 100% rename from tests/target/issue-539.rs rename to rustfmt-core/tests/target/issue-539.rs diff --git a/tests/target/issue-64.rs b/rustfmt-core/tests/target/issue-64.rs similarity index 100% rename from tests/target/issue-64.rs rename to rustfmt-core/tests/target/issue-64.rs diff --git a/tests/target/issue-683.rs b/rustfmt-core/tests/target/issue-683.rs similarity index 100% rename from tests/target/issue-683.rs rename to rustfmt-core/tests/target/issue-683.rs diff --git a/tests/target/issue-691.rs b/rustfmt-core/tests/target/issue-691.rs similarity index 100% rename from tests/target/issue-691.rs rename to rustfmt-core/tests/target/issue-691.rs diff --git a/tests/target/issue-770.rs b/rustfmt-core/tests/target/issue-770.rs similarity index 100% rename from tests/target/issue-770.rs rename to rustfmt-core/tests/target/issue-770.rs diff --git a/tests/target/issue-811.rs b/rustfmt-core/tests/target/issue-811.rs similarity index 100% rename from tests/target/issue-811.rs rename to rustfmt-core/tests/target/issue-811.rs diff --git a/tests/target/issue-831.rs b/rustfmt-core/tests/target/issue-831.rs similarity index 100% rename from tests/target/issue-831.rs rename to rustfmt-core/tests/target/issue-831.rs diff --git a/tests/target/issue-850.rs b/rustfmt-core/tests/target/issue-850.rs similarity index 100% rename from tests/target/issue-850.rs rename to rustfmt-core/tests/target/issue-850.rs diff --git a/tests/target/issue-855.rs b/rustfmt-core/tests/target/issue-855.rs similarity index 100% rename from tests/target/issue-855.rs rename to rustfmt-core/tests/target/issue-855.rs diff --git a/tests/target/issue-913.rs b/rustfmt-core/tests/target/issue-913.rs similarity index 100% rename from tests/target/issue-913.rs rename to rustfmt-core/tests/target/issue-913.rs diff --git a/tests/target/issue-945.rs b/rustfmt-core/tests/target/issue-945.rs similarity index 100% rename from tests/target/issue-945.rs rename to rustfmt-core/tests/target/issue-945.rs diff --git a/tests/target/issue-977.rs b/rustfmt-core/tests/target/issue-977.rs similarity index 100% rename from tests/target/issue-977.rs rename to rustfmt-core/tests/target/issue-977.rs diff --git a/tests/target/issue_3839.rs b/rustfmt-core/tests/target/issue_3839.rs similarity index 100% rename from tests/target/issue_3839.rs rename to rustfmt-core/tests/target/issue_3839.rs diff --git a/tests/target/issue_3844.rs b/rustfmt-core/tests/target/issue_3844.rs similarity index 100% rename from tests/target/issue_3844.rs rename to rustfmt-core/tests/target/issue_3844.rs diff --git a/tests/target/issue_3853.rs b/rustfmt-core/tests/target/issue_3853.rs similarity index 100% rename from tests/target/issue_3853.rs rename to rustfmt-core/tests/target/issue_3853.rs diff --git a/tests/target/issue_3854.rs b/rustfmt-core/tests/target/issue_3854.rs similarity index 100% rename from tests/target/issue_3854.rs rename to rustfmt-core/tests/target/issue_3854.rs diff --git a/tests/target/issue_3868.rs b/rustfmt-core/tests/target/issue_3868.rs similarity index 100% rename from tests/target/issue_3868.rs rename to rustfmt-core/tests/target/issue_3868.rs diff --git a/tests/target/item-brace-style-always-next-line.rs b/rustfmt-core/tests/target/item-brace-style-always-next-line.rs similarity index 100% rename from tests/target/item-brace-style-always-next-line.rs rename to rustfmt-core/tests/target/item-brace-style-always-next-line.rs diff --git a/tests/target/item-brace-style-prefer-same-line.rs b/rustfmt-core/tests/target/item-brace-style-prefer-same-line.rs similarity index 100% rename from tests/target/item-brace-style-prefer-same-line.rs rename to rustfmt-core/tests/target/item-brace-style-prefer-same-line.rs diff --git a/tests/target/item-brace-style-same-line-where.rs b/rustfmt-core/tests/target/item-brace-style-same-line-where.rs similarity index 100% rename from tests/target/item-brace-style-same-line-where.rs rename to rustfmt-core/tests/target/item-brace-style-same-line-where.rs diff --git a/tests/target/itemized-blocks/no_wrap.rs b/rustfmt-core/tests/target/itemized-blocks/no_wrap.rs similarity index 100% rename from tests/target/itemized-blocks/no_wrap.rs rename to rustfmt-core/tests/target/itemized-blocks/no_wrap.rs diff --git a/tests/target/itemized-blocks/rewrite_fail.rs b/rustfmt-core/tests/target/itemized-blocks/rewrite_fail.rs similarity index 100% rename from tests/target/itemized-blocks/rewrite_fail.rs rename to rustfmt-core/tests/target/itemized-blocks/rewrite_fail.rs diff --git a/tests/target/itemized-blocks/urls.rs b/rustfmt-core/tests/target/itemized-blocks/urls.rs similarity index 100% rename from tests/target/itemized-blocks/urls.rs rename to rustfmt-core/tests/target/itemized-blocks/urls.rs diff --git a/tests/target/itemized-blocks/wrap.rs b/rustfmt-core/tests/target/itemized-blocks/wrap.rs similarity index 100% rename from tests/target/itemized-blocks/wrap.rs rename to rustfmt-core/tests/target/itemized-blocks/wrap.rs diff --git a/tests/target/label_break.rs b/rustfmt-core/tests/target/label_break.rs similarity index 100% rename from tests/target/label_break.rs rename to rustfmt-core/tests/target/label_break.rs diff --git a/tests/target/large-block.rs b/rustfmt-core/tests/target/large-block.rs similarity index 100% rename from tests/target/large-block.rs rename to rustfmt-core/tests/target/large-block.rs diff --git a/tests/target/large_vec.rs b/rustfmt-core/tests/target/large_vec.rs similarity index 100% rename from tests/target/large_vec.rs rename to rustfmt-core/tests/target/large_vec.rs diff --git a/tests/target/lazy_static.rs b/rustfmt-core/tests/target/lazy_static.rs similarity index 100% rename from tests/target/lazy_static.rs rename to rustfmt-core/tests/target/lazy_static.rs diff --git a/tests/target/license-templates/empty_license_path.rs b/rustfmt-core/tests/target/license-templates/empty_license_path.rs similarity index 100% rename from tests/target/license-templates/empty_license_path.rs rename to rustfmt-core/tests/target/license-templates/empty_license_path.rs diff --git a/tests/target/license-templates/license.rs b/rustfmt-core/tests/target/license-templates/license.rs similarity index 100% rename from tests/target/license-templates/license.rs rename to rustfmt-core/tests/target/license-templates/license.rs diff --git a/tests/target/long-fn-1/version_two.rs b/rustfmt-core/tests/target/long-fn-1/version_two.rs similarity index 100% rename from tests/target/long-fn-1/version_two.rs rename to rustfmt-core/tests/target/long-fn-1/version_two.rs diff --git a/tests/target/long-match-arms-brace-newline.rs b/rustfmt-core/tests/target/long-match-arms-brace-newline.rs similarity index 100% rename from tests/target/long-match-arms-brace-newline.rs rename to rustfmt-core/tests/target/long-match-arms-brace-newline.rs diff --git a/tests/target/long-use-statement-issue-3154.rs b/rustfmt-core/tests/target/long-use-statement-issue-3154.rs similarity index 100% rename from tests/target/long-use-statement-issue-3154.rs rename to rustfmt-core/tests/target/long-use-statement-issue-3154.rs diff --git a/tests/target/long_field_access.rs b/rustfmt-core/tests/target/long_field_access.rs similarity index 100% rename from tests/target/long_field_access.rs rename to rustfmt-core/tests/target/long_field_access.rs diff --git a/tests/target/loop.rs b/rustfmt-core/tests/target/loop.rs similarity index 100% rename from tests/target/loop.rs rename to rustfmt-core/tests/target/loop.rs diff --git a/tests/target/macro_not_expr.rs b/rustfmt-core/tests/target/macro_not_expr.rs similarity index 100% rename from tests/target/macro_not_expr.rs rename to rustfmt-core/tests/target/macro_not_expr.rs diff --git a/tests/target/macro_rules.rs b/rustfmt-core/tests/target/macro_rules.rs similarity index 100% rename from tests/target/macro_rules.rs rename to rustfmt-core/tests/target/macro_rules.rs diff --git a/tests/target/macros.rs b/rustfmt-core/tests/target/macros.rs similarity index 100% rename from tests/target/macros.rs rename to rustfmt-core/tests/target/macros.rs diff --git a/tests/target/markdown-comment-with-options.rs b/rustfmt-core/tests/target/markdown-comment-with-options.rs similarity index 100% rename from tests/target/markdown-comment-with-options.rs rename to rustfmt-core/tests/target/markdown-comment-with-options.rs diff --git a/tests/target/markdown-comment.rs b/rustfmt-core/tests/target/markdown-comment.rs similarity index 100% rename from tests/target/markdown-comment.rs rename to rustfmt-core/tests/target/markdown-comment.rs diff --git a/tests/target/match-block-trailing-comma.rs b/rustfmt-core/tests/target/match-block-trailing-comma.rs similarity index 100% rename from tests/target/match-block-trailing-comma.rs rename to rustfmt-core/tests/target/match-block-trailing-comma.rs diff --git a/tests/target/match-flattening.rs b/rustfmt-core/tests/target/match-flattening.rs similarity index 100% rename from tests/target/match-flattening.rs rename to rustfmt-core/tests/target/match-flattening.rs diff --git a/tests/target/match-nowrap-trailing-comma.rs b/rustfmt-core/tests/target/match-nowrap-trailing-comma.rs similarity index 100% rename from tests/target/match-nowrap-trailing-comma.rs rename to rustfmt-core/tests/target/match-nowrap-trailing-comma.rs diff --git a/tests/target/match-nowrap.rs b/rustfmt-core/tests/target/match-nowrap.rs similarity index 100% rename from tests/target/match-nowrap.rs rename to rustfmt-core/tests/target/match-nowrap.rs diff --git a/tests/target/match.rs b/rustfmt-core/tests/target/match.rs similarity index 100% rename from tests/target/match.rs rename to rustfmt-core/tests/target/match.rs diff --git a/tests/target/match_overflow_expr.rs b/rustfmt-core/tests/target/match_overflow_expr.rs similarity index 100% rename from tests/target/match_overflow_expr.rs rename to rustfmt-core/tests/target/match_overflow_expr.rs diff --git a/tests/target/max-line-length-in-chars.rs b/rustfmt-core/tests/target/max-line-length-in-chars.rs similarity index 100% rename from tests/target/max-line-length-in-chars.rs rename to rustfmt-core/tests/target/max-line-length-in-chars.rs diff --git a/tests/target/merge_imports.rs b/rustfmt-core/tests/target/merge_imports.rs similarity index 100% rename from tests/target/merge_imports.rs rename to rustfmt-core/tests/target/merge_imports.rs diff --git a/tests/target/mod-1.rs b/rustfmt-core/tests/target/mod-1.rs similarity index 100% rename from tests/target/mod-1.rs rename to rustfmt-core/tests/target/mod-1.rs diff --git a/tests/target/mod-2.rs b/rustfmt-core/tests/target/mod-2.rs similarity index 100% rename from tests/target/mod-2.rs rename to rustfmt-core/tests/target/mod-2.rs diff --git a/tests/target/mod_skip_child.rs b/rustfmt-core/tests/target/mod_skip_child.rs similarity index 100% rename from tests/target/mod_skip_child.rs rename to rustfmt-core/tests/target/mod_skip_child.rs diff --git a/tests/target/multi-file.rs b/rustfmt-core/tests/target/multi-file.rs similarity index 100% rename from tests/target/multi-file.rs rename to rustfmt-core/tests/target/multi-file.rs diff --git a/tests/target/multiline_string_in_macro_def.rs b/rustfmt-core/tests/target/multiline_string_in_macro_def.rs similarity index 100% rename from tests/target/multiline_string_in_macro_def.rs rename to rustfmt-core/tests/target/multiline_string_in_macro_def.rs diff --git a/tests/target/multiple.rs b/rustfmt-core/tests/target/multiple.rs similarity index 100% rename from tests/target/multiple.rs rename to rustfmt-core/tests/target/multiple.rs diff --git a/tests/target/nested-if-else.rs b/rustfmt-core/tests/target/nested-if-else.rs similarity index 100% rename from tests/target/nested-if-else.rs rename to rustfmt-core/tests/target/nested-if-else.rs diff --git a/tests/target/nested-visual-block.rs b/rustfmt-core/tests/target/nested-visual-block.rs similarity index 100% rename from tests/target/nested-visual-block.rs rename to rustfmt-core/tests/target/nested-visual-block.rs diff --git a/tests/target/nested_skipped/mod.rs b/rustfmt-core/tests/target/nested_skipped/mod.rs similarity index 100% rename from tests/target/nested_skipped/mod.rs rename to rustfmt-core/tests/target/nested_skipped/mod.rs diff --git a/tests/target/nestedmod/mod.rs b/rustfmt-core/tests/target/nestedmod/mod.rs similarity index 100% rename from tests/target/nestedmod/mod.rs rename to rustfmt-core/tests/target/nestedmod/mod.rs diff --git a/tests/target/nestedmod/mod2a.rs b/rustfmt-core/tests/target/nestedmod/mod2a.rs similarity index 100% rename from tests/target/nestedmod/mod2a.rs rename to rustfmt-core/tests/target/nestedmod/mod2a.rs diff --git a/tests/target/nestedmod/mod2b.rs b/rustfmt-core/tests/target/nestedmod/mod2b.rs similarity index 100% rename from tests/target/nestedmod/mod2b.rs rename to rustfmt-core/tests/target/nestedmod/mod2b.rs diff --git a/tests/target/nestedmod/mod2c.rs b/rustfmt-core/tests/target/nestedmod/mod2c.rs similarity index 100% rename from tests/target/nestedmod/mod2c.rs rename to rustfmt-core/tests/target/nestedmod/mod2c.rs diff --git a/tests/target/nestedmod/mymod1/mod3a.rs b/rustfmt-core/tests/target/nestedmod/mymod1/mod3a.rs similarity index 100% rename from tests/target/nestedmod/mymod1/mod3a.rs rename to rustfmt-core/tests/target/nestedmod/mymod1/mod3a.rs diff --git a/tests/target/nestedmod/submod2/a.rs b/rustfmt-core/tests/target/nestedmod/submod2/a.rs similarity index 100% rename from tests/target/nestedmod/submod2/a.rs rename to rustfmt-core/tests/target/nestedmod/submod2/a.rs diff --git a/tests/target/nestedmod/submod2/mod.rs b/rustfmt-core/tests/target/nestedmod/submod2/mod.rs similarity index 100% rename from tests/target/nestedmod/submod2/mod.rs rename to rustfmt-core/tests/target/nestedmod/submod2/mod.rs diff --git a/tests/target/no_arg_with_commnet.rs b/rustfmt-core/tests/target/no_arg_with_commnet.rs similarity index 100% rename from tests/target/no_arg_with_commnet.rs rename to rustfmt-core/tests/target/no_arg_with_commnet.rs diff --git a/tests/target/no_new_line_beginning.rs b/rustfmt-core/tests/target/no_new_line_beginning.rs similarity index 100% rename from tests/target/no_new_line_beginning.rs rename to rustfmt-core/tests/target/no_new_line_beginning.rs diff --git a/tests/target/normalize_doc_attributes_should_not_imply_format_doc_comments.rs b/rustfmt-core/tests/target/normalize_doc_attributes_should_not_imply_format_doc_comments.rs similarity index 100% rename from tests/target/normalize_doc_attributes_should_not_imply_format_doc_comments.rs rename to rustfmt-core/tests/target/normalize_doc_attributes_should_not_imply_format_doc_comments.rs diff --git a/tests/target/normalize_multiline_doc_attribute.rs b/rustfmt-core/tests/target/normalize_multiline_doc_attribute.rs similarity index 100% rename from tests/target/normalize_multiline_doc_attribute.rs rename to rustfmt-core/tests/target/normalize_multiline_doc_attribute.rs diff --git a/tests/target/obsolete_in_place.rs b/rustfmt-core/tests/target/obsolete_in_place.rs similarity index 100% rename from tests/target/obsolete_in_place.rs rename to rustfmt-core/tests/target/obsolete_in_place.rs diff --git a/tests/target/one_line_if_v2.rs b/rustfmt-core/tests/target/one_line_if_v2.rs similarity index 100% rename from tests/target/one_line_if_v2.rs rename to rustfmt-core/tests/target/one_line_if_v2.rs diff --git a/tests/target/other.rs b/rustfmt-core/tests/target/other.rs similarity index 100% rename from tests/target/other.rs rename to rustfmt-core/tests/target/other.rs diff --git a/tests/target/paren.rs b/rustfmt-core/tests/target/paren.rs similarity index 100% rename from tests/target/paren.rs rename to rustfmt-core/tests/target/paren.rs diff --git a/tests/target/path_clarity/foo.rs b/rustfmt-core/tests/target/path_clarity/foo.rs similarity index 100% rename from tests/target/path_clarity/foo.rs rename to rustfmt-core/tests/target/path_clarity/foo.rs diff --git a/tests/target/path_clarity/foo/bar.rs b/rustfmt-core/tests/target/path_clarity/foo/bar.rs similarity index 100% rename from tests/target/path_clarity/foo/bar.rs rename to rustfmt-core/tests/target/path_clarity/foo/bar.rs diff --git a/tests/target/paths.rs b/rustfmt-core/tests/target/paths.rs similarity index 100% rename from tests/target/paths.rs rename to rustfmt-core/tests/target/paths.rs diff --git a/tests/target/pattern-condense-wildcards.rs b/rustfmt-core/tests/target/pattern-condense-wildcards.rs similarity index 100% rename from tests/target/pattern-condense-wildcards.rs rename to rustfmt-core/tests/target/pattern-condense-wildcards.rs diff --git a/tests/target/pattern.rs b/rustfmt-core/tests/target/pattern.rs similarity index 100% rename from tests/target/pattern.rs rename to rustfmt-core/tests/target/pattern.rs diff --git a/tests/target/preserves_carriage_return_for_unix.rs b/rustfmt-core/tests/target/preserves_carriage_return_for_unix.rs similarity index 100% rename from tests/target/preserves_carriage_return_for_unix.rs rename to rustfmt-core/tests/target/preserves_carriage_return_for_unix.rs diff --git a/tests/target/preserves_carriage_return_for_windows.rs b/rustfmt-core/tests/target/preserves_carriage_return_for_windows.rs similarity index 100% rename from tests/target/preserves_carriage_return_for_windows.rs rename to rustfmt-core/tests/target/preserves_carriage_return_for_windows.rs diff --git a/tests/target/pub-restricted.rs b/rustfmt-core/tests/target/pub-restricted.rs similarity index 100% rename from tests/target/pub-restricted.rs rename to rustfmt-core/tests/target/pub-restricted.rs diff --git a/tests/target/raw_identifiers.rs b/rustfmt-core/tests/target/raw_identifiers.rs similarity index 100% rename from tests/target/raw_identifiers.rs rename to rustfmt-core/tests/target/raw_identifiers.rs diff --git a/tests/target/remove_blank_lines.rs b/rustfmt-core/tests/target/remove_blank_lines.rs similarity index 100% rename from tests/target/remove_blank_lines.rs rename to rustfmt-core/tests/target/remove_blank_lines.rs diff --git a/tests/target/reorder-impl-items.rs b/rustfmt-core/tests/target/reorder-impl-items.rs similarity index 100% rename from tests/target/reorder-impl-items.rs rename to rustfmt-core/tests/target/reorder-impl-items.rs diff --git a/tests/target/should_not_format_string_when_format_strings_is_not_set.rs b/rustfmt-core/tests/target/should_not_format_string_when_format_strings_is_not_set.rs similarity index 100% rename from tests/target/should_not_format_string_when_format_strings_is_not_set.rs rename to rustfmt-core/tests/target/should_not_format_string_when_format_strings_is_not_set.rs diff --git a/tests/target/single-line-if-else.rs b/rustfmt-core/tests/target/single-line-if-else.rs similarity index 100% rename from tests/target/single-line-if-else.rs rename to rustfmt-core/tests/target/single-line-if-else.rs diff --git a/tests/target/single-line-macro/v2.rs b/rustfmt-core/tests/target/single-line-macro/v2.rs similarity index 100% rename from tests/target/single-line-macro/v2.rs rename to rustfmt-core/tests/target/single-line-macro/v2.rs diff --git a/tests/target/skip.rs b/rustfmt-core/tests/target/skip.rs similarity index 100% rename from tests/target/skip.rs rename to rustfmt-core/tests/target/skip.rs diff --git a/tests/target/skip_mod.rs b/rustfmt-core/tests/target/skip_mod.rs similarity index 100% rename from tests/target/skip_mod.rs rename to rustfmt-core/tests/target/skip_mod.rs diff --git a/tests/target/soft-wrapping.rs b/rustfmt-core/tests/target/soft-wrapping.rs similarity index 100% rename from tests/target/soft-wrapping.rs rename to rustfmt-core/tests/target/soft-wrapping.rs diff --git a/tests/target/space-not-before-newline.rs b/rustfmt-core/tests/target/space-not-before-newline.rs similarity index 100% rename from tests/target/space-not-before-newline.rs rename to rustfmt-core/tests/target/space-not-before-newline.rs diff --git a/tests/target/spaces-around-ranges.rs b/rustfmt-core/tests/target/spaces-around-ranges.rs similarity index 100% rename from tests/target/spaces-around-ranges.rs rename to rustfmt-core/tests/target/spaces-around-ranges.rs diff --git a/tests/target/static.rs b/rustfmt-core/tests/target/static.rs similarity index 100% rename from tests/target/static.rs rename to rustfmt-core/tests/target/static.rs diff --git a/tests/target/string-lit-2.rs b/rustfmt-core/tests/target/string-lit-2.rs similarity index 100% rename from tests/target/string-lit-2.rs rename to rustfmt-core/tests/target/string-lit-2.rs diff --git a/tests/target/string-lit-custom.rs b/rustfmt-core/tests/target/string-lit-custom.rs similarity index 100% rename from tests/target/string-lit-custom.rs rename to rustfmt-core/tests/target/string-lit-custom.rs diff --git a/tests/target/string-lit.rs b/rustfmt-core/tests/target/string-lit.rs similarity index 100% rename from tests/target/string-lit.rs rename to rustfmt-core/tests/target/string-lit.rs diff --git a/tests/target/string_punctuation.rs b/rustfmt-core/tests/target/string_punctuation.rs similarity index 100% rename from tests/target/string_punctuation.rs rename to rustfmt-core/tests/target/string_punctuation.rs diff --git a/tests/target/struct-field-attributes.rs b/rustfmt-core/tests/target/struct-field-attributes.rs similarity index 100% rename from tests/target/struct-field-attributes.rs rename to rustfmt-core/tests/target/struct-field-attributes.rs diff --git a/tests/target/struct_lits.rs b/rustfmt-core/tests/target/struct_lits.rs similarity index 100% rename from tests/target/struct_lits.rs rename to rustfmt-core/tests/target/struct_lits.rs diff --git a/tests/target/struct_lits_multiline.rs b/rustfmt-core/tests/target/struct_lits_multiline.rs similarity index 100% rename from tests/target/struct_lits_multiline.rs rename to rustfmt-core/tests/target/struct_lits_multiline.rs diff --git a/tests/target/struct_lits_visual.rs b/rustfmt-core/tests/target/struct_lits_visual.rs similarity index 100% rename from tests/target/struct_lits_visual.rs rename to rustfmt-core/tests/target/struct_lits_visual.rs diff --git a/tests/target/struct_lits_visual_multiline.rs b/rustfmt-core/tests/target/struct_lits_visual_multiline.rs similarity index 100% rename from tests/target/struct_lits_visual_multiline.rs rename to rustfmt-core/tests/target/struct_lits_visual_multiline.rs diff --git a/tests/target/struct_tuple_visual.rs b/rustfmt-core/tests/target/struct_tuple_visual.rs similarity index 100% rename from tests/target/struct_tuple_visual.rs rename to rustfmt-core/tests/target/struct_tuple_visual.rs diff --git a/tests/target/structs.rs b/rustfmt-core/tests/target/structs.rs similarity index 100% rename from tests/target/structs.rs rename to rustfmt-core/tests/target/structs.rs diff --git a/tests/target/trailing-comma-never.rs b/rustfmt-core/tests/target/trailing-comma-never.rs similarity index 100% rename from tests/target/trailing-comma-never.rs rename to rustfmt-core/tests/target/trailing-comma-never.rs diff --git a/tests/target/trailing_commas.rs b/rustfmt-core/tests/target/trailing_commas.rs similarity index 100% rename from tests/target/trailing_commas.rs rename to rustfmt-core/tests/target/trailing_commas.rs diff --git a/tests/target/trailing_comments/hard_tabs.rs b/rustfmt-core/tests/target/trailing_comments/hard_tabs.rs similarity index 100% rename from tests/target/trailing_comments/hard_tabs.rs rename to rustfmt-core/tests/target/trailing_comments/hard_tabs.rs diff --git a/tests/target/trailing_comments/soft_tabs.rs b/rustfmt-core/tests/target/trailing_comments/soft_tabs.rs similarity index 100% rename from tests/target/trailing_comments/soft_tabs.rs rename to rustfmt-core/tests/target/trailing_comments/soft_tabs.rs diff --git a/tests/target/trait.rs b/rustfmt-core/tests/target/trait.rs similarity index 100% rename from tests/target/trait.rs rename to rustfmt-core/tests/target/trait.rs diff --git a/tests/target/trait_2015_edition.rs b/rustfmt-core/tests/target/trait_2015_edition.rs similarity index 100% rename from tests/target/trait_2015_edition.rs rename to rustfmt-core/tests/target/trait_2015_edition.rs diff --git a/tests/target/try-conversion.rs b/rustfmt-core/tests/target/try-conversion.rs similarity index 100% rename from tests/target/try-conversion.rs rename to rustfmt-core/tests/target/try-conversion.rs diff --git a/tests/target/tuple.rs b/rustfmt-core/tests/target/tuple.rs similarity index 100% rename from tests/target/tuple.rs rename to rustfmt-core/tests/target/tuple.rs diff --git a/tests/target/type-ascription.rs b/rustfmt-core/tests/target/type-ascription.rs similarity index 100% rename from tests/target/type-ascription.rs rename to rustfmt-core/tests/target/type-ascription.rs diff --git a/tests/target/type.rs b/rustfmt-core/tests/target/type.rs similarity index 100% rename from tests/target/type.rs rename to rustfmt-core/tests/target/type.rs diff --git a/tests/target/type_alias.rs b/rustfmt-core/tests/target/type_alias.rs similarity index 100% rename from tests/target/type_alias.rs rename to rustfmt-core/tests/target/type_alias.rs diff --git a/tests/target/unicode.rs b/rustfmt-core/tests/target/unicode.rs similarity index 100% rename from tests/target/unicode.rs rename to rustfmt-core/tests/target/unicode.rs diff --git a/tests/target/unindent_if_else_cond_comment.rs b/rustfmt-core/tests/target/unindent_if_else_cond_comment.rs similarity index 100% rename from tests/target/unindent_if_else_cond_comment.rs rename to rustfmt-core/tests/target/unindent_if_else_cond_comment.rs diff --git a/tests/target/unions.rs b/rustfmt-core/tests/target/unions.rs similarity index 100% rename from tests/target/unions.rs rename to rustfmt-core/tests/target/unions.rs diff --git a/tests/target/visibility.rs b/rustfmt-core/tests/target/visibility.rs similarity index 100% rename from tests/target/visibility.rs rename to rustfmt-core/tests/target/visibility.rs diff --git a/tests/target/visual-fn-type.rs b/rustfmt-core/tests/target/visual-fn-type.rs similarity index 100% rename from tests/target/visual-fn-type.rs rename to rustfmt-core/tests/target/visual-fn-type.rs diff --git a/tests/target/where-clause-rfc.rs b/rustfmt-core/tests/target/where-clause-rfc.rs similarity index 100% rename from tests/target/where-clause-rfc.rs rename to rustfmt-core/tests/target/where-clause-rfc.rs diff --git a/tests/target/where-clause.rs b/rustfmt-core/tests/target/where-clause.rs similarity index 100% rename from tests/target/where-clause.rs rename to rustfmt-core/tests/target/where-clause.rs diff --git a/tests/target/width-heuristics.rs b/rustfmt-core/tests/target/width-heuristics.rs similarity index 100% rename from tests/target/width-heuristics.rs rename to rustfmt-core/tests/target/width-heuristics.rs diff --git a/tests/target/wrap_comments_should_not_imply_format_doc_comments.rs b/rustfmt-core/tests/target/wrap_comments_should_not_imply_format_doc_comments.rs similarity index 100% rename from tests/target/wrap_comments_should_not_imply_format_doc_comments.rs rename to rustfmt-core/tests/target/wrap_comments_should_not_imply_format_doc_comments.rs diff --git a/tests/writemode/source/fn-single-line.rs b/rustfmt-core/tests/writemode/source/fn-single-line.rs similarity index 100% rename from tests/writemode/source/fn-single-line.rs rename to rustfmt-core/tests/writemode/source/fn-single-line.rs diff --git a/tests/writemode/source/json.rs b/rustfmt-core/tests/writemode/source/json.rs similarity index 100% rename from tests/writemode/source/json.rs rename to rustfmt-core/tests/writemode/source/json.rs diff --git a/tests/writemode/source/modified.rs b/rustfmt-core/tests/writemode/source/modified.rs similarity index 100% rename from tests/writemode/source/modified.rs rename to rustfmt-core/tests/writemode/source/modified.rs diff --git a/tests/writemode/source/stdin.rs b/rustfmt-core/tests/writemode/source/stdin.rs similarity index 100% rename from tests/writemode/source/stdin.rs rename to rustfmt-core/tests/writemode/source/stdin.rs diff --git a/tests/writemode/target/checkstyle.xml b/rustfmt-core/tests/writemode/target/checkstyle.xml similarity index 100% rename from tests/writemode/target/checkstyle.xml rename to rustfmt-core/tests/writemode/target/checkstyle.xml diff --git a/tests/writemode/target/modified.txt b/rustfmt-core/tests/writemode/target/modified.txt similarity index 100% rename from tests/writemode/target/modified.txt rename to rustfmt-core/tests/writemode/target/modified.txt diff --git a/tests/writemode/target/output.json b/rustfmt-core/tests/writemode/target/output.json similarity index 100% rename from tests/writemode/target/output.json rename to rustfmt-core/tests/writemode/target/output.json diff --git a/tests/writemode/target/stdin.json b/rustfmt-core/tests/writemode/target/stdin.json similarity index 100% rename from tests/writemode/target/stdin.json rename to rustfmt-core/tests/writemode/target/stdin.json diff --git a/tests/writemode/target/stdin.xml b/rustfmt-core/tests/writemode/target/stdin.xml similarity index 100% rename from tests/writemode/target/stdin.xml rename to rustfmt-core/tests/writemode/target/stdin.xml diff --git a/src/bin/main.rs b/src/bin/main.rs index f175554056e..1f55b4d650f 100644 --- a/src/bin/main.rs +++ b/src/bin/main.rs @@ -1,21 +1,15 @@ -use anyhow::{format_err, Result}; -use io::Error as IoError; -use thiserror::Error; - -use rustfmt_nightly as rustfmt; - use std::collections::HashMap; use std::env; -use std::fs::File; -use std::io::{self, stdout, Read, Write}; +use std::io::{self, stdout, Error as IoError, Read, Write}; use std::path::{Path, PathBuf}; use std::str::FromStr; use ansi_term::Colour::Red; - +use anyhow::{format_err, Result}; use getopts::{Matches, Options}; +use thiserror::Error; -use crate::rustfmt::{ +use rustfmt_core::{ load_config, CliOptions, Color, Config, Edition, EmitMode, FileLines, FileName, FormatReportFormatterBuilder, Input, Session, Verbosity, }; @@ -218,7 +212,7 @@ fn execute(opts: &Options) -> Result { Operation::ConfigOutputDefault { path } => { let toml = Config::default().all_options().to_toml()?; if let Some(path) = path { - let mut file = File::create(path)?; + let mut file = std::fs::File::create(path)?; file.write_all(toml.as_bytes())?; } else { io::stdout().write_all(toml.as_bytes())?; @@ -341,7 +335,7 @@ fn format( // If we were given a path via dump-minimal-config, output any options // that were used during formatting as TOML. if let Some(path) = minimal_config_path { - let mut file = File::create(path)?; + let mut file = std::fs::File::create(path)?; let toml = session.config.used_options().to_toml()?; file.write_all(toml.as_bytes())?; } @@ -723,3 +717,187 @@ fn emit_mode_from_emit_str(emit_str: &str) -> Result { _ => Err(format_err!("Invalid value for `--emit`")), } } + +#[cfg(test)] +#[macro_use] +extern crate lazy_static; + +#[cfg(test)] +mod test { + use super::*; + use std::process::{Command, Stdio}; + + fn init_log() { + let _ = env_logger::builder().is_test(true).try_init(); + } + + #[test] + fn stdin_disable_all_formatting_test() { + init_log(); + match option_env!("CFG_RELEASE_CHANNEL") { + None | Some("nightly") => {} + // These tests require nightly. + _ => return, + } + let input = "fn main() { println!(\"This should not be formatted.\"); }"; + let mut child = Command::new(rustfmt()) + .stdin(Stdio::piped()) + .stdout(Stdio::piped()) + .arg("--config-path=./tests/config/disable_all_formatting.toml") + .spawn() + .expect("failed to execute child"); + + { + let stdin = child.stdin.as_mut().expect("failed to get stdin"); + stdin + .write_all(input.as_bytes()) + .expect("failed to write stdin"); + } + + let output = child.wait_with_output().expect("failed to wait on child"); + assert!(output.status.success()); + assert!(output.stderr.is_empty()); + assert_eq!(input, String::from_utf8(output.stdout).unwrap()); + } + + #[test] + fn format_lines_errors_are_reported() { + init_log(); + let long_identifier = String::from_utf8(vec![b'a'; 239]).unwrap(); + let input = Input::Text(format!("fn {}() {{}}", long_identifier)); + let mut config = Config::default(); + config.set().error_on_line_overflow(true); + let mut session = Session::::new(config, None); + session.format(input).unwrap(); + assert!(session.has_formatting_errors()); + } + + #[test] + fn format_lines_errors_are_reported_with_tabs() { + init_log(); + let long_identifier = String::from_utf8(vec![b'a'; 97]).unwrap(); + let input = Input::Text(format!("fn a() {{\n\t{}\n}}", long_identifier)); + let mut config = Config::default(); + config.set().error_on_line_overflow(true); + config.set().hard_tabs(true); + let mut session = Session::::new(config, None); + session.format(input).unwrap(); + assert!(session.has_formatting_errors()); + } + + struct TempFile { + path: PathBuf, + } + + fn make_temp_file(file_name: &'static str) -> TempFile { + use std::env::var; + use std::fs::File; + + // Used in the Rust build system. + let target_dir = var("RUSTFMT_TEST_DIR").unwrap_or_else(|_| ".".to_owned()); + let path = Path::new(&target_dir).join(file_name); + + let mut file = File::create(&path).expect("couldn't create temp file"); + let content = b"fn main() {}\n"; + file.write_all(content).expect("couldn't write temp file"); + TempFile { path } + } + + impl Drop for TempFile { + fn drop(&mut self) { + use std::fs::remove_file; + remove_file(&self.path).expect("couldn't delete temp file"); + } + } + + fn rustfmt() -> &'static Path { + lazy_static! { + static ref RUSTFMT_PATH: PathBuf = { + let mut me = env::current_exe().expect("failed to get current executable"); + // Chop of the test name. + me.pop(); + // Chop off `deps`. + me.pop(); + + // If we run `cargo test --release`, we might only have a release build. + if cfg!(release) { + // `../release/` + me.pop(); + me.push("release"); + } + me.push("rustfmt"); + assert!( + me.is_file() || me.with_extension("exe").is_file(), + if cfg!(release) { + "no rustfmt bin, try running `cargo build --release` before testing" + } else { + "no rustfmt bin, try running `cargo build` before testing" + } + ); + me + }; + } + &RUSTFMT_PATH + } + + #[test] + fn verify_check_works() { + init_log(); + let temp_file = make_temp_file("temp_check.rs"); + + Command::new(rustfmt()) + .arg("--check") + .arg(&temp_file.path) + .status() + .expect("run with check option failed"); + } + + #[test] + fn verify_check_works_with_stdin() { + init_log(); + + let mut child = Command::new(rustfmt()) + .arg("--check") + .stdin(Stdio::piped()) + .stderr(Stdio::piped()) + .spawn() + .expect("run with check option failed"); + + { + let stdin = child.stdin.as_mut().expect("Failed to open stdin"); + stdin + .write_all(b"fn main() {}\n") + .expect("Failed to write to rustfmt --check"); + } + let output = child + .wait_with_output() + .expect("Failed to wait on rustfmt child"); + assert!(output.status.success()); + } + + #[test] + fn verify_check_l_works_with_stdin() { + init_log(); + + let mut child = Command::new(rustfmt()) + .arg("--check") + .arg("-l") + .stdin(Stdio::piped()) + .stdout(Stdio::piped()) + .stderr(Stdio::piped()) + .spawn() + .expect("run with check option failed"); + + { + let stdin = child.stdin.as_mut().expect("Failed to open stdin"); + stdin + .write_all(b"fn main()\n{}\n") + .expect("Failed to write to rustfmt --check"); + } + let output = child + .wait_with_output() + .expect("Failed to wait on rustfmt child"); + assert!(output.status.success()); + assert_eq!(std::str::from_utf8(&output.stdout).unwrap(), "stdin\n"); + } +} diff --git a/src/git-rustfmt/main.rs b/src/git-rustfmt/main.rs index 62da1a8d546..30d8c37dc76 100644 --- a/src/git-rustfmt/main.rs +++ b/src/git-rustfmt/main.rs @@ -8,9 +8,8 @@ use std::process::Command; use std::str::FromStr; use getopts::{Matches, Options}; -use rustfmt_nightly as rustfmt; -use crate::rustfmt::{load_config, CliOptions, FormatReportFormatterBuilder, Input, Session}; +use rustfmt_core::{load_config, CliOptions, FormatReportFormatterBuilder, Input, Session}; fn prune_files(files: Vec<&str>) -> Vec<&str> { let prefixes: Vec<_> = files @@ -78,7 +77,7 @@ fn fmt_files(files: &[&str]) -> i32 { struct NullOptions; impl CliOptions for NullOptions { - fn apply_to(self, _: &mut rustfmt::Config) { + fn apply_to(self, _: &mut rustfmt_core::Config) { unreachable!(); } fn config_path(&self) -> Option<&Path> { From 7d9d5c53d578180d9cfcc981023f8aae6d627e29 Mon Sep 17 00:00:00 2001 From: topecongiro Date: Sat, 4 Jan 2020 19:49:47 +0900 Subject: [PATCH 02/18] Separate rustfmt-config --- Cargo.lock | 19 +++++- config_proc_macro/Cargo.lock | 68 ------------------- rustfmt-config/.gitignore | 2 + rustfmt-config/Cargo.toml | 27 ++++++++ .../config_proc_macro}/.gitignore | 0 .../config_proc_macro}/Cargo.toml | 0 .../config_proc_macro}/src/attrs.rs | 0 .../config_proc_macro}/src/config_type.rs | 0 .../config_proc_macro}/src/item_enum.rs | 2 +- .../config_proc_macro}/src/item_struct.rs | 0 .../config_proc_macro}/src/lib.rs | 0 .../config_proc_macro}/src/utils.rs | 0 .../config_proc_macro}/tests/smoke.rs | 0 .../src}/config_type.rs | 18 +++-- .../src}/file_lines.rs | 21 ++++-- .../mod.rs => rustfmt-config/src/lib.rs | 29 ++++---- .../config => rustfmt-config/src}/license.rs | 0 .../config => rustfmt-config/src}/lists.rs | 2 +- .../config => rustfmt-config/src}/options.rs | 4 +- rustfmt-core/Cargo.toml | 2 +- rustfmt-core/src/lib.rs | 2 +- rustfmt-core/src/source_file.rs | 9 --- 22 files changed, 92 insertions(+), 113 deletions(-) delete mode 100644 config_proc_macro/Cargo.lock create mode 100644 rustfmt-config/.gitignore create mode 100644 rustfmt-config/Cargo.toml rename {config_proc_macro => rustfmt-config/config_proc_macro}/.gitignore (100%) rename {config_proc_macro => rustfmt-config/config_proc_macro}/Cargo.toml (100%) rename {config_proc_macro => rustfmt-config/config_proc_macro}/src/attrs.rs (100%) rename {config_proc_macro => rustfmt-config/config_proc_macro}/src/config_type.rs (100%) rename {config_proc_macro => rustfmt-config/config_proc_macro}/src/item_enum.rs (99%) rename {config_proc_macro => rustfmt-config/config_proc_macro}/src/item_struct.rs (100%) rename {config_proc_macro => rustfmt-config/config_proc_macro}/src/lib.rs (100%) rename {config_proc_macro => rustfmt-config/config_proc_macro}/src/utils.rs (100%) rename {config_proc_macro => rustfmt-config/config_proc_macro}/tests/smoke.rs (100%) rename {rustfmt-core/src/config => rustfmt-config/src}/config_type.rs (96%) rename {rustfmt-core/src/config => rustfmt-config/src}/file_lines.rs (95%) rename rustfmt-core/src/config/mod.rs => rustfmt-config/src/lib.rs (97%) rename {rustfmt-core/src/config => rustfmt-config/src}/license.rs (100%) rename {rustfmt-core/src/config => rustfmt-config/src}/lists.rs (98%) rename {rustfmt-core/src/config => rustfmt-config/src}/options.rs (99%) diff --git a/Cargo.lock b/Cargo.lock index ed51533fc94..55cddb4140b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -826,6 +826,23 @@ dependencies = [ "thiserror 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "rustfmt_config" +version = "0.1.0" +dependencies = [ + "ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", + "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-syntax 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-syntax_pos 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustfmt-config_proc_macro 0.2.0", + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "rustfmt_core" version = "0.1.0" @@ -845,7 +862,7 @@ dependencies = [ "rustc-ap-rustc_target 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-ap-syntax 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-ap-syntax_pos 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustfmt-config_proc_macro 0.2.0", + "rustfmt_config 0.1.0", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "term 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/config_proc_macro/Cargo.lock b/config_proc_macro/Cargo.lock deleted file mode 100644 index abcf9654e5d..00000000000 --- a/config_proc_macro/Cargo.lock +++ /dev/null @@ -1,68 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -[[package]] -name = "proc-macro2" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "quote" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rustfmt-config_proc_macro" -version = "0.1.2" -dependencies = [ - "proc-macro2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "serde" -version = "1.0.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "serde_derive" -version = "1.0.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "syn" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "unicode-xid" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[metadata] -"checksum proc-macro2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e98a83a9f9b331f54b924e68a66acb1bb35cb01fb0a23645139967abefb697e8" -"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" -"checksum serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)" = "fec2851eb56d010dc9a21b89ca53ee75e6528bab60c11e89d38390904982da9f" -"checksum serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)" = "cb4dc18c61206b08dc98216c98faa0232f4337e1e1b8574551d5bad29ea1b425" -"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf" -"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" diff --git a/rustfmt-config/.gitignore b/rustfmt-config/.gitignore new file mode 100644 index 00000000000..96ef6c0b944 --- /dev/null +++ b/rustfmt-config/.gitignore @@ -0,0 +1,2 @@ +/target +Cargo.lock diff --git a/rustfmt-config/Cargo.toml b/rustfmt-config/Cargo.toml new file mode 100644 index 00000000000..cce6c7e0067 --- /dev/null +++ b/rustfmt-config/Cargo.toml @@ -0,0 +1,27 @@ +[package] +name = "rustfmt_config" +version = "0.1.0" +authors = ["topecongiro "] +edition = "2018" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +ansi_term = "0.12" +dirs = "2.0" +itertools = "0.8" +regex = "1.3" +rustfmt-config_proc_macro = { version = "0.2", path = "config_proc_macro" } +serde = { version = "1.0", features = ["derive"] } +serde_json = "1.0" +thiserror = "1.0" +toml = "0.5" + +[dependencies.syntax] +package = "rustc-ap-syntax" +version = "610.0.0" + +[dependencies.syntax_pos] +package = "rustc-ap-syntax_pos" +version = "610.0.0" + diff --git a/config_proc_macro/.gitignore b/rustfmt-config/config_proc_macro/.gitignore similarity index 100% rename from config_proc_macro/.gitignore rename to rustfmt-config/config_proc_macro/.gitignore diff --git a/config_proc_macro/Cargo.toml b/rustfmt-config/config_proc_macro/Cargo.toml similarity index 100% rename from config_proc_macro/Cargo.toml rename to rustfmt-config/config_proc_macro/Cargo.toml diff --git a/config_proc_macro/src/attrs.rs b/rustfmt-config/config_proc_macro/src/attrs.rs similarity index 100% rename from config_proc_macro/src/attrs.rs rename to rustfmt-config/config_proc_macro/src/attrs.rs diff --git a/config_proc_macro/src/config_type.rs b/rustfmt-config/config_proc_macro/src/config_type.rs similarity index 100% rename from config_proc_macro/src/config_type.rs rename to rustfmt-config/config_proc_macro/src/config_type.rs diff --git a/config_proc_macro/src/item_enum.rs b/rustfmt-config/config_proc_macro/src/item_enum.rs similarity index 99% rename from config_proc_macro/src/item_enum.rs rename to rustfmt-config/config_proc_macro/src/item_enum.rs index 6101e65d6e9..09375408a1d 100644 --- a/config_proc_macro/src/item_enum.rs +++ b/rustfmt-config/config_proc_macro/src/item_enum.rs @@ -61,7 +61,7 @@ fn impl_doc_hint(ident: &syn::Ident, variants: &Variants) -> TokenStream { .join("|"); let doc_hint = format!("[{}]", doc_hint); quote! { - use crate::config::ConfigType; + use crate::ConfigType; impl ConfigType for #ident { fn doc_hint() -> String { #doc_hint.to_owned() diff --git a/config_proc_macro/src/item_struct.rs b/rustfmt-config/config_proc_macro/src/item_struct.rs similarity index 100% rename from config_proc_macro/src/item_struct.rs rename to rustfmt-config/config_proc_macro/src/item_struct.rs diff --git a/config_proc_macro/src/lib.rs b/rustfmt-config/config_proc_macro/src/lib.rs similarity index 100% rename from config_proc_macro/src/lib.rs rename to rustfmt-config/config_proc_macro/src/lib.rs diff --git a/config_proc_macro/src/utils.rs b/rustfmt-config/config_proc_macro/src/utils.rs similarity index 100% rename from config_proc_macro/src/utils.rs rename to rustfmt-config/config_proc_macro/src/utils.rs diff --git a/config_proc_macro/tests/smoke.rs b/rustfmt-config/config_proc_macro/tests/smoke.rs similarity index 100% rename from config_proc_macro/tests/smoke.rs rename to rustfmt-config/config_proc_macro/tests/smoke.rs diff --git a/rustfmt-core/src/config/config_type.rs b/rustfmt-config/src/config_type.rs similarity index 96% rename from rustfmt-core/src/config/config_type.rs rename to rustfmt-config/src/config_type.rs index cab03310f93..f6291fc49d8 100644 --- a/rustfmt-core/src/config/config_type.rs +++ b/rustfmt-config/src/config_type.rs @@ -1,5 +1,5 @@ -use crate::config::file_lines::FileLines; -use crate::config::options::{IgnoreList, WidthHeuristics}; +use crate::file_lines::FileLines; +use crate::options::{IgnoreList, WidthHeuristics}; /// Trait for types that can be used in `Config`. pub(crate) trait ConfigType: Sized { @@ -52,7 +52,6 @@ impl ConfigType for IgnoreList { macro_rules! create_config { ($($i:ident: $Ty:ty, $def:expr, $is_stable:literal, $dstring:literal;)+) => ( - #[cfg(test)] use std::collections::HashSet; use std::io::Write; @@ -155,7 +154,7 @@ macro_rules! create_config { self.$i.1 = true; self.$i.2 = val; } else { - if crate::is_nightly_channel!() { + if is_nightly_channel!() { self.$i.1 = true; self.$i.2 = val; } else { @@ -172,15 +171,14 @@ macro_rules! create_config { } /// Returns a hash set initialized with every user-facing config option name. - #[cfg(test)] - pub(crate) fn hash_set() -> HashSet<&'static str> { + pub fn hash_set() -> HashSet<&'static str> { [$( stringify!($i), )+] .iter().copied().collect() } - pub(crate) fn is_valid_name(name: &str) -> bool { + pub fn is_valid_name(name: &str) -> bool { match name { $( stringify!($i) => true, @@ -345,3 +343,9 @@ macro_rules! create_config { } ) } + +macro_rules! is_nightly_channel { + () => { + option_env!("CFG_RELEASE_CHANNEL").map_or(true, |c| c == "nightly" || c == "dev") + }; +} diff --git a/rustfmt-core/src/config/file_lines.rs b/rustfmt-config/src/file_lines.rs similarity index 95% rename from rustfmt-core/src/config/file_lines.rs rename to rustfmt-config/src/file_lines.rs index c2124c59870..09620996b26 100644 --- a/rustfmt-core/src/config/file_lines.rs +++ b/rustfmt-config/src/file_lines.rs @@ -36,6 +36,15 @@ impl From for FileName { } } +impl From<&FileName> for syntax_pos::FileName { + fn from(filename: &FileName) -> syntax_pos::FileName { + match filename { + FileName::Real(path) => syntax_pos::FileName::Real(path.to_owned()), + FileName::Stdin => syntax_pos::FileName::Custom("stdin".to_owned()), + } + } +} + impl fmt::Display for FileName { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { @@ -197,12 +206,12 @@ fn normalize_ranges(ranges: &mut HashMap>) { impl FileLines { /// Creates a `FileLines` that contains all lines in all files. - pub(crate) fn all() -> FileLines { + pub fn all() -> FileLines { FileLines(None) } /// Returns `true` if this `FileLines` contains all lines in all files. - pub(crate) fn is_all(&self) -> bool { + pub fn is_all(&self) -> bool { self.0.is_none() } @@ -250,22 +259,22 @@ impl FileLines { /// Returns `true` if `range` is fully contained in `self`. #[allow(dead_code)] - pub(crate) fn contains(&self, range: &LineRange) -> bool { + pub fn contains(&self, range: &LineRange) -> bool { self.file_range_matches(&range.file_name(), |r| r.contains(Range::from(range))) } /// Returns `true` if any lines in `range` are in `self`. - pub(crate) fn intersects(&self, range: &LineRange) -> bool { + pub fn intersects(&self, range: &LineRange) -> bool { self.file_range_matches(&range.file_name(), |r| r.intersects(Range::from(range))) } /// Returns `true` if `line` from `file_name` is in `self`. - pub(crate) fn contains_line(&self, file_name: &FileName, line: usize) -> bool { + pub fn contains_line(&self, file_name: &FileName, line: usize) -> bool { self.file_range_matches(file_name, |r| r.lo <= line && r.hi >= line) } /// Returns `true` if all the lines between `lo` and `hi` from `file_name` are in `self`. - pub(crate) fn contains_range(&self, file_name: &FileName, lo: usize, hi: usize) -> bool { + pub fn contains_range(&self, file_name: &FileName, lo: usize, hi: usize) -> bool { self.file_range_matches(file_name, |r| r.contains(Range::new(lo, hi))) } } diff --git a/rustfmt-core/src/config/mod.rs b/rustfmt-config/src/lib.rs similarity index 97% rename from rustfmt-core/src/config/mod.rs rename to rustfmt-config/src/lib.rs index 6109d3f7ed9..13aadcaa3a0 100644 --- a/rustfmt-core/src/config/mod.rs +++ b/rustfmt-config/src/lib.rs @@ -8,22 +8,19 @@ use std::{env, fs}; use regex::Regex; use thiserror::Error; -use crate::config::config_type::ConfigType; -#[allow(unreachable_pub)] -pub use crate::config::file_lines::{FileLines, FileName, Range}; -#[allow(unreachable_pub)] -pub use crate::config::lists::*; -#[allow(unreachable_pub)] -pub use crate::config::options::*; +use crate::config_type::ConfigType; +pub use crate::file_lines::{FileLines, FileName, Range}; +pub use crate::lists::*; +pub use crate::options::*; #[macro_use] -pub(crate) mod config_type; +pub mod config_type; #[macro_use] -pub(crate) mod options; +pub mod options; -pub(crate) mod file_lines; -pub(crate) mod license; -pub(crate) mod lists; +pub mod file_lines; +pub mod license; +pub mod lists; // This macro defines configuration options used in rustfmt. Each option // is defined as follows: @@ -178,7 +175,7 @@ impl PartialConfig { } impl Config { - pub(crate) fn version_meets_requirement(&self) -> bool { + pub fn version_meets_requirement(&self) -> bool { if self.was_set().required_version() { let version = env!("CARGO_PKG_VERSION"); let required_version = self.required_version(); @@ -201,7 +198,7 @@ impl Config { /// /// Returns a `Config` if the config could be read and parsed from /// the file, otherwise errors. - pub(super) fn from_toml_path(file_path: &Path) -> Result { + pub fn from_toml_path(file_path: &Path) -> Result { let mut file = File::open(&file_path)?; let mut toml = String::new(); file.read_to_string(&mut toml)?; @@ -218,7 +215,7 @@ impl Config { /// /// Returns the `Config` to use, and the path of the project file if there was /// one. - pub(super) fn from_resolved_toml_path(dir: &Path) -> Result<(Config, Option), Error> { + pub fn from_resolved_toml_path(dir: &Path) -> Result<(Config, Option), Error> { /// Try to find a project file in the given directory and its parents. /// Returns the path of a the nearest project file if one exists, /// or `None` if no project file was found. @@ -268,7 +265,7 @@ impl Config { } } - pub(crate) fn from_toml(toml: &str, dir: &Path) -> Result { + pub fn from_toml(toml: &str, dir: &Path) -> Result { let parsed: ::toml::Value = toml .parse() .map_err(|e| format!("Could not parse TOML: {}", e))?; diff --git a/rustfmt-core/src/config/license.rs b/rustfmt-config/src/license.rs similarity index 100% rename from rustfmt-core/src/config/license.rs rename to rustfmt-config/src/license.rs diff --git a/rustfmt-core/src/config/lists.rs b/rustfmt-config/src/lists.rs similarity index 98% rename from rustfmt-core/src/config/lists.rs rename to rustfmt-config/src/lists.rs index 11cb17068fb..784fd2666ad 100644 --- a/rustfmt-core/src/config/lists.rs +++ b/rustfmt-config/src/lists.rs @@ -2,7 +2,7 @@ use rustfmt_config_proc_macro::config_type; -use crate::config::IndentStyle; +use crate::IndentStyle; /// The definitive formatting tactic for lists. #[derive(Eq, PartialEq, Debug, Copy, Clone)] diff --git a/rustfmt-core/src/config/options.rs b/rustfmt-config/src/options.rs similarity index 99% rename from rustfmt-core/src/config/options.rs rename to rustfmt-config/src/options.rs index 47ab2c3ff2f..ea187f10639 100644 --- a/rustfmt-core/src/config/options.rs +++ b/rustfmt-config/src/options.rs @@ -7,8 +7,8 @@ use serde::de::{SeqAccess, Visitor}; use serde::ser::SerializeSeq; use serde::{Deserialize, Deserializer, Serialize, Serializer}; -use crate::config::lists::*; -use crate::config::Config; +use crate::lists::*; +use crate::Config; #[config_type] pub enum NewlineStyle { diff --git a/rustfmt-core/Cargo.toml b/rustfmt-core/Cargo.toml index c20635fddf9..c438447db41 100644 --- a/rustfmt-core/Cargo.toml +++ b/rustfmt-core/Cargo.toml @@ -18,7 +18,7 @@ itertools = "0.8" lazy_static = "1.0.0" log = "0.4" regex = "1.0" -rustfmt-config_proc_macro = { version = "0.2", path = "../config_proc_macro" } +rustfmt_config = { path = "../rustfmt-config" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" term = "0.6" diff --git a/rustfmt-core/src/lib.rs b/rustfmt-core/src/lib.rs index 2c8d99853f5..42a9e36dbcf 100644 --- a/rustfmt-core/src/lib.rs +++ b/rustfmt-core/src/lib.rs @@ -15,6 +15,7 @@ use std::panic; use std::path::PathBuf; use std::rc::Rc; +use rustfmt_config as config; use syntax::ast; use thiserror::Error; @@ -42,7 +43,6 @@ mod attr; mod chains; mod closures; mod comment; -pub(crate) mod config; mod coverage; mod emitter; mod expr; diff --git a/rustfmt-core/src/source_file.rs b/rustfmt-core/src/source_file.rs index 683e0bfbcab..ef723f1a805 100644 --- a/rustfmt-core/src/source_file.rs +++ b/rustfmt-core/src/source_file.rs @@ -65,15 +65,6 @@ where } } - impl From<&FileName> for syntax_pos::FileName { - fn from(filename: &FileName) -> syntax_pos::FileName { - match filename { - FileName::Real(path) => syntax_pos::FileName::Real(path.to_owned()), - FileName::Stdin => syntax_pos::FileName::Custom("stdin".to_owned()), - } - } - } - // SourceFile's in the SourceMap will always have Unix-style line endings // See: https://github.com/rust-lang/rustfmt/issues/3850 // So if the user has explicitly overridden the rustfmt `newline_style` From ca0be26010970691c2ae59cc2c56f7a61615d78d Mon Sep 17 00:00:00 2001 From: topecongiro Date: Sat, 4 Jan 2020 19:57:04 +0900 Subject: [PATCH 03/18] Clean up --- Cargo.lock | 4 ---- rustfmt-config/Cargo.toml | 4 ---- rustfmt-config/src/file_lines.rs | 10 +++++----- rustfmt-core/Cargo.toml | 3 --- 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 55cddb4140b..c3ffb2d5921 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -834,7 +834,6 @@ dependencies = [ "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-syntax 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-ap-syntax_pos 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustfmt-config_proc_macro 0.2.0", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -848,11 +847,9 @@ name = "rustfmt_core" version = "0.1.0" dependencies = [ "annotate-snippets 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", "bytecount 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "diff 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "ignore 0.4.10 (git+https://github.com/topecongiro/ripgrep?branch=update-crossbeam)", "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -867,7 +864,6 @@ dependencies = [ "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "term 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "unicode_categories 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/rustfmt-config/Cargo.toml b/rustfmt-config/Cargo.toml index cce6c7e0067..0ace8a2f565 100644 --- a/rustfmt-config/Cargo.toml +++ b/rustfmt-config/Cargo.toml @@ -17,10 +17,6 @@ serde_json = "1.0" thiserror = "1.0" toml = "0.5" -[dependencies.syntax] -package = "rustc-ap-syntax" -version = "610.0.0" - [dependencies.syntax_pos] package = "rustc-ap-syntax_pos" version = "610.0.0" diff --git a/rustfmt-config/src/file_lines.rs b/rustfmt-config/src/file_lines.rs index 09620996b26..ecea5b7ca59 100644 --- a/rustfmt-config/src/file_lines.rs +++ b/rustfmt-config/src/file_lines.rs @@ -10,7 +10,7 @@ use serde::{ser, Deserialize, Deserializer, Serialize, Serializer}; use serde_json as json; use thiserror::Error; -use syntax::source_map::{self, SourceFile}; +use syntax_pos::{self, SourceFile}; /// A range of lines in a file, inclusive of both ends. pub struct LineRange { @@ -26,11 +26,11 @@ pub enum FileName { Stdin, } -impl From for FileName { - fn from(name: source_map::FileName) -> FileName { +impl From for FileName { + fn from(name: syntax_pos::FileName) -> FileName { match name { - source_map::FileName::Real(p) => FileName::Real(p), - source_map::FileName::Custom(ref f) if f == "stdin" => FileName::Stdin, + syntax_pos::FileName::Real(p) => FileName::Real(p), + syntax_pos::FileName::Custom(ref f) if f == "stdin" => FileName::Stdin, _ => unreachable!(), } } diff --git a/rustfmt-core/Cargo.toml b/rustfmt-core/Cargo.toml index c438447db41..eac0300d179 100644 --- a/rustfmt-core/Cargo.toml +++ b/rustfmt-core/Cargo.toml @@ -8,11 +8,9 @@ edition = "2018" [dependencies] annotate-snippets = { version = "0.6", features = ["ansi_term"] } -ansi_term = "0.12" anyhow = "1.0" bytecount = "0.6" diff = "0.1" -dirs = "2.0.1" ignore = { git = "https://github.com/topecongiro/ripgrep", branch = "update-crossbeam" } itertools = "0.8" lazy_static = "1.0.0" @@ -23,7 +21,6 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" term = "0.6" thiserror = "1.0" -toml = "0.5" unicode_categories = "0.1.1" unicode-segmentation = "1.0.0" unicode-width = "0.1.5" From a140df6ebf6952eef2f157b7a8d847ebe3ff43f6 Mon Sep 17 00:00:00 2001 From: topecongiro Date: Sat, 4 Jan 2020 20:20:38 +0900 Subject: [PATCH 04/18] Separate rustfmt-emitter --- Cargo.lock | 15 +++++-- rustfmt-core/Cargo.toml | 4 +- rustfmt-core/src/lib.rs | 6 +-- rustfmt-core/src/source_file.rs | 5 ++- rustfmt-core/src/test/mod.rs | 27 ----------- rustfmt-emitter/.gitignore | 2 + rustfmt-emitter/Cargo.toml | 14 ++++++ .../src}/checkstyle.rs | 4 +- .../src}/checkstyle/xml.rs | 0 .../emitter => rustfmt-emitter/src}/diff.rs | 10 ++--- .../emitter => rustfmt-emitter/src}/files.rs | 4 +- .../emitter => rustfmt-emitter/src}/json.rs | 2 +- .../emitter.rs => rustfmt-emitter/src/lib.rs | 45 ++++++++++--------- .../src}/modified_lines.rs | 6 +-- .../src/rustfmt_diff.rs | 41 +++++++++++++---- .../emitter => rustfmt-emitter/src}/stdout.rs | 10 +++-- 16 files changed, 110 insertions(+), 85 deletions(-) create mode 100644 rustfmt-emitter/.gitignore create mode 100644 rustfmt-emitter/Cargo.toml rename {rustfmt-core/src/emitter => rustfmt-emitter/src}/checkstyle.rs (98%) rename {rustfmt-core/src/emitter => rustfmt-emitter/src}/checkstyle/xml.rs (100%) rename {rustfmt-core/src/emitter => rustfmt-emitter/src}/diff.rs (96%) rename {rustfmt-core/src/emitter => rustfmt-emitter/src}/files.rs (89%) rename {rustfmt-core/src/emitter => rustfmt-emitter/src}/json.rs (99%) rename rustfmt-core/src/emitter.rs => rustfmt-emitter/src/lib.rs (54%) rename {rustfmt-core/src/emitter => rustfmt-emitter/src}/modified_lines.rs (91%) rename {rustfmt-core => rustfmt-emitter}/src/rustfmt_diff.rs (91%) rename {rustfmt-core/src/emitter => rustfmt-emitter/src}/stdout.rs (83%) diff --git a/Cargo.lock b/Cargo.lock index c3ffb2d5921..26b22c300de 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -849,7 +849,6 @@ dependencies = [ "annotate-snippets 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", "bytecount 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "diff 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "ignore 0.4.10 (git+https://github.com/topecongiro/ripgrep?branch=update-crossbeam)", "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -860,8 +859,7 @@ dependencies = [ "rustc-ap-syntax 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-ap-syntax_pos 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustfmt_config 0.1.0", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", + "rustfmt_emitter 0.1.0", "term 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -869,6 +867,17 @@ dependencies = [ "unicode_categories 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "rustfmt_emitter" +version = "0.1.0" +dependencies = [ + "diff 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "rustfmt_config 0.1.0", + "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", + "term 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "ryu" version = "1.0.2" diff --git a/rustfmt-core/Cargo.toml b/rustfmt-core/Cargo.toml index eac0300d179..2b28f86a66c 100644 --- a/rustfmt-core/Cargo.toml +++ b/rustfmt-core/Cargo.toml @@ -10,15 +10,13 @@ edition = "2018" annotate-snippets = { version = "0.6", features = ["ansi_term"] } anyhow = "1.0" bytecount = "0.6" -diff = "0.1" ignore = { git = "https://github.com/topecongiro/ripgrep", branch = "update-crossbeam" } itertools = "0.8" lazy_static = "1.0.0" log = "0.4" regex = "1.0" rustfmt_config = { path = "../rustfmt-config" } -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" +rustfmt_emitter = { path = "../rustfmt-emitter" } term = "0.6" thiserror = "1.0" unicode_categories = "0.1.1" diff --git a/rustfmt-core/src/lib.rs b/rustfmt-core/src/lib.rs index 42a9e36dbcf..4e09ae40008 100644 --- a/rustfmt-core/src/lib.rs +++ b/rustfmt-core/src/lib.rs @@ -20,7 +20,6 @@ use syntax::ast; use thiserror::Error; use crate::comment::LineClasses; -use crate::emitter::Emitter; use crate::formatting::{FormatErrorMap, FormattingError, ReportedErrors, SourceFile}; use crate::issues::Issue; use crate::shape::Indent; @@ -34,7 +33,8 @@ pub use crate::config::{ pub use crate::format_report_formatter::{FormatReportFormatter, FormatReportFormatterBuilder}; -pub use crate::rustfmt_diff::{ModifiedChunk, ModifiedLines}; +pub use rustfmt_emitter::rustfmt_diff::{ModifiedChunk, ModifiedLines}; +use rustfmt_emitter::{self as emitter, Emitter}; #[macro_use] mod utils; @@ -44,7 +44,6 @@ mod chains; mod closures; mod comment; mod coverage; -mod emitter; mod expr; mod format_report_formatter; pub(crate) mod formatting; @@ -63,7 +62,6 @@ mod patterns; mod release_channel; mod reorder; mod rewrite; -pub(crate) mod rustfmt_diff; mod shape; mod skip; pub(crate) mod source_file; diff --git a/rustfmt-core/src/source_file.rs b/rustfmt-core/src/source_file.rs index ef723f1a805..7945bac056a 100644 --- a/rustfmt-core/src/source_file.rs +++ b/rustfmt-core/src/source_file.rs @@ -1,9 +1,9 @@ use std::fs; use std::io::{self, Write}; use std::path::Path; +use std::rc::Rc; use crate::config::FileName; -use crate::emitter::{self, Emitter}; use crate::syntux::session::ParseSess; use crate::NewlineStyle; @@ -13,7 +13,8 @@ use crate::config::Config; use crate::create_emitter; #[cfg(test)] use crate::formatting::FileRecord; -use std::rc::Rc; + +use rustfmt_emitter::{self as emitter, Emitter}; // Append a newline to the end of each file. pub(crate) fn append_newline(s: &mut String) { diff --git a/rustfmt-core/src/test/mod.rs b/rustfmt-core/src/test/mod.rs index e633e652cfd..37d342bfc24 100644 --- a/rustfmt-core/src/test/mod.rs +++ b/rustfmt-core/src/test/mod.rs @@ -771,33 +771,6 @@ fn get_target(file_name: &Path, target: Option<&str>) -> PathBuf { } } -#[test] -fn rustfmt_diff_make_diff_tests() { - init_log(); - let diff = make_diff("a\nb\nc\nd", "a\ne\nc\nd", 3); - assert_eq!( - diff, - vec![Mismatch { - line_number: 1, - line_number_orig: 1, - lines: vec![ - DiffLine::Context("a".into()), - DiffLine::Resulting("b".into()), - DiffLine::Expected("e".into()), - DiffLine::Context("c".into()), - DiffLine::Context("d".into()), - ], - }] - ); -} - -#[test] -fn rustfmt_diff_no_diff_test() { - init_log(); - let diff = make_diff("a\nb\nc\nd", "a\nb\nc\nd", 3); - assert_eq!(diff, vec![]); -} - // Compare strings without distinguishing between CRLF and LF fn string_eq_ignore_newline_repr(left: &str, right: &str) -> bool { let left = CharsIgnoreNewlineRepr(left.chars().peekable()); diff --git a/rustfmt-emitter/.gitignore b/rustfmt-emitter/.gitignore new file mode 100644 index 00000000000..ca98cd96efd --- /dev/null +++ b/rustfmt-emitter/.gitignore @@ -0,0 +1,2 @@ +/target/ +Cargo.lock diff --git a/rustfmt-emitter/Cargo.toml b/rustfmt-emitter/Cargo.toml new file mode 100644 index 00000000000..a16aa7a974b --- /dev/null +++ b/rustfmt-emitter/Cargo.toml @@ -0,0 +1,14 @@ +[package] +name = "rustfmt_emitter" +version = "0.1.0" +authors = ["topecongiro "] +edition = "2018" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +diff = "0.1" +rustfmt_config = { path = "../rustfmt-config" } +serde = { version = "1.0", features = ["derive"] } +serde_json = "1.0" +term = "0.6" \ No newline at end of file diff --git a/rustfmt-core/src/emitter/checkstyle.rs b/rustfmt-emitter/src/checkstyle.rs similarity index 98% rename from rustfmt-core/src/emitter/checkstyle.rs rename to rustfmt-emitter/src/checkstyle.rs index 00db5b234ee..dcc1d1b46a1 100644 --- a/rustfmt-core/src/emitter/checkstyle.rs +++ b/rustfmt-emitter/src/checkstyle.rs @@ -6,7 +6,7 @@ use std::io::{self, Write}; mod xml; #[derive(Debug, Default)] -pub(crate) struct CheckstyleEmitter; +pub struct CheckstyleEmitter; impl Emitter for CheckstyleEmitter { fn emit_header(&self, output: &mut dyn Write) -> Result<(), io::Error> { @@ -35,7 +35,7 @@ impl Emitter for CheckstyleEmitter { } } -pub(crate) fn output_checkstyle_file( +pub fn output_checkstyle_file( mut writer: T, filename: &FileName, diff: Vec, diff --git a/rustfmt-core/src/emitter/checkstyle/xml.rs b/rustfmt-emitter/src/checkstyle/xml.rs similarity index 100% rename from rustfmt-core/src/emitter/checkstyle/xml.rs rename to rustfmt-emitter/src/checkstyle/xml.rs diff --git a/rustfmt-core/src/emitter/diff.rs b/rustfmt-emitter/src/diff.rs similarity index 96% rename from rustfmt-core/src/emitter/diff.rs rename to rustfmt-emitter/src/diff.rs index 09b250a13ce..00a0bed1101 100644 --- a/rustfmt-core/src/emitter/diff.rs +++ b/rustfmt-emitter/src/diff.rs @@ -1,13 +1,14 @@ -use super::*; -use crate::config::Config; +use rustfmt_config::Config; + use crate::rustfmt_diff::{make_diff, print_diff}; +use super::*; -pub(crate) struct DiffEmitter { +pub struct DiffEmitter { config: Config, } impl DiffEmitter { - pub(crate) fn new(config: Config) -> Self { + pub fn new(config: Config) -> Self { Self { config } } } @@ -51,7 +52,6 @@ impl Emitter for DiffEmitter { #[cfg(test)] mod tests { use super::*; - use crate::config::Config; use crate::FileName; use std::path::PathBuf; diff --git a/rustfmt-core/src/emitter/files.rs b/rustfmt-emitter/src/files.rs similarity index 89% rename from rustfmt-core/src/emitter/files.rs rename to rustfmt-emitter/src/files.rs index 6360b73ee61..4755cc8f1b6 100644 --- a/rustfmt-core/src/emitter/files.rs +++ b/rustfmt-emitter/src/files.rs @@ -2,12 +2,12 @@ use super::*; use std::fs; #[derive(Debug, Default)] -pub(crate) struct FilesEmitter { +pub struct FilesEmitter { print_misformatted_file_names: bool, } impl FilesEmitter { - pub(crate) fn new(print_misformatted_file_names: bool) -> Self { + pub fn new(print_misformatted_file_names: bool) -> Self { Self { print_misformatted_file_names, } diff --git a/rustfmt-core/src/emitter/json.rs b/rustfmt-emitter/src/json.rs similarity index 99% rename from rustfmt-core/src/emitter/json.rs rename to rustfmt-emitter/src/json.rs index 9cf37bf1289..10c855c2c5d 100644 --- a/rustfmt-core/src/emitter/json.rs +++ b/rustfmt-emitter/src/json.rs @@ -5,7 +5,7 @@ use serde_json::to_string as to_json_string; use std::io::{self, Write}; #[derive(Debug, Default)] -pub(crate) struct JsonEmitter { +pub struct JsonEmitter { mismatched_files: Vec, } diff --git a/rustfmt-core/src/emitter.rs b/rustfmt-emitter/src/lib.rs similarity index 54% rename from rustfmt-core/src/emitter.rs rename to rustfmt-emitter/src/lib.rs index 25774a35855..e62a994c294 100644 --- a/rustfmt-core/src/emitter.rs +++ b/rustfmt-emitter/src/lib.rs @@ -1,32 +1,35 @@ -pub(crate) use self::checkstyle::*; -pub(crate) use self::diff::*; -pub(crate) use self::files::*; -pub(crate) use self::json::*; -pub(crate) use self::modified_lines::*; -pub(crate) use self::stdout::*; -use crate::FileName; +pub use self::checkstyle::*; +pub use self::diff::*; +pub use self::files::*; +pub use self::json::*; +pub use self::modified_lines::*; +pub use self::stdout::*; + use std::io::{self, Write}; use std::path::Path; -mod checkstyle; -mod diff; -mod files; -mod json; -mod modified_lines; -mod stdout; - -pub(crate) struct FormattedFile<'a> { - pub(crate) filename: &'a FileName, - pub(crate) original_text: &'a str, - pub(crate) formatted_text: &'a str, +use rustfmt_config::FileName; + +pub mod checkstyle; +pub mod diff; +pub mod files; +pub mod json; +pub mod modified_lines; +pub mod rustfmt_diff; +pub mod stdout; + +pub struct FormattedFile<'a> { + pub filename: &'a FileName, + pub original_text: &'a str, + pub formatted_text: &'a str, } #[derive(Debug, Default, Clone)] -pub(crate) struct EmitterResult { - pub(crate) has_diff: bool, +pub struct EmitterResult { + pub has_diff: bool, } -pub(crate) trait Emitter { +pub trait Emitter { fn emit_formatted_file( &mut self, output: &mut dyn Write, diff --git a/rustfmt-core/src/emitter/modified_lines.rs b/rustfmt-emitter/src/modified_lines.rs similarity index 91% rename from rustfmt-core/src/emitter/modified_lines.rs rename to rustfmt-emitter/src/modified_lines.rs index 94ff570a8a9..06c631e8704 100644 --- a/rustfmt-core/src/emitter/modified_lines.rs +++ b/rustfmt-emitter/src/modified_lines.rs @@ -1,9 +1,9 @@ -use super::*; use crate::rustfmt_diff::{make_diff, ModifiedLines}; -use std::io::Write; + +use super::*; #[derive(Debug, Default)] -pub(crate) struct ModifiedLinesEmitter; +pub struct ModifiedLinesEmitter; impl Emitter for ModifiedLinesEmitter { fn emit_formatted_file( diff --git a/rustfmt-core/src/rustfmt_diff.rs b/rustfmt-emitter/src/rustfmt_diff.rs similarity index 91% rename from rustfmt-core/src/rustfmt_diff.rs rename to rustfmt-emitter/src/rustfmt_diff.rs index fc2c7d06e26..84578154fe8 100644 --- a/rustfmt-core/src/rustfmt_diff.rs +++ b/rustfmt-emitter/src/rustfmt_diff.rs @@ -3,7 +3,7 @@ use std::fmt; use std::io; use std::io::Write; -use crate::config::{Color, Config, Verbosity}; +use rustfmt_config::{Color, Config, Verbosity}; #[derive(Debug, PartialEq)] pub enum DiffLine { @@ -144,14 +144,14 @@ impl std::str::FromStr for ModifiedLines { // This struct handles writing output to stdout and abstracts away the logic // of printing in color, if it's possible in the executing environment. -pub(crate) struct OutputWriter { +pub struct OutputWriter { terminal: Option>>, } impl OutputWriter { // Create a new OutputWriter instance based on the caller's preference // for colorized output and the capabilities of the terminal. - pub(crate) fn new(color: Color) -> Self { + pub fn new(color: Color) -> Self { if let Some(t) = term::stdout() { if color.use_colored_tty() && t.supports_color() { return OutputWriter { terminal: Some(t) }; @@ -163,7 +163,7 @@ impl OutputWriter { // Write output in the optionally specified color. The output is written // in the specified color if this OutputWriter instance contains a // Terminal in its `terminal` field. - pub(crate) fn writeln(&mut self, msg: &str, color: Option) { + pub fn writeln(&mut self, msg: &str, color: Option) { match &mut self.terminal { Some(ref mut t) => { if let Some(color) = color { @@ -180,7 +180,7 @@ impl OutputWriter { } // Produces a diff between the expected output and actual output of rustfmt. -pub(crate) fn make_diff(expected: &str, actual: &str, context_size: usize) -> Vec { +pub fn make_diff(expected: &str, actual: &str, context_size: usize) -> Vec { let mut line_number = 1; let mut line_number_orig = 1; let mut context_queue: VecDeque<&str> = VecDeque::with_capacity(context_size); @@ -248,7 +248,7 @@ pub(crate) fn make_diff(expected: &str, actual: &str, context_size: usize) -> Ve results } -pub(crate) fn print_diff(diff: Vec, get_section_title: F, config: &Config) +pub fn print_diff(diff: Vec, get_section_title: F, config: &Config) where F: Fn(u32) -> String, { @@ -286,8 +286,7 @@ where #[cfg(test)] mod test { use super::DiffLine::*; - use super::{make_diff, Mismatch}; - use super::{ModifiedChunk, ModifiedLines}; + use super::*; #[test] fn diff_simple() { @@ -400,4 +399,30 @@ mod test { let src = "1 5 3\na\nb"; assert_eq!(ModifiedLines::from_str(src), Err(())); } + + #[test] + fn rustfmt_diff_make_diff_tests() { + let diff = make_diff("a\nb\nc\nd", "a\ne\nc\nd", 3); + assert_eq!( + diff, + vec![Mismatch { + line_number: 1, + line_number_orig: 1, + lines: vec![ + DiffLine::Context("a".into()), + DiffLine::Resulting("b".into()), + DiffLine::Expected("e".into()), + DiffLine::Context("c".into()), + DiffLine::Context("d".into()), + ], + }] + ); + } + + #[test] + fn rustfmt_diff_no_diff_test() { + let diff = make_diff("a\nb\nc\nd", "a\nb\nc\nd", 3); + assert_eq!(diff, vec![]); + } + } diff --git a/rustfmt-core/src/emitter/stdout.rs b/rustfmt-emitter/src/stdout.rs similarity index 83% rename from rustfmt-core/src/emitter/stdout.rs rename to rustfmt-emitter/src/stdout.rs index 9fddd515e49..652542ef5ef 100644 --- a/rustfmt-core/src/emitter/stdout.rs +++ b/rustfmt-emitter/src/stdout.rs @@ -1,14 +1,16 @@ -use super::*; -use crate::config::Verbosity; use std::io::Write; +use rustfmt_config::Verbosity; + +use super::*; + #[derive(Debug)] -pub(crate) struct StdoutEmitter { +pub struct StdoutEmitter { verbosity: Verbosity, } impl StdoutEmitter { - pub(crate) fn new(verbosity: Verbosity) -> Self { + pub fn new(verbosity: Verbosity) -> Self { Self { verbosity } } } From 3ca3cbbeb800060126cdb8c30ac74916c2f084f8 Mon Sep 17 00:00:00 2001 From: topecongiro Date: Sat, 4 Jan 2020 20:36:19 +0900 Subject: [PATCH 05/18] Use workspace --- Cargo.toml | 2 +- rustfmt-lib/.gitignore | 2 ++ rustfmt-lib/Cargo.toml | 6 ++++++ {rustfmt-config => rustfmt-lib/rustfmt-config}/.gitignore | 0 {rustfmt-config => rustfmt-lib/rustfmt-config}/Cargo.toml | 0 .../rustfmt-config}/config_proc_macro/.gitignore | 0 .../rustfmt-config}/config_proc_macro/Cargo.toml | 0 .../rustfmt-config}/config_proc_macro/src/attrs.rs | 0 .../rustfmt-config}/config_proc_macro/src/config_type.rs | 0 .../rustfmt-config}/config_proc_macro/src/item_enum.rs | 0 .../rustfmt-config}/config_proc_macro/src/item_struct.rs | 0 .../rustfmt-config}/config_proc_macro/src/lib.rs | 0 .../rustfmt-config}/config_proc_macro/src/utils.rs | 0 .../rustfmt-config}/config_proc_macro/tests/smoke.rs | 6 ++---- .../rustfmt-config}/src/config_type.rs | 1 + .../rustfmt-config}/src/file_lines.rs | 0 {rustfmt-config => rustfmt-lib/rustfmt-config}/src/lib.rs | 4 ++-- .../rustfmt-config}/src/license.rs | 0 .../rustfmt-config}/src/lists.rs | 0 .../rustfmt-config}/src/options.rs | 0 .../rustfmt-config}/tests/license-template/lt.txt | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/.gitignore | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/Cargo.toml | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/attr.rs | 0 .../rustfmt-core}/src/attr/doc_comment.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/chains.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/closures.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/comment.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/coverage.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/expr.rs | 0 .../rustfmt-core}/src/format_report_formatter.rs | 0 .../rustfmt-core}/src/formatting.rs | 0 .../rustfmt-core}/src/formatting/newline_style.rs | 0 .../rustfmt-core}/src/ignore_path.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/imports.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/issues.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/items.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/lib.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/lists.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/macros.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/matches.rs | 0 .../rustfmt-core}/src/missed_spans.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/modules.rs | 0 .../rustfmt-core}/src/modules/visitor.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/overflow.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/pairs.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/patterns.rs | 0 .../rustfmt-core}/src/release_channel.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/reorder.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/rewrite.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/shape.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/skip.rs | 0 .../rustfmt-core}/src/source_file.rs | 0 .../rustfmt-core}/src/source_map.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/spanned.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/stmt.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/string.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/syntux.rs | 0 .../rustfmt-core}/src/syntux/parser.rs | 0 .../rustfmt-core}/src/syntux/session.rs | 0 .../rustfmt-core}/src/test/configuration_snippet.rs | 7 ++++--- {rustfmt-core => rustfmt-lib/rustfmt-core}/src/test/mod.rs | 7 +++++-- {rustfmt-core => rustfmt-lib/rustfmt-core}/src/types.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/utils.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/vertical.rs | 0 {rustfmt-core => rustfmt-lib/rustfmt-core}/src/visitor.rs | 0 .../rustfmt-core}/tests/config/issue-1111.toml | 0 .../rustfmt-core}/tests/config/issue-2641.toml | 0 .../rustfmt-core}/tests/config/issue-3779.toml | 0 .../rustfmt-core}/tests/config/issue-3802.toml | 0 .../rustfmt-core}/tests/config/issue-3933.toml | 0 .../rustfmt-core}/tests/config/issue-3956.toml | 0 .../rustfmt-core}/tests/config/skip_children.toml | 0 .../rustfmt-core}/tests/config/small_tabs.toml | 0 .../rustfmt-core}/tests/coverage/source/comments.rs | 0 .../rustfmt-core}/tests/coverage/target/comments.rs | 0 rustfmt-lib/rustfmt-core/tests/license-template/lt.txt | 2 ++ .../tests/source/alignment_2633/block_style.rs | 0 .../tests/source/alignment_2633/visual_style.rs | 0 .../rustfmt-core}/tests/source/array_comment.rs | 0 .../rustfmt-core}/tests/source/assignment.rs | 0 .../tests/source/associated-types-bounds-wrapping.rs | 0 .../rustfmt-core}/tests/source/associated_type_bounds.rs | 0 .../rustfmt-core}/tests/source/async_block.rs | 0 .../rustfmt-core}/tests/source/async_fn.rs | 0 .../rustfmt-core}/tests/source/attrib.rs | 0 .../rustfmt-core}/tests/source/big-impl-block.rs | 0 .../rustfmt-core}/tests/source/big-impl-visual.rs | 0 .../rustfmt-core}/tests/source/binary-expr.rs | 0 .../rustfmt-core}/tests/source/break-and-continue.rs | 0 .../rustfmt-core}/tests/source/catch.rs | 0 .../tests/source/cfg_if/detect/arch/aarch64.rs | 0 .../rustfmt-core}/tests/source/cfg_if/detect/arch/arm.rs | 0 .../rustfmt-core}/tests/source/cfg_if/detect/arch/mips.rs | 0 .../tests/source/cfg_if/detect/arch/mips64.rs | 0 .../tests/source/cfg_if/detect/arch/powerpc.rs | 0 .../tests/source/cfg_if/detect/arch/powerpc64.rs | 0 .../rustfmt-core}/tests/source/cfg_if/detect/arch/x86.rs | 0 .../rustfmt-core}/tests/source/cfg_if/detect/bit.rs | 0 .../rustfmt-core}/tests/source/cfg_if/detect/cache.rs | 0 .../tests/source/cfg_if/detect/error_macros.rs | 0 .../rustfmt-core}/tests/source/cfg_if/detect/mod.rs | 0 .../rustfmt-core}/tests/source/cfg_if/detect/os/aarch64.rs | 0 .../tests/source/cfg_if/detect/os/freebsd/aarch64.rs | 0 .../tests/source/cfg_if/detect/os/freebsd/arm.rs | 0 .../tests/source/cfg_if/detect/os/freebsd/auxvec.rs | 0 .../tests/source/cfg_if/detect/os/freebsd/mod.rs | 0 .../tests/source/cfg_if/detect/os/freebsd/powerpc.rs | 0 .../tests/source/cfg_if/detect/os/linux/aarch64.rs | 0 .../tests/source/cfg_if/detect/os/linux/arm.rs | 0 .../tests/source/cfg_if/detect/os/linux/auxvec.rs | 0 .../tests/source/cfg_if/detect/os/linux/cpuinfo.rs | 0 .../tests/source/cfg_if/detect/os/linux/mips.rs | 0 .../tests/source/cfg_if/detect/os/linux/mod.rs | 0 .../tests/source/cfg_if/detect/os/linux/powerpc.rs | 0 .../rustfmt-core}/tests/source/cfg_if/detect/os/other.rs | 0 .../rustfmt-core}/tests/source/cfg_if/detect/os/x86.rs | 0 .../rustfmt-core}/tests/source/cfg_if/lib.rs | 0 .../rustfmt-core}/tests/source/cfg_if/mod.rs | 0 .../rustfmt-core}/tests/source/cfg_mod/bar.rs | 0 .../tests/source/cfg_mod/dir/dir1/dir2/wasm32.rs | 0 .../tests/source/cfg_mod/dir/dir1/dir3/wasm32.rs | 0 .../rustfmt-core}/tests/source/cfg_mod/foo.rs | 0 .../rustfmt-core}/tests/source/cfg_mod/mod.rs | 0 .../rustfmt-core}/tests/source/cfg_mod/other.rs | 0 .../rustfmt-core}/tests/source/cfg_mod/wasm32.rs | 0 .../rustfmt-core}/tests/source/chains-visual.rs | 0 .../rustfmt-core}/tests/source/chains.rs | 0 .../rustfmt-core}/tests/source/chains_with_comment.rs | 0 .../tests/source/closure-block-inside-macro.rs | 0 .../rustfmt-core}/tests/source/closure_block_style.rs | 0 .../tests/source/closure_block_style_no_comma.rs | 0 .../rustfmt-core}/tests/source/closure_visual_style.rs | 0 .../rustfmt-core}/tests/source/comment.rs | 0 .../rustfmt-core}/tests/source/comment2.rs | 0 .../rustfmt-core}/tests/source/comment3.rs | 0 .../rustfmt-core}/tests/source/comment4.rs | 0 .../rustfmt-core}/tests/source/comment5.rs | 0 .../rustfmt-core}/tests/source/comment6.rs | 0 .../rustfmt-core}/tests/source/comment_crlf_newline.rs | 0 .../tests/source/configs/blank_lines_lower_bound/1.rs | 0 .../source/configs/brace_style/fn_always_next_line.rs | 0 .../source/configs/brace_style/fn_prefer_same_line.rs | 0 .../tests/source/configs/brace_style/fn_same_line_where.rs | 0 .../source/configs/brace_style/item_always_next_line.rs | 0 .../source/configs/brace_style/item_prefer_same_line.rs | 0 .../source/configs/brace_style/item_same_line_where.rs | 0 .../tests/source/configs/comment_width/above.rs | 0 .../tests/source/configs/comment_width/below.rs | 0 .../tests/source/configs/comment_width/ignore.rs | 0 .../source/configs/condense_wildcard_suffixes/false.rs | 0 .../source/configs/condense_wildcard_suffixes/true.rs | 0 .../source/configs/control_brace_style/always_next_line.rs | 0 .../source/configs/control_brace_style/always_same_line.rs | 0 .../configs/control_brace_style/closing_next_line.rs | 0 .../tests/source/configs/disable_all_formatting/false.rs | 0 .../tests/source/configs/disable_all_formatting/true.rs | 0 .../tests/source/configs/empty_item_single_line/false.rs | 0 .../tests/source/configs/empty_item_single_line/true.rs | 0 .../source/configs/enum_discrim_align_threshold/40.rs | 0 .../tests/source/configs/error_on_line_overflow/false.rs | 0 .../tests/source/configs/fn_args_layout/compressed.rs | 0 .../tests/source/configs/fn_args_layout/tall.rs | 0 .../tests/source/configs/fn_args_layout/vertical.rs | 0 .../tests/source/configs/fn_single_line/false.rs | 0 .../tests/source/configs/fn_single_line/true.rs | 0 .../tests/source/configs/force_explicit_abi/false.rs | 0 .../tests/source/configs/force_explicit_abi/true.rs | 0 .../tests/source/configs/force_multiline_block/false.rs | 0 .../tests/source/configs/force_multiline_block/true.rs | 0 .../tests/source/configs/format_macro_bodies/false.rs | 0 .../tests/source/configs/format_macro_bodies/true.rs | 0 .../tests/source/configs/format_macro_matchers/false.rs | 0 .../tests/source/configs/format_macro_matchers/true.rs | 0 .../tests/source/configs/format_strings/false.rs | 0 .../tests/source/configs/format_strings/true.rs | 0 .../rustfmt-core}/tests/source/configs/hard_tabs/false.rs | 0 .../rustfmt-core}/tests/source/configs/hard_tabs/true.rs | 0 .../tests/source/configs/imports_layout/merge_mixed.rs | 0 .../tests/source/configs/indent_style/block_args.rs | 0 .../tests/source/configs/indent_style/block_array.rs | 0 .../tests/source/configs/indent_style/block_call.rs | 0 .../tests/source/configs/indent_style/block_chain.rs | 0 .../tests/source/configs/indent_style/block_generic.rs | 0 .../tests/source/configs/indent_style/block_struct_lit.rs | 0 .../configs/indent_style/block_trailing_comma_call/two.rs | 0 .../tests/source/configs/indent_style/block_where_pred.rs | 0 .../tests/source/configs/indent_style/default.rs | 0 .../tests/source/configs/indent_style/rfc_where.rs | 0 .../tests/source/configs/indent_style/visual_args.rs | 0 .../tests/source/configs/indent_style/visual_array.rs | 0 .../tests/source/configs/indent_style/visual_call.rs | 0 .../tests/source/configs/indent_style/visual_chain.rs | 0 .../tests/source/configs/indent_style/visual_generics.rs | 0 .../tests/source/configs/indent_style/visual_struct_lit.rs | 0 .../source/configs/indent_style/visual_trailing_comma.rs | 0 .../tests/source/configs/indent_style/visual_where_pred.rs | 0 .../tests/source/configs/match_arm_blocks/false.rs | 0 .../tests/source/configs/match_arm_blocks/true.rs | 0 .../source/configs/match_block_trailing_comma/false.rs | 0 .../source/configs/match_block_trailing_comma/true.rs | 0 .../tests/source/configs/merge_derives/true.rs | 0 .../tests/source/configs/normalize_comments/false.rs | 0 .../tests/source/configs/normalize_comments/true.rs | 0 .../tests/source/configs/normalize_doc_attributes/false.rs | 0 .../tests/source/configs/normalize_doc_attributes/true.rs | 0 .../tests/source/configs/recursive/disabled/foo.rs | 0 .../tests/source/configs/recursive/disabled/lib.rs | 0 .../tests/source/configs/recursive/enabled/foo.rs | 0 .../tests/source/configs/recursive/enabled/lib.rs | 0 .../configs/remove_nested_parens/remove_nested_parens.rs | 0 .../tests/source/configs/reorder_impl_items/false.rs | 0 .../tests/source/configs/reorder_impl_items/true.rs | 0 .../tests/source/configs/reorder_imports/false.rs | 0 .../tests/source/configs/reorder_imports/true.rs | 0 .../tests/source/configs/reorder_modules/dolor/mod.rs | 0 .../tests/source/configs/reorder_modules/false.rs | 0 .../tests/source/configs/reorder_modules/ipsum/mod.rs | 0 .../tests/source/configs/reorder_modules/lorem/mod.rs | 0 .../tests/source/configs/reorder_modules/sit/mod.rs | 0 .../tests/source/configs/reorder_modules/true.rs | 0 .../tests/source/configs/skip_children/foo/mod.rs | 0 .../tests/source/configs/skip_children/true.rs | 0 .../tests/source/configs/space_before_colon/true.rs | 0 .../tests/source/configs/spaces_around_ranges/false.rs | 0 .../tests/source/configs/spaces_around_ranges/true.rs | 0 .../source/configs/struct_field_align_threshold/20.rs | 0 .../tests/source/configs/struct_lit_single_line/false.rs | 0 .../rustfmt-core}/tests/source/configs/tab_spaces/2.rs | 0 .../rustfmt-core}/tests/source/configs/tab_spaces/4.rs | 0 .../tests/source/configs/trailing_comma/always.rs | 0 .../tests/source/configs/trailing_comma/never.rs | 0 .../tests/source/configs/trailing_comma/vertical.rs | 0 .../source/configs/type_punctuation_density/compressed.rs | 0 .../tests/source/configs/type_punctuation_density/wide.rs | 0 .../tests/source/configs/use_field_init_shorthand/false.rs | 0 .../tests/source/configs/use_field_init_shorthand/true.rs | 0 .../tests/source/configs/use_small_heuristics/max.rs | 0 .../tests/source/configs/use_try_shorthand/false.rs | 0 .../tests/source/configs/use_try_shorthand/true.rs | 0 .../source/configs/use_try_shorthand/true_2015_edition.rs | 0 .../tests/source/configs/where_single_line/true.rs | 0 .../tests/source/configs/wrap_comments/false.rs | 0 .../tests/source/configs/wrap_comments/true.rs | 0 .../rustfmt-core}/tests/source/const_generics.rs | 0 .../tests/source/control-brace-style-always-next-line.rs | 0 .../tests/source/control-brace-style-always-same-line.rs | 0 .../rustfmt-core}/tests/source/doc-attrib.rs | 0 .../rustfmt-core}/tests/source/doc-comment-with-example.rs | 0 .../rustfmt-core}/tests/source/doc.rs | 0 .../rustfmt-core}/tests/source/dyn_trait.rs | 0 .../tests/source/else-if-brace-style-always-next-line.rs | 0 .../tests/source/else-if-brace-style-always-same-line.rs | 0 .../tests/source/else-if-brace-style-closing-next-line.rs | 0 .../rustfmt-core}/tests/source/empty_file.rs | 0 .../rustfmt-core}/tests/source/enum.rs | 0 .../rustfmt-core}/tests/source/existential_type.rs | 0 .../rustfmt-core}/tests/source/expr-block.rs | 0 .../rustfmt-core}/tests/source/expr-overflow-delimited.rs | 0 .../rustfmt-core}/tests/source/expr.rs | 0 .../rustfmt-core}/tests/source/extern.rs | 0 .../rustfmt-core}/tests/source/extern_not_explicit.rs | 0 .../rustfmt-core}/tests/source/file-lines-1.rs | 0 .../rustfmt-core}/tests/source/file-lines-2.rs | 0 .../rustfmt-core}/tests/source/file-lines-3.rs | 0 .../rustfmt-core}/tests/source/file-lines-4.rs | 0 .../rustfmt-core}/tests/source/file-lines-5.rs | 0 .../rustfmt-core}/tests/source/file-lines-6.rs | 0 .../rustfmt-core}/tests/source/file-lines-7.rs | 0 .../rustfmt-core}/tests/source/file-lines-8.rs | 0 .../rustfmt-core}/tests/source/file-lines-item.rs | 0 .../rustfmt-core}/tests/source/fn-custom-2.rs | 0 .../rustfmt-core}/tests/source/fn-custom-3.rs | 0 .../rustfmt-core}/tests/source/fn-custom-4.rs | 0 .../rustfmt-core}/tests/source/fn-custom-6.rs | 0 .../rustfmt-core}/tests/source/fn-custom-7.rs | 0 .../rustfmt-core}/tests/source/fn-custom-8.rs | 0 .../rustfmt-core}/tests/source/fn-custom.rs | 0 .../rustfmt-core}/tests/source/fn-param-attributes.rs | 0 .../rustfmt-core}/tests/source/fn-simple.rs | 0 .../tests/source/fn-single-line/version_two.rs | 0 .../rustfmt-core}/tests/source/fn_args_indent-block.rs | 0 .../rustfmt-core}/tests/source/fn_args_layout-vertical.rs | 0 .../rustfmt-core}/tests/source/hard-tabs.rs | 0 .../rustfmt-core}/tests/source/hello.rs | 0 .../rustfmt-core}/tests/source/hello2.rs | 0 .../rustfmt-core}/tests/source/if_while_or_patterns.rs | 0 .../rustfmt-core}/tests/source/immovable_generators.rs | 0 .../rustfmt-core}/tests/source/impls.rs | 0 .../rustfmt-core}/tests/source/imports-impl-only-use.rs | 0 .../tests/source/imports-reorder-lines-and-items.rs | 0 .../rustfmt-core}/tests/source/imports-reorder-lines.rs | 0 .../rustfmt-core}/tests/source/imports-reorder.rs | 0 .../rustfmt-core}/tests/source/imports.rs | 0 .../rustfmt-core}/tests/source/imports_2015_edition.rs | 0 .../rustfmt-core}/tests/source/imports_block_indent.rs | 0 .../rustfmt-core}/tests/source/imports_raw_identifiers.rs | 0 .../tests/source/invalid-rust-code-in-doc-comment.rs | 0 .../rustfmt-core}/tests/source/issue-1021.rs | 0 .../rustfmt-core}/tests/source/issue-1049.rs | 0 .../rustfmt-core}/tests/source/issue-1111.rs | 0 .../rustfmt-core}/tests/source/issue-1120.rs | 0 .../rustfmt-core}/tests/source/issue-1124.rs | 0 .../rustfmt-core}/tests/source/issue-1127.rs | 0 .../rustfmt-core}/tests/source/issue-1158.rs | 0 .../rustfmt-core}/tests/source/issue-1177.rs | 0 .../rustfmt-core}/tests/source/issue-1192.rs | 0 .../rustfmt-core}/tests/source/issue-1210/a.rs | 0 .../rustfmt-core}/tests/source/issue-1210/b.rs | 0 .../rustfmt-core}/tests/source/issue-1210/c.rs | 0 .../rustfmt-core}/tests/source/issue-1210/d.rs | 0 .../rustfmt-core}/tests/source/issue-1210/e.rs | 0 .../rustfmt-core}/tests/source/issue-1211.rs | 0 .../rustfmt-core}/tests/source/issue-1216.rs | 0 .../rustfmt-core}/tests/source/issue-1239.rs | 0 .../rustfmt-core}/tests/source/issue-1278.rs | 0 .../rustfmt-core}/tests/source/issue-1350.rs | 0 .../rustfmt-core}/tests/source/issue-1366.rs | 0 .../rustfmt-core}/tests/source/issue-1468.rs | 0 .../rustfmt-core}/tests/source/issue-1693.rs | 0 .../rustfmt-core}/tests/source/issue-1800.rs | 0 .../rustfmt-core}/tests/source/issue-1914.rs | 0 .../rustfmt-core}/tests/source/issue-2025.rs | 0 .../rustfmt-core}/tests/source/issue-2111.rs | 0 .../rustfmt-core}/tests/source/issue-2164.rs | 0 .../rustfmt-core}/tests/source/issue-2179/two.rs | 0 .../rustfmt-core}/tests/source/issue-2256.rs | 0 .../rustfmt-core}/tests/source/issue-2342.rs | 0 .../rustfmt-core}/tests/source/issue-2445.rs | 0 .../rustfmt-core}/tests/source/issue-2446.rs | 0 .../rustfmt-core}/tests/source/issue-2479.rs | 0 .../rustfmt-core}/tests/source/issue-2482/a.rs | 0 .../rustfmt-core}/tests/source/issue-2482/b.rs | 0 .../rustfmt-core}/tests/source/issue-2482/c.rs | 0 .../rustfmt-core}/tests/source/issue-2496.rs | 0 .../rustfmt-core}/tests/source/issue-2520.rs | 0 .../rustfmt-core}/tests/source/issue-2523.rs | 0 .../rustfmt-core}/tests/source/issue-2582.rs | 0 .../rustfmt-core}/tests/source/issue-2641.rs | 0 .../rustfmt-core}/tests/source/issue-2644.rs | 0 .../rustfmt-core}/tests/source/issue-2728.rs | 0 .../rustfmt-core}/tests/source/issue-2761.rs | 0 .../rustfmt-core}/tests/source/issue-2794.rs | 0 .../rustfmt-core}/tests/source/issue-2835.rs | 0 .../rustfmt-core}/tests/source/issue-2863.rs | 0 .../rustfmt-core}/tests/source/issue-2869.rs | 0 .../rustfmt-core}/tests/source/issue-2896.rs | 0 .../rustfmt-core}/tests/source/issue-2917/packed_simd.rs | 0 .../rustfmt-core}/tests/source/issue-2922.rs | 0 .../rustfmt-core}/tests/source/issue-2927-2.rs | 0 .../rustfmt-core}/tests/source/issue-2927.rs | 0 .../rustfmt-core}/tests/source/issue-2930.rs | 0 .../rustfmt-core}/tests/source/issue-2936.rs | 0 .../rustfmt-core}/tests/source/issue-2955.rs | 0 .../rustfmt-core}/tests/source/issue-2973.rs | 0 .../rustfmt-core}/tests/source/issue-2977/impl.rs | 0 .../rustfmt-core}/tests/source/issue-2977/trait.rs | 0 .../rustfmt-core}/tests/source/issue-2985.rs | 0 .../rustfmt-core}/tests/source/issue-2995.rs | 0 .../rustfmt-core}/tests/source/issue-3029.rs | 0 .../rustfmt-core}/tests/source/issue-3038.rs | 0 .../rustfmt-core}/tests/source/issue-3049.rs | 0 .../rustfmt-core}/tests/source/issue-3055/original.rs | 0 .../rustfmt-core}/tests/source/issue-3059.rs | 0 .../rustfmt-core}/tests/source/issue-3066.rs | 0 .../rustfmt-core}/tests/source/issue-3131.rs | 0 .../rustfmt-core}/tests/source/issue-3153.rs | 0 .../rustfmt-core}/tests/source/issue-3170.rs | 0 .../rustfmt-core}/tests/source/issue-3194.rs | 0 .../rustfmt-core}/tests/source/issue-3198.rs | 0 .../rustfmt-core}/tests/source/issue-3213/version_two.rs | 0 .../rustfmt-core}/tests/source/issue-3217.rs | 0 .../rustfmt-core}/tests/source/issue-3227/two.rs | 0 .../rustfmt-core}/tests/source/issue-3234.rs | 0 .../rustfmt-core}/tests/source/issue-3241.rs | 0 .../rustfmt-core}/tests/source/issue-3253/bar.rs | 0 .../rustfmt-core}/tests/source/issue-3253/foo.rs | 0 .../rustfmt-core}/tests/source/issue-3253/lib.rs | 0 .../rustfmt-core}/tests/source/issue-3253/paths/bar_foo.rs | 0 .../tests/source/issue-3253/paths/excluded.rs | 0 .../rustfmt-core}/tests/source/issue-3253/paths/foo_bar.rs | 0 .../rustfmt-core}/tests/source/issue-3265.rs | 0 .../rustfmt-core}/tests/source/issue-3270/two.rs | 0 .../rustfmt-core}/tests/source/issue-3272/v2.rs | 0 .../rustfmt-core}/tests/source/issue-3278/version_two.rs | 0 .../rustfmt-core}/tests/source/issue-3295/two.rs | 0 .../rustfmt-core}/tests/source/issue-3302.rs | 0 .../rustfmt-core}/tests/source/issue-3343.rs | 0 .../rustfmt-core}/tests/source/issue-3423.rs | 0 .../rustfmt-core}/tests/source/issue-3434/lib.rs | 0 .../rustfmt-core}/tests/source/issue-3434/no_entry.rs | 0 .../tests/source/issue-3434/not_skip_macro.rs | 0 .../rustfmt-core}/tests/source/issue-3465.rs | 0 .../rustfmt-core}/tests/source/issue-3494/crlf.rs | 0 .../rustfmt-core}/tests/source/issue-3494/lf.rs | 0 .../rustfmt-core}/tests/source/issue-3508.rs | 0 .../rustfmt-core}/tests/source/issue-3515.rs | 0 .../rustfmt-core}/tests/source/issue-3532.rs | 0 .../rustfmt-core}/tests/source/issue-3585/extern_crate.rs | 0 .../tests/source/issue-3585/reorder_imports_disabled.rs | 0 .../tests/source/issue-3585/reorder_imports_enabled.rs | 0 .../rustfmt-core}/tests/source/issue-3585/use.rs | 0 .../rustfmt-core}/tests/source/issue-3636.rs | 0 .../rustfmt-core}/tests/source/issue-3639.rs | 0 .../rustfmt-core}/tests/source/issue-3651.rs | 0 .../rustfmt-core}/tests/source/issue-3665/lib.rs | 0 .../tests/source/issue-3665/not_skip_attribute.rs | 0 .../rustfmt-core}/tests/source/issue-3665/sub_mod.rs | 0 .../rustfmt-core}/tests/source/issue-3672.rs | 0 .../rustfmt-core}/tests/source/issue-3675.rs | 0 .../rustfmt-core}/tests/source/issue-3701/two.rs | 0 .../rustfmt-core}/tests/source/issue-3709.rs | 0 .../rustfmt-core}/tests/source/issue-3740.rs | 0 .../rustfmt-core}/tests/source/issue-3750.rs | 0 .../rustfmt-core}/tests/source/issue-3751.rs | 0 .../rustfmt-core}/tests/source/issue-3779/ice.rs | 0 .../rustfmt-core}/tests/source/issue-3779/lib.rs | 0 .../rustfmt-core}/tests/source/issue-3786.rs | 0 .../rustfmt-core}/tests/source/issue-3787.rs | 0 .../tests/source/issue-3840/version-two_hard-tabs.rs | 0 .../tests/source/issue-3840/version-two_soft-tabs.rs | 0 .../rustfmt-core}/tests/source/issue-3851.rs | 0 .../rustfmt-core}/tests/source/issue-3904/two.rs | 0 .../rustfmt-core}/tests/source/issue-3908.rs | 0 .../rustfmt-core}/tests/source/issue-3923.rs | 0 .../rustfmt-core}/tests/source/issue-3929.rs | 0 .../rustfmt-core}/tests/source/issue-3933/imp-a.rs | 0 .../rustfmt-core}/tests/source/issue-3933/imp-b.rs | 0 .../rustfmt-core}/tests/source/issue-3933/lib.rs | 0 .../rustfmt-core}/tests/source/issue-3933/utils.rs | 0 .../rustfmt-core}/tests/source/issue-447.rs | 0 .../rustfmt-core}/tests/source/issue-510.rs | 0 .../rustfmt-core}/tests/source/issue-539.rs | 0 .../rustfmt-core}/tests/source/issue-683.rs | 0 .../rustfmt-core}/tests/source/issue-811.rs | 0 .../rustfmt-core}/tests/source/issue-850.rs | 0 .../rustfmt-core}/tests/source/issue-855.rs | 0 .../rustfmt-core}/tests/source/issue-913.rs | 0 .../rustfmt-core}/tests/source/issue-945.rs | 0 .../rustfmt-core}/tests/source/issue-977.rs | 0 .../rustfmt-core}/tests/source/issue_3839.rs | 0 .../rustfmt-core}/tests/source/issue_3844.rs | 0 .../rustfmt-core}/tests/source/issue_3853.rs | 0 .../rustfmt-core}/tests/source/issue_3868.rs | 0 .../tests/source/item-brace-style-always-next-line.rs | 0 .../tests/source/item-brace-style-prefer-same-line.rs | 0 .../tests/source/item-brace-style-same-line-where.rs | 0 .../rustfmt-core}/tests/source/itemized-blocks/no_wrap.rs | 0 .../tests/source/itemized-blocks/rewrite_fail.rs | 0 .../rustfmt-core}/tests/source/itemized-blocks/urls.rs | 0 .../rustfmt-core}/tests/source/itemized-blocks/wrap.rs | 0 .../rustfmt-core}/tests/source/label_break.rs | 0 .../rustfmt-core}/tests/source/large-block.rs | 0 .../rustfmt-core}/tests/source/large_vec.rs | 0 .../rustfmt-core}/tests/source/lazy_static.rs | 0 .../tests/source/license-templates/empty_license_path.rs | 0 .../tests/source/license-templates/license.rs | 0 .../rustfmt-core}/tests/source/long-fn-1/version_two.rs | 0 .../tests/source/long-match-arms-brace-newline.rs | 0 .../tests/source/long-use-statement-issue-3154.rs | 0 .../rustfmt-core}/tests/source/long_field_access.rs | 0 .../rustfmt-core}/tests/source/loop.rs | 0 .../rustfmt-core}/tests/source/macro_not_expr.rs | 0 .../rustfmt-core}/tests/source/macro_rules.rs | 0 .../rustfmt-core}/tests/source/macros.rs | 0 .../tests/source/markdown-comment-with-options.rs | 0 .../rustfmt-core}/tests/source/markdown-comment.rs | 0 .../tests/source/match-block-trailing-comma.rs | 0 .../rustfmt-core}/tests/source/match-flattening.rs | 0 .../tests/source/match-nowrap-trailing-comma.rs | 0 .../rustfmt-core}/tests/source/match-nowrap.rs | 0 .../rustfmt-core}/tests/source/match.rs | 0 .../rustfmt-core}/tests/source/match_overflow_expr.rs | 0 .../rustfmt-core}/tests/source/max-line-length-in-chars.rs | 0 .../rustfmt-core}/tests/source/merge_imports.rs | 0 .../rustfmt-core}/tests/source/mod-1.rs | 0 .../rustfmt-core}/tests/source/mod-2.rs | 0 .../rustfmt-core}/tests/source/mod_skip_child.rs | 0 .../rustfmt-core}/tests/source/multiple.rs | 0 .../rustfmt-core}/tests/source/nested-if-else.rs | 0 .../rustfmt-core}/tests/source/nested_skipped/mod.rs | 0 .../rustfmt-core}/tests/source/nestedmod/mod.rs | 0 .../rustfmt-core}/tests/source/nestedmod/mod2a.rs | 0 .../rustfmt-core}/tests/source/nestedmod/mod2b.rs | 0 .../rustfmt-core}/tests/source/nestedmod/mod2c.rs | 0 .../rustfmt-core}/tests/source/nestedmod/mymod1/mod3a.rs | 0 .../rustfmt-core}/tests/source/nestedmod/submod2/a.rs | 0 .../rustfmt-core}/tests/source/nestedmod/submod2/mod.rs | 0 .../rustfmt-core}/tests/source/no_arg_with_commnet.rs | 0 .../rustfmt-core}/tests/source/no_new_line_beginning.rs | 0 ..._doc_attributes_should_not_imply_format_doc_comments.rs | 0 .../tests/source/normalize_multiline_doc_attribute.rs | 0 .../rustfmt-core}/tests/source/one_line_if_v2.rs | 0 .../rustfmt-core}/tests/source/other.rs | 0 .../rustfmt-core}/tests/source/paren.rs | 0 .../rustfmt-core}/tests/source/path_clarity/foo.rs | 0 .../rustfmt-core}/tests/source/path_clarity/foo/bar.rs | 0 .../rustfmt-core}/tests/source/paths.rs | 0 .../tests/source/pattern-condense-wildcards.rs | 0 .../rustfmt-core}/tests/source/pattern.rs | 0 .../tests/source/preserves_carriage_return_for_unix.rs | 0 .../tests/source/preserves_carriage_return_for_windows.rs | 0 .../rustfmt-core}/tests/source/pub-restricted.rs | 0 .../rustfmt-core}/tests/source/remove_blank_lines.rs | 0 .../rustfmt-core}/tests/source/reorder-impl-items.rs | 0 .../rustfmt-core}/tests/source/single-line-if-else.rs | 0 .../rustfmt-core}/tests/source/single-line-macro/v2.rs | 0 .../rustfmt-core}/tests/source/soft-wrapping.rs | 0 .../rustfmt-core}/tests/source/space-not-before-newline.rs | 0 .../rustfmt-core}/tests/source/spaces-around-ranges.rs | 0 .../rustfmt-core}/tests/source/static.rs | 0 .../rustfmt-core}/tests/source/string-lit-2.rs | 0 .../rustfmt-core}/tests/source/string-lit.rs | 0 .../rustfmt-core}/tests/source/string_punctuation.rs | 0 .../rustfmt-core}/tests/source/struct-field-attributes.rs | 0 .../rustfmt-core}/tests/source/struct_lits.rs | 0 .../rustfmt-core}/tests/source/struct_lits_multiline.rs | 0 .../rustfmt-core}/tests/source/struct_lits_visual.rs | 0 .../tests/source/struct_lits_visual_multiline.rs | 0 .../rustfmt-core}/tests/source/struct_tuple_visual.rs | 0 .../rustfmt-core}/tests/source/structs.rs | 0 .../rustfmt-core}/tests/source/trailing-comma-never.rs | 0 .../rustfmt-core}/tests/source/trailing_commas.rs | 0 .../tests/source/trailing_comments/hard_tabs.rs | 0 .../tests/source/trailing_comments/soft_tabs.rs | 0 .../rustfmt-core}/tests/source/trait.rs | 0 .../rustfmt-core}/tests/source/trait_2015_edition.rs | 0 .../rustfmt-core}/tests/source/try-conversion.rs | 0 .../rustfmt-core}/tests/source/tuple.rs | 0 .../rustfmt-core}/tests/source/type-ascription.rs | 0 .../rustfmt-core}/tests/source/type.rs | 0 .../rustfmt-core}/tests/source/type_alias.rs | 0 .../rustfmt-core}/tests/source/unicode.rs | 0 .../rustfmt-core}/tests/source/unions.rs | 0 .../rustfmt-core}/tests/source/visibility.rs | 0 .../rustfmt-core}/tests/source/visual-fn-type.rs | 0 .../rustfmt-core}/tests/source/where-clause-rfc.rs | 0 .../rustfmt-core}/tests/source/where-clause.rs | 0 .../rustfmt-core}/tests/source/width-heuristics.rs | 0 .../wrap_comments_should_not_imply_format_doc_comments.rs | 0 .../tests/target/alignment_2633/block_style.rs | 0 .../tests/target/alignment_2633/horizontal_tactic.rs | 0 .../tests/target/alignment_2633/visual_style.rs | 0 .../rustfmt-core}/tests/target/array_comment.rs | 0 .../rustfmt-core}/tests/target/assignment.rs | 0 .../rustfmt-core}/tests/target/associated-items.rs | 0 .../tests/target/associated-types-bounds-wrapping.rs | 0 .../rustfmt-core}/tests/target/associated_type_bounds.rs | 0 .../rustfmt-core}/tests/target/associated_type_defaults.rs | 0 .../rustfmt-core}/tests/target/async_block.rs | 0 .../rustfmt-core}/tests/target/async_closure.rs | 0 .../rustfmt-core}/tests/target/async_fn.rs | 0 .../rustfmt-core}/tests/target/attrib-block-expr.rs | 0 .../rustfmt-core}/tests/target/attrib-extern-crate.rs | 0 .../rustfmt-core}/tests/target/attrib.rs | 0 .../rustfmt-core}/tests/target/big-impl-block.rs | 0 .../rustfmt-core}/tests/target/big-impl-visual.rs | 0 .../rustfmt-core}/tests/target/binary-expr.rs | 0 .../rustfmt-core}/tests/target/break-and-continue.rs | 0 .../rustfmt-core}/tests/target/catch.rs | 0 .../tests/target/cfg_if/detect/arch/aarch64.rs | 0 .../rustfmt-core}/tests/target/cfg_if/detect/arch/arm.rs | 0 .../rustfmt-core}/tests/target/cfg_if/detect/arch/mips.rs | 0 .../tests/target/cfg_if/detect/arch/mips64.rs | 0 .../tests/target/cfg_if/detect/arch/powerpc.rs | 0 .../tests/target/cfg_if/detect/arch/powerpc64.rs | 0 .../rustfmt-core}/tests/target/cfg_if/detect/arch/x86.rs | 0 .../rustfmt-core}/tests/target/cfg_if/detect/bit.rs | 0 .../rustfmt-core}/tests/target/cfg_if/detect/cache.rs | 0 .../tests/target/cfg_if/detect/error_macros.rs | 0 .../rustfmt-core}/tests/target/cfg_if/detect/mod.rs | 0 .../rustfmt-core}/tests/target/cfg_if/detect/os/aarch64.rs | 0 .../tests/target/cfg_if/detect/os/freebsd/aarch64.rs | 0 .../tests/target/cfg_if/detect/os/freebsd/arm.rs | 0 .../tests/target/cfg_if/detect/os/freebsd/auxvec.rs | 0 .../tests/target/cfg_if/detect/os/freebsd/mod.rs | 0 .../tests/target/cfg_if/detect/os/freebsd/powerpc.rs | 0 .../tests/target/cfg_if/detect/os/linux/aarch64.rs | 0 .../tests/target/cfg_if/detect/os/linux/arm.rs | 0 .../tests/target/cfg_if/detect/os/linux/auxvec.rs | 0 .../tests/target/cfg_if/detect/os/linux/cpuinfo.rs | 0 .../tests/target/cfg_if/detect/os/linux/mips.rs | 0 .../tests/target/cfg_if/detect/os/linux/mod.rs | 0 .../tests/target/cfg_if/detect/os/linux/powerpc.rs | 0 .../rustfmt-core}/tests/target/cfg_if/detect/os/other.rs | 0 .../rustfmt-core}/tests/target/cfg_if/detect/os/x86.rs | 0 .../rustfmt-core}/tests/target/cfg_if/lib.rs | 0 .../rustfmt-core}/tests/target/cfg_if/mod.rs | 0 .../rustfmt-core}/tests/target/cfg_mod/bar.rs | 0 .../tests/target/cfg_mod/dir/dir1/dir2/wasm32.rs | 0 .../tests/target/cfg_mod/dir/dir1/dir3/wasm32.rs | 0 .../rustfmt-core}/tests/target/cfg_mod/foo.rs | 0 .../rustfmt-core}/tests/target/cfg_mod/mod.rs | 0 .../rustfmt-core}/tests/target/cfg_mod/other.rs | 0 .../rustfmt-core}/tests/target/cfg_mod/wasm32.rs | 0 .../rustfmt-core}/tests/target/chains-visual.rs | 0 .../rustfmt-core}/tests/target/chains.rs | 0 .../rustfmt-core}/tests/target/chains_with_comment.rs | 0 .../tests/target/closure-block-inside-macro.rs | 0 .../rustfmt-core}/tests/target/closure_block_style.rs | 0 .../tests/target/closure_block_style_no_comma.rs | 0 .../rustfmt-core}/tests/target/closure_visual_style.rs | 0 .../rustfmt-core}/tests/target/comment-inside-const.rs | 0 .../rustfmt-core}/tests/target/comment-not-disappear.rs | 0 .../rustfmt-core}/tests/target/comment.rs | 0 .../rustfmt-core}/tests/target/comment2.rs | 0 .../rustfmt-core}/tests/target/comment3.rs | 0 .../rustfmt-core}/tests/target/comment4.rs | 0 .../rustfmt-core}/tests/target/comment5.rs | 0 .../rustfmt-core}/tests/target/comment6.rs | 0 .../rustfmt-core}/tests/target/comment_crlf_newline.rs | 0 .../rustfmt-core}/tests/target/comments-fn.rs | 0 .../tests/target/configs/blank_lines_lower_bound/1.rs | 0 .../target/configs/brace_style/fn_always_next_line.rs | 0 .../target/configs/brace_style/fn_prefer_same_line.rs | 0 .../tests/target/configs/brace_style/fn_same_line_where.rs | 0 .../target/configs/brace_style/item_always_next_line.rs | 0 .../target/configs/brace_style/item_prefer_same_line.rs | 0 .../target/configs/brace_style/item_same_line_where.rs | 0 .../tests/target/configs/combine_control_expr/false.rs | 0 .../tests/target/configs/combine_control_expr/true.rs | 0 .../tests/target/configs/comment_width/above.rs | 0 .../tests/target/configs/comment_width/below.rs | 0 .../tests/target/configs/comment_width/ignore.rs | 0 .../target/configs/condense_wildcard_suffixes/false.rs | 0 .../target/configs/condense_wildcard_suffixes/true.rs | 0 .../target/configs/control_brace_style/always_next_line.rs | 0 .../target/configs/control_brace_style/always_same_line.rs | 0 .../configs/control_brace_style/closing_next_line.rs | 0 .../tests/target/configs/disable_all_formatting/false.rs | 0 .../tests/target/configs/disable_all_formatting/true.rs | 0 .../tests/target/configs/empty_item_single_line/false.rs | 0 .../tests/target/configs/empty_item_single_line/true.rs | 0 .../target/configs/enum_discrim_align_threshold/40.rs | 0 .../tests/target/configs/error_on_line_overflow/false.rs | 0 .../tests/target/configs/error_on_unformatted/false.rs | 0 .../tests/target/configs/fn_args_layout/compressed.rs | 0 .../tests/target/configs/fn_args_layout/tall.rs | 0 .../tests/target/configs/fn_args_layout/vertical.rs | 0 .../tests/target/configs/fn_single_line/false.rs | 0 .../tests/target/configs/fn_single_line/true.rs | 0 .../tests/target/configs/force_explicit_abi/false.rs | 0 .../tests/target/configs/force_explicit_abi/true.rs | 0 .../tests/target/configs/force_multiline_block/false.rs | 0 .../tests/target/configs/force_multiline_block/true.rs | 0 .../tests/target/configs/format_macro_bodies/false.rs | 0 .../tests/target/configs/format_macro_bodies/true.rs | 0 .../tests/target/configs/format_macro_matchers/false.rs | 0 .../tests/target/configs/format_macro_matchers/true.rs | 0 .../tests/target/configs/format_strings/false.rs | 0 .../tests/target/configs/format_strings/true.rs | 0 .../rustfmt-core}/tests/target/configs/hard_tabs/false.rs | 0 .../rustfmt-core}/tests/target/configs/hard_tabs/true.rs | 0 .../tests/target/configs/imports_indent/block.rs | 0 .../target/configs/imports_layout/horizontal_vertical.rs | 0 .../tests/target/configs/imports_layout/merge_mixed.rs | 0 .../tests/target/configs/imports_layout/mixed.rs | 0 .../tests/target/configs/indent_style/block_args.rs | 0 .../tests/target/configs/indent_style/block_array.rs | 0 .../tests/target/configs/indent_style/block_call.rs | 0 .../tests/target/configs/indent_style/block_chain.rs | 0 .../tests/target/configs/indent_style/block_generic.rs | 0 .../tests/target/configs/indent_style/block_struct_lit.rs | 0 .../target/configs/indent_style/block_tab_spaces_call.rs | 0 .../configs/indent_style/block_trailing_comma_call/two.rs | 0 .../tests/target/configs/indent_style/block_where_pred.rs | 0 .../tests/target/configs/indent_style/default.rs | 0 .../tests/target/configs/indent_style/rfc_control.rs | 0 .../tests/target/configs/indent_style/rfc_where.rs | 0 .../tests/target/configs/indent_style/visual_args.rs | 0 .../tests/target/configs/indent_style/visual_array.rs | 0 .../tests/target/configs/indent_style/visual_call.rs | 0 .../tests/target/configs/indent_style/visual_chain.rs | 0 .../tests/target/configs/indent_style/visual_generics.rs | 0 .../tests/target/configs/indent_style/visual_struct_lit.rs | 0 .../target/configs/indent_style/visual_trailing_comma.rs | 0 .../tests/target/configs/indent_style/visual_where_pred.rs | 0 .../tests/target/configs/match_arm_blocks/false.rs | 0 .../tests/target/configs/match_arm_blocks/true.rs | 0 .../target/configs/match_block_trailing_comma/false.rs | 0 .../target/configs/match_block_trailing_comma/true.rs | 0 .../tests/target/configs/merge_derives/true.rs | 0 .../tests/target/configs/normalize_comments/false.rs | 0 .../tests/target/configs/normalize_comments/true.rs | 0 .../tests/target/configs/normalize_doc_attributes/false.rs | 0 .../tests/target/configs/normalize_doc_attributes/true.rs | 0 .../tests/target/configs/recursive/disabled/foo.rs | 0 .../tests/target/configs/recursive/disabled/lib.rs | 0 .../tests/target/configs/recursive/enabled/foo.rs | 0 .../tests/target/configs/recursive/enabled/lib.rs | 0 .../configs/remove_nested_parens/remove_nested_parens.rs | 0 .../tests/target/configs/reorder_impl_items/false.rs | 0 .../tests/target/configs/reorder_impl_items/true.rs | 0 .../tests/target/configs/reorder_imports/false.rs | 0 .../tests/target/configs/reorder_imports/true.rs | 0 .../tests/target/configs/reorder_modules/dolor/mod.rs | 0 .../tests/target/configs/reorder_modules/false.rs | 0 .../tests/target/configs/reorder_modules/ipsum/mod.rs | 0 .../tests/target/configs/reorder_modules/lorem/mod.rs | 0 .../tests/target/configs/reorder_modules/sit/mod.rs | 0 .../tests/target/configs/reorder_modules/true.rs | 0 .../tests/target/configs/skip_children/foo/mod.rs | 0 .../tests/target/configs/skip_children/true.rs | 0 .../tests/target/configs/space_before_colon/true.rs | 0 .../tests/target/configs/spaces_around_ranges/false.rs | 0 .../tests/target/configs/spaces_around_ranges/true.rs | 0 .../target/configs/struct_field_align_threshold/20.rs | 0 .../tests/target/configs/struct_lit_single_line/false.rs | 0 .../rustfmt-core}/tests/target/configs/tab_spaces/2.rs | 0 .../rustfmt-core}/tests/target/configs/tab_spaces/4.rs | 0 .../tests/target/configs/trailing_comma/always.rs | 0 .../tests/target/configs/trailing_comma/never.rs | 0 .../tests/target/configs/trailing_comma/vertical.rs | 0 .../tests/target/configs/trailing_semicolon/false.rs | 0 .../tests/target/configs/trailing_semicolon/true.rs | 0 .../target/configs/type_punctuation_density/compressed.rs | 0 .../tests/target/configs/type_punctuation_density/wide.rs | 0 .../tests/target/configs/use_field_init_shorthand/false.rs | 0 .../tests/target/configs/use_field_init_shorthand/true.rs | 0 .../tests/target/configs/use_small_heuristics/max.rs | 0 .../tests/target/configs/use_try_shorthand/false.rs | 0 .../tests/target/configs/use_try_shorthand/true.rs | 0 .../target/configs/use_try_shorthand/true_2015_edition.rs | 0 .../tests/target/configs/where_single_line/true.rs | 0 .../tests/target/configs/wrap_comments/false.rs | 0 .../tests/target/configs/wrap_comments/true.rs | 0 .../rustfmt-core}/tests/target/const_generics.rs | 0 .../tests/target/control-brace-style-always-next-line.rs | 0 .../tests/target/control-brace-style-always-same-line.rs | 0 .../rustfmt-core}/tests/target/doc-attrib.rs | 0 .../rustfmt-core}/tests/target/doc-comment-with-example.rs | 0 .../rustfmt-core}/tests/target/doc.rs | 0 .../rustfmt-core}/tests/target/dyn_trait.rs | 0 .../tests/target/else-if-brace-style-always-next-line.rs | 0 .../tests/target/else-if-brace-style-always-same-line.rs | 0 .../tests/target/else-if-brace-style-closing-next-line.rs | 0 .../target/empty-tuple-no-conversion-to-unit-struct.rs | 0 .../rustfmt-core}/tests/target/empty_file.rs | 0 .../rustfmt-core}/tests/target/enum.rs | 0 .../rustfmt-core}/tests/target/existential_type.rs | 0 .../rustfmt-core}/tests/target/expr-block.rs | 0 .../rustfmt-core}/tests/target/expr-overflow-delimited.rs | 0 .../rustfmt-core}/tests/target/expr.rs | 0 .../rustfmt-core}/tests/target/extern.rs | 0 .../rustfmt-core}/tests/target/extern_not_explicit.rs | 0 .../rustfmt-core}/tests/target/file-lines-1.rs | 0 .../rustfmt-core}/tests/target/file-lines-2.rs | 0 .../rustfmt-core}/tests/target/file-lines-3.rs | 0 .../rustfmt-core}/tests/target/file-lines-4.rs | 0 .../rustfmt-core}/tests/target/file-lines-5.rs | 0 .../rustfmt-core}/tests/target/file-lines-6.rs | 0 .../rustfmt-core}/tests/target/file-lines-7.rs | 0 .../rustfmt-core}/tests/target/file-lines-8.rs | 0 .../rustfmt-core}/tests/target/file-lines-item.rs | 0 .../tests/target/fn-args-with-last-line-comment.rs | 0 .../rustfmt-core}/tests/target/fn-custom-2.rs | 0 .../rustfmt-core}/tests/target/fn-custom-3.rs | 0 .../rustfmt-core}/tests/target/fn-custom-4.rs | 0 .../rustfmt-core}/tests/target/fn-custom-6.rs | 0 .../rustfmt-core}/tests/target/fn-custom-7.rs | 0 .../rustfmt-core}/tests/target/fn-custom-8.rs | 0 .../rustfmt-core}/tests/target/fn-custom.rs | 0 .../rustfmt-core}/tests/target/fn-param-attributes.rs | 0 .../rustfmt-core}/tests/target/fn-simple.rs | 0 .../tests/target/fn-single-line/version_two.rs | 0 .../rustfmt-core}/tests/target/fn-ty.rs | 0 .../rustfmt-core}/tests/target/fn.rs | 0 .../rustfmt-core}/tests/target/fn_args_indent-block.rs | 0 .../rustfmt-core}/tests/target/fn_args_layout-vertical.rs | 0 .../rustfmt-core}/tests/target/fn_once.rs | 0 .../rustfmt-core}/tests/target/format_strings/issue-202.rs | 0 .../tests/target/format_strings/issue-2833.rs | 0 .../tests/target/format_strings/issue-3263.rs | 0 .../rustfmt-core}/tests/target/format_strings/issue-687.rs | 0 .../rustfmt-core}/tests/target/format_strings/issue564.rs | 0 .../rustfmt-core}/tests/target/hard-tabs.rs | 0 .../rustfmt-core}/tests/target/hello.rs | 0 .../rustfmt-core}/tests/target/if_while_or_patterns.rs | 0 .../rustfmt-core}/tests/target/immovable_generators.rs | 0 .../rustfmt-core}/tests/target/impl.rs | 0 .../rustfmt-core}/tests/target/impls.rs | 0 .../rustfmt-core}/tests/target/import-fencepost-length.rs | 0 .../rustfmt-core}/tests/target/imports-impl-only-use.rs | 0 .../tests/target/imports-reorder-lines-and-items.rs | 0 .../rustfmt-core}/tests/target/imports-reorder-lines.rs | 0 .../rustfmt-core}/tests/target/imports-reorder.rs | 0 .../rustfmt-core}/tests/target/imports.rs | 0 .../rustfmt-core}/tests/target/imports_2015_edition.rs | 0 .../rustfmt-core}/tests/target/imports_block_indent.rs | 0 .../rustfmt-core}/tests/target/imports_raw_identifiers.rs | 0 .../rustfmt-core}/tests/target/indented-impl.rs | 0 .../tests/target/invalid-rust-code-in-doc-comment.rs | 0 .../rustfmt-core}/tests/target/issue-1021.rs | 0 .../rustfmt-core}/tests/target/issue-1049.rs | 0 .../rustfmt-core}/tests/target/issue-1055.rs | 0 .../rustfmt-core}/tests/target/issue-1096.rs | 0 .../rustfmt-core}/tests/target/issue-1111.rs | 0 .../rustfmt-core}/tests/target/issue-1113.rs | 0 .../rustfmt-core}/tests/target/issue-1120.rs | 0 .../rustfmt-core}/tests/target/issue-1124.rs | 0 .../rustfmt-core}/tests/target/issue-1127.rs | 0 .../rustfmt-core}/tests/target/issue-1158.rs | 0 .../rustfmt-core}/tests/target/issue-1177.rs | 0 .../rustfmt-core}/tests/target/issue-1192.rs | 0 .../rustfmt-core}/tests/target/issue-1210/a.rs | 0 .../rustfmt-core}/tests/target/issue-1210/b.rs | 0 .../rustfmt-core}/tests/target/issue-1210/c.rs | 0 .../rustfmt-core}/tests/target/issue-1210/d.rs | 0 .../rustfmt-core}/tests/target/issue-1210/e.rs | 0 .../rustfmt-core}/tests/target/issue-1211.rs | 0 .../rustfmt-core}/tests/target/issue-1214.rs | 0 .../rustfmt-core}/tests/target/issue-1216.rs | 0 .../rustfmt-core}/tests/target/issue-1239.rs | 0 .../rustfmt-core}/tests/target/issue-1247.rs | 0 .../rustfmt-core}/tests/target/issue-1255.rs | 0 .../rustfmt-core}/tests/target/issue-1278.rs | 0 .../rustfmt-core}/tests/target/issue-1350.rs | 0 .../rustfmt-core}/tests/target/issue-1366.rs | 0 .../rustfmt-core}/tests/target/issue-1397.rs | 0 .../rustfmt-core}/tests/target/issue-1468.rs | 0 .../rustfmt-core}/tests/target/issue-1598.rs | 0 .../rustfmt-core}/tests/target/issue-1624.rs | 0 .../rustfmt-core}/tests/target/issue-1681.rs | 0 .../rustfmt-core}/tests/target/issue-1693.rs | 0 .../rustfmt-core}/tests/target/issue-1703.rs | 0 .../rustfmt-core}/tests/target/issue-1800.rs | 0 .../rustfmt-core}/tests/target/issue-1802.rs | 0 .../rustfmt-core}/tests/target/issue-1824.rs | 0 .../rustfmt-core}/tests/target/issue-1914.rs | 0 .../rustfmt-core}/tests/target/issue-2025.rs | 0 .../rustfmt-core}/tests/target/issue-2103.rs | 0 .../rustfmt-core}/tests/target/issue-2111.rs | 0 .../rustfmt-core}/tests/target/issue-2123.rs | 0 .../rustfmt-core}/tests/target/issue-2164.rs | 0 .../rustfmt-core}/tests/target/issue-2179/two.rs | 0 .../rustfmt-core}/tests/target/issue-2197.rs | 0 .../rustfmt-core}/tests/target/issue-2256.rs | 0 .../rustfmt-core}/tests/target/issue-2324.rs | 0 .../rustfmt-core}/tests/target/issue-2329.rs | 0 .../rustfmt-core}/tests/target/issue-2342.rs | 0 .../rustfmt-core}/tests/target/issue-2346.rs | 0 .../rustfmt-core}/tests/target/issue-2401.rs | 0 .../rustfmt-core}/tests/target/issue-2445.rs | 0 .../rustfmt-core}/tests/target/issue-2446.rs | 0 .../rustfmt-core}/tests/target/issue-2479.rs | 0 .../rustfmt-core}/tests/target/issue-2482/a.rs | 0 .../rustfmt-core}/tests/target/issue-2482/b.rs | 0 .../rustfmt-core}/tests/target/issue-2482/c.rs | 0 .../rustfmt-core}/tests/target/issue-2496.rs | 0 .../rustfmt-core}/tests/target/issue-2520.rs | 0 .../rustfmt-core}/tests/target/issue-2523.rs | 0 .../rustfmt-core}/tests/target/issue-2526.rs | 0 .../rustfmt-core}/tests/target/issue-2551.rs | 0 .../rustfmt-core}/tests/target/issue-2554.rs | 0 .../rustfmt-core}/tests/target/issue-2582.rs | 0 .../rustfmt-core}/tests/target/issue-2641.rs | 0 .../rustfmt-core}/tests/target/issue-2644.rs | 0 .../tests/target/issue-2673-nonmodrs-mods/foo.rs | 0 .../tests/target/issue-2673-nonmodrs-mods/foo/bar.rs | 0 .../tests/target/issue-2673-nonmodrs-mods/lib.rs | 0 .../rustfmt-core}/tests/target/issue-2728.rs | 0 .../rustfmt-core}/tests/target/issue-2759.rs | 0 .../rustfmt-core}/tests/target/issue-2761.rs | 0 .../rustfmt-core}/tests/target/issue-2794.rs | 0 .../rustfmt-core}/tests/target/issue-2810.rs | 0 .../rustfmt-core}/tests/target/issue-2835.rs | 0 .../rustfmt-core}/tests/target/issue-2863.rs | 0 .../rustfmt-core}/tests/target/issue-2869.rs | 0 .../rustfmt-core}/tests/target/issue-2896.rs | 0 .../rustfmt-core}/tests/target/issue-2916.rs | 0 .../rustfmt-core}/tests/target/issue-2917/minimal.rs | 0 .../rustfmt-core}/tests/target/issue-2917/packed_simd.rs | 0 .../rustfmt-core}/tests/target/issue-2922.rs | 0 .../rustfmt-core}/tests/target/issue-2927-2.rs | 0 .../rustfmt-core}/tests/target/issue-2927.rs | 0 .../rustfmt-core}/tests/target/issue-2930.rs | 0 .../rustfmt-core}/tests/target/issue-2936.rs | 0 .../rustfmt-core}/tests/target/issue-2941.rs | 0 .../rustfmt-core}/tests/target/issue-2955.rs | 0 .../rustfmt-core}/tests/target/issue-2973.rs | 0 .../rustfmt-core}/tests/target/issue-2976.rs | 0 .../rustfmt-core}/tests/target/issue-2977/block.rs | 0 .../rustfmt-core}/tests/target/issue-2977/impl.rs | 0 .../rustfmt-core}/tests/target/issue-2977/item.rs | 0 .../rustfmt-core}/tests/target/issue-2977/trait.rs | 0 .../rustfmt-core}/tests/target/issue-2985.rs | 0 .../rustfmt-core}/tests/target/issue-2995.rs | 0 .../rustfmt-core}/tests/target/issue-3029.rs | 0 .../rustfmt-core}/tests/target/issue-3032.rs | 0 .../rustfmt-core}/tests/target/issue-3038.rs | 0 .../rustfmt-core}/tests/target/issue-3043.rs | 0 .../rustfmt-core}/tests/target/issue-3049.rs | 0 .../rustfmt-core}/tests/target/issue-3055/backtick.rs | 0 .../tests/target/issue-3055/empty-code-block.rs | 0 .../rustfmt-core}/tests/target/issue-3055/original.rs | 0 .../rustfmt-core}/tests/target/issue-3059.rs | 0 .../rustfmt-core}/tests/target/issue-3066.rs | 0 .../rustfmt-core}/tests/target/issue-3105.rs | 0 .../rustfmt-core}/tests/target/issue-3118.rs | 0 .../rustfmt-core}/tests/target/issue-3124.rs | 0 .../rustfmt-core}/tests/target/issue-3131.rs | 0 .../rustfmt-core}/tests/target/issue-3132.rs | 0 .../rustfmt-core}/tests/target/issue-3153.rs | 0 .../rustfmt-core}/tests/target/issue-3170.rs | 0 .../rustfmt-core}/tests/target/issue-3182.rs | 0 .../rustfmt-core}/tests/target/issue-3184.rs | 0 .../rustfmt-core}/tests/target/issue-3194.rs | 0 .../rustfmt-core}/tests/target/issue-3198.rs | 0 .../rustfmt-core}/tests/target/issue-3213/version_two.rs | 0 .../rustfmt-core}/tests/target/issue-3217.rs | 0 .../rustfmt-core}/tests/target/issue-3224.rs | 0 .../rustfmt-core}/tests/target/issue-3227/two.rs | 0 .../rustfmt-core}/tests/target/issue-3234.rs | 0 .../rustfmt-core}/tests/target/issue-3241.rs | 0 .../rustfmt-core}/tests/target/issue-3253/bar.rs | 0 .../rustfmt-core}/tests/target/issue-3253/foo.rs | 0 .../rustfmt-core}/tests/target/issue-3253/lib.rs | 0 .../rustfmt-core}/tests/target/issue-3253/paths/bar_foo.rs | 0 .../tests/target/issue-3253/paths/excluded.rs | 0 .../rustfmt-core}/tests/target/issue-3253/paths/foo_bar.rs | 0 .../rustfmt-core}/tests/target/issue-3265.rs | 0 .../rustfmt-core}/tests/target/issue-3270/two.rs | 0 .../rustfmt-core}/tests/target/issue-3270/wrap.rs | 0 .../rustfmt-core}/tests/target/issue-3272/v2.rs | 0 .../rustfmt-core}/tests/target/issue-3278/version_two.rs | 0 .../rustfmt-core}/tests/target/issue-3295/two.rs | 0 .../rustfmt-core}/tests/target/issue-3302.rs | 0 .../rustfmt-core}/tests/target/issue-3304.rs | 0 .../rustfmt-core}/tests/target/issue-3314.rs | 0 .../rustfmt-core}/tests/target/issue-3343.rs | 0 .../rustfmt-core}/tests/target/issue-3423.rs | 0 .../rustfmt-core}/tests/target/issue-3434/lib.rs | 0 .../rustfmt-core}/tests/target/issue-3434/no_entry.rs | 0 .../tests/target/issue-3434/not_skip_macro.rs | 0 .../rustfmt-core}/tests/target/issue-3442.rs | 0 .../rustfmt-core}/tests/target/issue-3465.rs | 0 .../rustfmt-core}/tests/target/issue-3494/crlf.rs | 0 .../rustfmt-core}/tests/target/issue-3494/lf.rs | 0 .../rustfmt-core}/tests/target/issue-3499.rs | 0 .../rustfmt-core}/tests/target/issue-3508.rs | 0 .../rustfmt-core}/tests/target/issue-3515.rs | 0 .../rustfmt-core}/tests/target/issue-3532.rs | 0 .../rustfmt-core}/tests/target/issue-3539.rs | 0 .../rustfmt-core}/tests/target/issue-3554.rs | 0 .../rustfmt-core}/tests/target/issue-3567.rs | 0 .../rustfmt-core}/tests/target/issue-3568.rs | 0 .../rustfmt-core}/tests/target/issue-3585/extern_crate.rs | 0 .../tests/target/issue-3585/reorder_imports_disabled.rs | 0 .../tests/target/issue-3585/reorder_imports_enabled.rs | 0 .../rustfmt-core}/tests/target/issue-3585/use.rs | 0 .../rustfmt-core}/tests/target/issue-3592.rs | 0 .../rustfmt-core}/tests/target/issue-3595.rs | 0 .../rustfmt-core}/tests/target/issue-3601.rs | 0 .../rustfmt-core}/tests/target/issue-3614/version_two.rs | 0 .../rustfmt-core}/tests/target/issue-3636.rs | 0 .../rustfmt-core}/tests/target/issue-3639.rs | 0 .../rustfmt-core}/tests/target/issue-3645.rs | 0 .../rustfmt-core}/tests/target/issue-3651.rs | 0 .../rustfmt-core}/tests/target/issue-3665/lib.rs | 0 .../tests/target/issue-3665/not_skip_attribute.rs | 0 .../rustfmt-core}/tests/target/issue-3665/sub_mod.rs | 0 .../rustfmt-core}/tests/target/issue-3672.rs | 0 .../rustfmt-core}/tests/target/issue-3675.rs | 0 .../rustfmt-core}/tests/target/issue-3701/two.rs | 0 .../rustfmt-core}/tests/target/issue-3709.rs | 0 .../rustfmt-core}/tests/target/issue-3711.rs | 0 .../rustfmt-core}/tests/target/issue-3717.rs | 0 .../rustfmt-core}/tests/target/issue-3718.rs | 0 .../rustfmt-core}/tests/target/issue-3740.rs | 0 .../rustfmt-core}/tests/target/issue-3741.rs | 0 .../rustfmt-core}/tests/target/issue-3750.rs | 0 .../rustfmt-core}/tests/target/issue-3751.rs | 0 .../rustfmt-core}/tests/target/issue-3759.rs | 0 .../rustfmt-core}/tests/target/issue-3779/ice.rs | 0 .../rustfmt-core}/tests/target/issue-3779/lib.rs | 0 .../rustfmt-core}/tests/target/issue-3786.rs | 0 .../rustfmt-core}/tests/target/issue-3787.rs | 0 .../rustfmt-core}/tests/target/issue-3815.rs | 0 .../tests/target/issue-3840/version-two_hard-tabs.rs | 0 .../tests/target/issue-3840/version-two_soft-tabs.rs | 0 .../rustfmt-core}/tests/target/issue-3845.rs | 0 .../rustfmt-core}/tests/target/issue-3851.rs | 0 .../rustfmt-core}/tests/target/issue-3882.rs | 0 .../rustfmt-core}/tests/target/issue-3904/two.rs | 0 .../rustfmt-core}/tests/target/issue-3908.rs | 0 .../rustfmt-core}/tests/target/issue-3923.rs | 0 .../rustfmt-core}/tests/target/issue-3929.rs | 0 .../rustfmt-core}/tests/target/issue-3933/imp-a.rs | 0 .../rustfmt-core}/tests/target/issue-3933/imp-b.rs | 0 .../rustfmt-core}/tests/target/issue-3933/lib.rs | 0 .../rustfmt-core}/tests/target/issue-3933/utils.rs | 0 .../rustfmt-core}/tests/target/issue-3934.rs | 0 .../rustfmt-core}/tests/target/issue-3956/graphics.rs | 0 .../rustfmt-core}/tests/target/issue-3956/graphics_emu.rs | 0 .../rustfmt-core}/tests/target/issue-3956/lib.rs | 0 .../rustfmt-core}/tests/target/issue-3974.rs | 0 .../rustfmt-core}/tests/target/issue-3992.rs | 0 .../rustfmt-core}/tests/target/issue-447.rs | 0 .../rustfmt-core}/tests/target/issue-510.rs | 0 .../rustfmt-core}/tests/target/issue-539.rs | 0 .../rustfmt-core}/tests/target/issue-64.rs | 0 .../rustfmt-core}/tests/target/issue-683.rs | 0 .../rustfmt-core}/tests/target/issue-691.rs | 0 .../rustfmt-core}/tests/target/issue-770.rs | 0 .../rustfmt-core}/tests/target/issue-811.rs | 0 .../rustfmt-core}/tests/target/issue-831.rs | 0 .../rustfmt-core}/tests/target/issue-850.rs | 0 .../rustfmt-core}/tests/target/issue-855.rs | 0 .../rustfmt-core}/tests/target/issue-913.rs | 0 .../rustfmt-core}/tests/target/issue-945.rs | 0 .../rustfmt-core}/tests/target/issue-977.rs | 0 .../rustfmt-core}/tests/target/issue_3839.rs | 0 .../rustfmt-core}/tests/target/issue_3844.rs | 0 .../rustfmt-core}/tests/target/issue_3853.rs | 0 .../rustfmt-core}/tests/target/issue_3854.rs | 0 .../rustfmt-core}/tests/target/issue_3868.rs | 0 .../tests/target/item-brace-style-always-next-line.rs | 0 .../tests/target/item-brace-style-prefer-same-line.rs | 0 .../tests/target/item-brace-style-same-line-where.rs | 0 .../rustfmt-core}/tests/target/itemized-blocks/no_wrap.rs | 0 .../tests/target/itemized-blocks/rewrite_fail.rs | 0 .../rustfmt-core}/tests/target/itemized-blocks/urls.rs | 0 .../rustfmt-core}/tests/target/itemized-blocks/wrap.rs | 0 .../rustfmt-core}/tests/target/label_break.rs | 0 .../rustfmt-core}/tests/target/large-block.rs | 0 .../rustfmt-core}/tests/target/large_vec.rs | 0 .../rustfmt-core}/tests/target/lazy_static.rs | 0 .../tests/target/license-templates/empty_license_path.rs | 0 .../tests/target/license-templates/license.rs | 0 .../rustfmt-core}/tests/target/long-fn-1/version_two.rs | 0 .../tests/target/long-match-arms-brace-newline.rs | 0 .../tests/target/long-use-statement-issue-3154.rs | 0 .../rustfmt-core}/tests/target/long_field_access.rs | 0 .../rustfmt-core}/tests/target/loop.rs | 0 .../rustfmt-core}/tests/target/macro_not_expr.rs | 0 .../rustfmt-core}/tests/target/macro_rules.rs | 0 .../rustfmt-core}/tests/target/macros.rs | 0 .../tests/target/markdown-comment-with-options.rs | 0 .../rustfmt-core}/tests/target/markdown-comment.rs | 0 .../tests/target/match-block-trailing-comma.rs | 0 .../rustfmt-core}/tests/target/match-flattening.rs | 0 .../tests/target/match-nowrap-trailing-comma.rs | 0 .../rustfmt-core}/tests/target/match-nowrap.rs | 0 .../rustfmt-core}/tests/target/match.rs | 0 .../rustfmt-core}/tests/target/match_overflow_expr.rs | 0 .../rustfmt-core}/tests/target/max-line-length-in-chars.rs | 0 .../rustfmt-core}/tests/target/merge_imports.rs | 0 .../rustfmt-core}/tests/target/mod-1.rs | 0 .../rustfmt-core}/tests/target/mod-2.rs | 0 .../rustfmt-core}/tests/target/mod_skip_child.rs | 0 .../rustfmt-core}/tests/target/multi-file.rs | 0 .../tests/target/multiline_string_in_macro_def.rs | 0 .../rustfmt-core}/tests/target/multiple.rs | 0 .../rustfmt-core}/tests/target/nested-if-else.rs | 0 .../rustfmt-core}/tests/target/nested-visual-block.rs | 0 .../rustfmt-core}/tests/target/nested_skipped/mod.rs | 0 .../rustfmt-core}/tests/target/nestedmod/mod.rs | 0 .../rustfmt-core}/tests/target/nestedmod/mod2a.rs | 0 .../rustfmt-core}/tests/target/nestedmod/mod2b.rs | 0 .../rustfmt-core}/tests/target/nestedmod/mod2c.rs | 0 .../rustfmt-core}/tests/target/nestedmod/mymod1/mod3a.rs | 0 .../rustfmt-core}/tests/target/nestedmod/submod2/a.rs | 0 .../rustfmt-core}/tests/target/nestedmod/submod2/mod.rs | 0 .../rustfmt-core}/tests/target/no_arg_with_commnet.rs | 0 .../rustfmt-core}/tests/target/no_new_line_beginning.rs | 0 ..._doc_attributes_should_not_imply_format_doc_comments.rs | 0 .../tests/target/normalize_multiline_doc_attribute.rs | 0 .../rustfmt-core}/tests/target/obsolete_in_place.rs | 0 .../rustfmt-core}/tests/target/one_line_if_v2.rs | 0 .../rustfmt-core}/tests/target/other.rs | 0 .../rustfmt-core}/tests/target/paren.rs | 0 .../rustfmt-core}/tests/target/path_clarity/foo.rs | 0 .../rustfmt-core}/tests/target/path_clarity/foo/bar.rs | 0 .../rustfmt-core}/tests/target/paths.rs | 0 .../tests/target/pattern-condense-wildcards.rs | 0 .../rustfmt-core}/tests/target/pattern.rs | 0 .../tests/target/preserves_carriage_return_for_unix.rs | 0 .../tests/target/preserves_carriage_return_for_windows.rs | 0 .../rustfmt-core}/tests/target/pub-restricted.rs | 0 .../rustfmt-core}/tests/target/raw_identifiers.rs | 0 .../rustfmt-core}/tests/target/remove_blank_lines.rs | 0 .../rustfmt-core}/tests/target/reorder-impl-items.rs | 0 ...uld_not_format_string_when_format_strings_is_not_set.rs | 0 .../rustfmt-core}/tests/target/single-line-if-else.rs | 0 .../rustfmt-core}/tests/target/single-line-macro/v2.rs | 0 .../rustfmt-core}/tests/target/skip.rs | 0 .../rustfmt-core}/tests/target/skip_mod.rs | 0 .../rustfmt-core}/tests/target/soft-wrapping.rs | 0 .../rustfmt-core}/tests/target/space-not-before-newline.rs | 0 .../rustfmt-core}/tests/target/spaces-around-ranges.rs | 0 .../rustfmt-core}/tests/target/static.rs | 0 .../rustfmt-core}/tests/target/string-lit-2.rs | 0 .../rustfmt-core}/tests/target/string-lit-custom.rs | 0 .../rustfmt-core}/tests/target/string-lit.rs | 0 .../rustfmt-core}/tests/target/string_punctuation.rs | 0 .../rustfmt-core}/tests/target/struct-field-attributes.rs | 0 .../rustfmt-core}/tests/target/struct_lits.rs | 0 .../rustfmt-core}/tests/target/struct_lits_multiline.rs | 0 .../rustfmt-core}/tests/target/struct_lits_visual.rs | 0 .../tests/target/struct_lits_visual_multiline.rs | 0 .../rustfmt-core}/tests/target/struct_tuple_visual.rs | 0 .../rustfmt-core}/tests/target/structs.rs | 0 .../rustfmt-core}/tests/target/trailing-comma-never.rs | 0 .../rustfmt-core}/tests/target/trailing_commas.rs | 0 .../tests/target/trailing_comments/hard_tabs.rs | 0 .../tests/target/trailing_comments/soft_tabs.rs | 0 .../rustfmt-core}/tests/target/trait.rs | 0 .../rustfmt-core}/tests/target/trait_2015_edition.rs | 0 .../rustfmt-core}/tests/target/try-conversion.rs | 0 .../rustfmt-core}/tests/target/tuple.rs | 0 .../rustfmt-core}/tests/target/type-ascription.rs | 0 .../rustfmt-core}/tests/target/type.rs | 0 .../rustfmt-core}/tests/target/type_alias.rs | 0 .../rustfmt-core}/tests/target/unicode.rs | 0 .../tests/target/unindent_if_else_cond_comment.rs | 0 .../rustfmt-core}/tests/target/unions.rs | 0 .../rustfmt-core}/tests/target/visibility.rs | 0 .../rustfmt-core}/tests/target/visual-fn-type.rs | 0 .../rustfmt-core}/tests/target/where-clause-rfc.rs | 0 .../rustfmt-core}/tests/target/where-clause.rs | 0 .../rustfmt-core}/tests/target/width-heuristics.rs | 0 .../wrap_comments_should_not_imply_format_doc_comments.rs | 0 .../rustfmt-core}/tests/writemode/source/fn-single-line.rs | 0 .../rustfmt-core}/tests/writemode/source/json.rs | 0 .../rustfmt-core}/tests/writemode/source/modified.rs | 0 .../rustfmt-core}/tests/writemode/source/stdin.rs | 0 .../rustfmt-core}/tests/writemode/target/checkstyle.xml | 0 .../rustfmt-core}/tests/writemode/target/modified.txt | 0 .../rustfmt-core}/tests/writemode/target/output.json | 0 .../rustfmt-core}/tests/writemode/target/stdin.json | 0 .../rustfmt-core}/tests/writemode/target/stdin.xml | 0 .../rustfmt-emitter}/.gitignore | 0 .../rustfmt-emitter}/Cargo.toml | 0 .../rustfmt-emitter}/src/checkstyle.rs | 0 .../rustfmt-emitter}/src/checkstyle/xml.rs | 0 .../rustfmt-emitter}/src/diff.rs | 0 .../rustfmt-emitter}/src/files.rs | 0 .../rustfmt-emitter}/src/json.rs | 0 .../rustfmt-emitter}/src/lib.rs | 0 .../rustfmt-emitter}/src/modified_lines.rs | 0 .../rustfmt-emitter}/src/rustfmt_diff.rs | 0 .../rustfmt-emitter}/src/stdout.rs | 0 1142 files changed, 25 insertions(+), 12 deletions(-) create mode 100644 rustfmt-lib/.gitignore create mode 100644 rustfmt-lib/Cargo.toml rename {rustfmt-config => rustfmt-lib/rustfmt-config}/.gitignore (100%) rename {rustfmt-config => rustfmt-lib/rustfmt-config}/Cargo.toml (100%) rename {rustfmt-config => rustfmt-lib/rustfmt-config}/config_proc_macro/.gitignore (100%) rename {rustfmt-config => rustfmt-lib/rustfmt-config}/config_proc_macro/Cargo.toml (100%) rename {rustfmt-config => rustfmt-lib/rustfmt-config}/config_proc_macro/src/attrs.rs (100%) rename {rustfmt-config => rustfmt-lib/rustfmt-config}/config_proc_macro/src/config_type.rs (100%) rename {rustfmt-config => rustfmt-lib/rustfmt-config}/config_proc_macro/src/item_enum.rs (100%) rename {rustfmt-config => rustfmt-lib/rustfmt-config}/config_proc_macro/src/item_struct.rs (100%) rename {rustfmt-config => rustfmt-lib/rustfmt-config}/config_proc_macro/src/lib.rs (100%) rename {rustfmt-config => rustfmt-lib/rustfmt-config}/config_proc_macro/src/utils.rs (100%) rename {rustfmt-config => rustfmt-lib/rustfmt-config}/config_proc_macro/tests/smoke.rs (73%) rename {rustfmt-config => rustfmt-lib/rustfmt-config}/src/config_type.rs (99%) rename {rustfmt-config => rustfmt-lib/rustfmt-config}/src/file_lines.rs (100%) rename {rustfmt-config => rustfmt-lib/rustfmt-config}/src/lib.rs (99%) rename {rustfmt-config => rustfmt-lib/rustfmt-config}/src/license.rs (100%) rename {rustfmt-config => rustfmt-lib/rustfmt-config}/src/lists.rs (100%) rename {rustfmt-config => rustfmt-lib/rustfmt-config}/src/options.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-config}/tests/license-template/lt.txt (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/.gitignore (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/Cargo.toml (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/attr.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/attr/doc_comment.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/chains.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/closures.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/comment.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/coverage.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/expr.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/format_report_formatter.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/formatting.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/formatting/newline_style.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/ignore_path.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/imports.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/issues.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/items.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/lib.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/lists.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/macros.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/matches.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/missed_spans.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/modules.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/modules/visitor.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/overflow.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/pairs.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/patterns.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/release_channel.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/reorder.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/rewrite.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/shape.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/skip.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/source_file.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/source_map.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/spanned.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/stmt.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/string.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/syntux.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/syntux/parser.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/syntux/session.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/test/configuration_snippet.rs (98%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/test/mod.rs (99%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/types.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/utils.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/vertical.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/src/visitor.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/config/issue-1111.toml (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/config/issue-2641.toml (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/config/issue-3779.toml (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/config/issue-3802.toml (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/config/issue-3933.toml (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/config/issue-3956.toml (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/config/skip_children.toml (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/config/small_tabs.toml (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/coverage/source/comments.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/coverage/target/comments.rs (100%) create mode 100644 rustfmt-lib/rustfmt-core/tests/license-template/lt.txt rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/alignment_2633/block_style.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/alignment_2633/visual_style.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/array_comment.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/assignment.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/associated-types-bounds-wrapping.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/associated_type_bounds.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/async_block.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/async_fn.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/attrib.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/big-impl-block.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/big-impl-visual.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/binary-expr.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/break-and-continue.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/catch.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/detect/arch/aarch64.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/detect/arch/arm.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/detect/arch/mips.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/detect/arch/mips64.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/detect/arch/powerpc.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/detect/arch/powerpc64.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/detect/arch/x86.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/detect/bit.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/detect/cache.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/detect/error_macros.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/detect/mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/detect/os/aarch64.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/detect/os/freebsd/aarch64.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/detect/os/freebsd/arm.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/detect/os/freebsd/auxvec.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/detect/os/freebsd/mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/detect/os/freebsd/powerpc.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/detect/os/linux/aarch64.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/detect/os/linux/arm.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/detect/os/linux/auxvec.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/detect/os/linux/cpuinfo.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/detect/os/linux/mips.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/detect/os/linux/mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/detect/os/linux/powerpc.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/detect/os/other.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/detect/os/x86.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/lib.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_if/mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_mod/bar.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_mod/dir/dir1/dir2/wasm32.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_mod/dir/dir1/dir3/wasm32.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_mod/foo.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_mod/mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_mod/other.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/cfg_mod/wasm32.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/chains-visual.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/chains.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/chains_with_comment.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/closure-block-inside-macro.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/closure_block_style.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/closure_block_style_no_comma.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/closure_visual_style.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/comment.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/comment2.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/comment3.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/comment4.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/comment5.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/comment6.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/comment_crlf_newline.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/blank_lines_lower_bound/1.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/brace_style/fn_always_next_line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/brace_style/fn_prefer_same_line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/brace_style/fn_same_line_where.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/brace_style/item_always_next_line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/brace_style/item_prefer_same_line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/brace_style/item_same_line_where.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/comment_width/above.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/comment_width/below.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/comment_width/ignore.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/condense_wildcard_suffixes/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/condense_wildcard_suffixes/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/control_brace_style/always_next_line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/control_brace_style/always_same_line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/control_brace_style/closing_next_line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/disable_all_formatting/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/disable_all_formatting/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/empty_item_single_line/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/empty_item_single_line/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/enum_discrim_align_threshold/40.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/error_on_line_overflow/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/fn_args_layout/compressed.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/fn_args_layout/tall.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/fn_args_layout/vertical.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/fn_single_line/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/fn_single_line/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/force_explicit_abi/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/force_explicit_abi/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/force_multiline_block/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/force_multiline_block/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/format_macro_bodies/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/format_macro_bodies/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/format_macro_matchers/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/format_macro_matchers/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/format_strings/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/format_strings/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/hard_tabs/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/hard_tabs/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/imports_layout/merge_mixed.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/indent_style/block_args.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/indent_style/block_array.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/indent_style/block_call.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/indent_style/block_chain.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/indent_style/block_generic.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/indent_style/block_struct_lit.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/indent_style/block_trailing_comma_call/two.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/indent_style/block_where_pred.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/indent_style/default.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/indent_style/rfc_where.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/indent_style/visual_args.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/indent_style/visual_array.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/indent_style/visual_call.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/indent_style/visual_chain.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/indent_style/visual_generics.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/indent_style/visual_struct_lit.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/indent_style/visual_trailing_comma.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/indent_style/visual_where_pred.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/match_arm_blocks/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/match_arm_blocks/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/match_block_trailing_comma/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/match_block_trailing_comma/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/merge_derives/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/normalize_comments/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/normalize_comments/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/normalize_doc_attributes/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/normalize_doc_attributes/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/recursive/disabled/foo.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/recursive/disabled/lib.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/recursive/enabled/foo.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/recursive/enabled/lib.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/remove_nested_parens/remove_nested_parens.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/reorder_impl_items/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/reorder_impl_items/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/reorder_imports/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/reorder_imports/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/reorder_modules/dolor/mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/reorder_modules/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/reorder_modules/ipsum/mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/reorder_modules/lorem/mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/reorder_modules/sit/mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/reorder_modules/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/skip_children/foo/mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/skip_children/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/space_before_colon/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/spaces_around_ranges/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/spaces_around_ranges/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/struct_field_align_threshold/20.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/struct_lit_single_line/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/tab_spaces/2.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/tab_spaces/4.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/trailing_comma/always.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/trailing_comma/never.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/trailing_comma/vertical.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/type_punctuation_density/compressed.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/type_punctuation_density/wide.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/use_field_init_shorthand/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/use_field_init_shorthand/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/use_small_heuristics/max.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/use_try_shorthand/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/use_try_shorthand/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/use_try_shorthand/true_2015_edition.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/where_single_line/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/wrap_comments/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/configs/wrap_comments/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/const_generics.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/control-brace-style-always-next-line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/control-brace-style-always-same-line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/doc-attrib.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/doc-comment-with-example.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/doc.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/dyn_trait.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/else-if-brace-style-always-next-line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/else-if-brace-style-always-same-line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/else-if-brace-style-closing-next-line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/empty_file.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/enum.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/existential_type.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/expr-block.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/expr-overflow-delimited.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/expr.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/extern.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/extern_not_explicit.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/file-lines-1.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/file-lines-2.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/file-lines-3.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/file-lines-4.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/file-lines-5.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/file-lines-6.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/file-lines-7.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/file-lines-8.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/file-lines-item.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/fn-custom-2.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/fn-custom-3.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/fn-custom-4.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/fn-custom-6.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/fn-custom-7.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/fn-custom-8.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/fn-custom.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/fn-param-attributes.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/fn-simple.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/fn-single-line/version_two.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/fn_args_indent-block.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/fn_args_layout-vertical.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/hard-tabs.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/hello.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/hello2.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/if_while_or_patterns.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/immovable_generators.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/impls.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/imports-impl-only-use.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/imports-reorder-lines-and-items.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/imports-reorder-lines.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/imports-reorder.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/imports.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/imports_2015_edition.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/imports_block_indent.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/imports_raw_identifiers.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/invalid-rust-code-in-doc-comment.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-1021.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-1049.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-1111.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-1120.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-1124.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-1127.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-1158.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-1177.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-1192.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-1210/a.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-1210/b.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-1210/c.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-1210/d.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-1210/e.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-1211.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-1216.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-1239.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-1278.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-1350.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-1366.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-1468.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-1693.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-1800.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-1914.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2025.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2111.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2164.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2179/two.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2256.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2342.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2445.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2446.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2479.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2482/a.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2482/b.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2482/c.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2496.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2520.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2523.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2582.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2641.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2644.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2728.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2761.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2794.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2835.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2863.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2869.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2896.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2917/packed_simd.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2922.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2927-2.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2927.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2930.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2936.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2955.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2973.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2977/impl.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2977/trait.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2985.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-2995.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3029.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3038.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3049.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3055/original.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3059.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3066.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3131.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3153.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3170.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3194.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3198.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3213/version_two.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3217.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3227/two.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3234.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3241.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3253/bar.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3253/foo.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3253/lib.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3253/paths/bar_foo.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3253/paths/excluded.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3253/paths/foo_bar.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3265.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3270/two.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3272/v2.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3278/version_two.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3295/two.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3302.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3343.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3423.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3434/lib.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3434/no_entry.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3434/not_skip_macro.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3465.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3494/crlf.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3494/lf.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3508.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3515.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3532.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3585/extern_crate.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3585/reorder_imports_disabled.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3585/reorder_imports_enabled.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3585/use.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3636.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3639.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3651.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3665/lib.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3665/not_skip_attribute.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3665/sub_mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3672.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3675.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3701/two.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3709.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3740.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3750.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3751.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3779/ice.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3779/lib.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3786.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3787.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3840/version-two_hard-tabs.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3840/version-two_soft-tabs.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3851.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3904/two.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3908.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3923.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3929.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3933/imp-a.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3933/imp-b.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3933/lib.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-3933/utils.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-447.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-510.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-539.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-683.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-811.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-850.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-855.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-913.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-945.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue-977.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue_3839.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue_3844.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue_3853.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/issue_3868.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/item-brace-style-always-next-line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/item-brace-style-prefer-same-line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/item-brace-style-same-line-where.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/itemized-blocks/no_wrap.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/itemized-blocks/rewrite_fail.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/itemized-blocks/urls.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/itemized-blocks/wrap.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/label_break.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/large-block.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/large_vec.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/lazy_static.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/license-templates/empty_license_path.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/license-templates/license.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/long-fn-1/version_two.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/long-match-arms-brace-newline.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/long-use-statement-issue-3154.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/long_field_access.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/loop.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/macro_not_expr.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/macro_rules.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/macros.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/markdown-comment-with-options.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/markdown-comment.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/match-block-trailing-comma.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/match-flattening.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/match-nowrap-trailing-comma.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/match-nowrap.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/match.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/match_overflow_expr.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/max-line-length-in-chars.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/merge_imports.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/mod-1.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/mod-2.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/mod_skip_child.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/multiple.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/nested-if-else.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/nested_skipped/mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/nestedmod/mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/nestedmod/mod2a.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/nestedmod/mod2b.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/nestedmod/mod2c.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/nestedmod/mymod1/mod3a.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/nestedmod/submod2/a.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/nestedmod/submod2/mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/no_arg_with_commnet.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/no_new_line_beginning.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/normalize_doc_attributes_should_not_imply_format_doc_comments.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/normalize_multiline_doc_attribute.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/one_line_if_v2.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/other.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/paren.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/path_clarity/foo.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/path_clarity/foo/bar.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/paths.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/pattern-condense-wildcards.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/pattern.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/preserves_carriage_return_for_unix.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/preserves_carriage_return_for_windows.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/pub-restricted.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/remove_blank_lines.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/reorder-impl-items.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/single-line-if-else.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/single-line-macro/v2.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/soft-wrapping.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/space-not-before-newline.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/spaces-around-ranges.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/static.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/string-lit-2.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/string-lit.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/string_punctuation.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/struct-field-attributes.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/struct_lits.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/struct_lits_multiline.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/struct_lits_visual.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/struct_lits_visual_multiline.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/struct_tuple_visual.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/structs.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/trailing-comma-never.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/trailing_commas.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/trailing_comments/hard_tabs.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/trailing_comments/soft_tabs.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/trait.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/trait_2015_edition.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/try-conversion.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/tuple.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/type-ascription.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/type.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/type_alias.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/unicode.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/unions.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/visibility.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/visual-fn-type.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/where-clause-rfc.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/where-clause.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/width-heuristics.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/source/wrap_comments_should_not_imply_format_doc_comments.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/alignment_2633/block_style.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/alignment_2633/horizontal_tactic.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/alignment_2633/visual_style.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/array_comment.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/assignment.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/associated-items.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/associated-types-bounds-wrapping.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/associated_type_bounds.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/associated_type_defaults.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/async_block.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/async_closure.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/async_fn.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/attrib-block-expr.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/attrib-extern-crate.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/attrib.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/big-impl-block.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/big-impl-visual.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/binary-expr.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/break-and-continue.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/catch.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/detect/arch/aarch64.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/detect/arch/arm.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/detect/arch/mips.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/detect/arch/mips64.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/detect/arch/powerpc.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/detect/arch/powerpc64.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/detect/arch/x86.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/detect/bit.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/detect/cache.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/detect/error_macros.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/detect/mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/detect/os/aarch64.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/detect/os/freebsd/aarch64.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/detect/os/freebsd/arm.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/detect/os/freebsd/auxvec.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/detect/os/freebsd/mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/detect/os/freebsd/powerpc.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/detect/os/linux/aarch64.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/detect/os/linux/arm.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/detect/os/linux/auxvec.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/detect/os/linux/cpuinfo.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/detect/os/linux/mips.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/detect/os/linux/mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/detect/os/linux/powerpc.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/detect/os/other.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/detect/os/x86.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/lib.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_if/mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_mod/bar.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_mod/dir/dir1/dir2/wasm32.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_mod/dir/dir1/dir3/wasm32.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_mod/foo.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_mod/mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_mod/other.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/cfg_mod/wasm32.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/chains-visual.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/chains.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/chains_with_comment.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/closure-block-inside-macro.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/closure_block_style.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/closure_block_style_no_comma.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/closure_visual_style.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/comment-inside-const.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/comment-not-disappear.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/comment.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/comment2.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/comment3.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/comment4.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/comment5.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/comment6.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/comment_crlf_newline.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/comments-fn.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/blank_lines_lower_bound/1.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/brace_style/fn_always_next_line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/brace_style/fn_prefer_same_line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/brace_style/fn_same_line_where.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/brace_style/item_always_next_line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/brace_style/item_prefer_same_line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/brace_style/item_same_line_where.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/combine_control_expr/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/combine_control_expr/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/comment_width/above.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/comment_width/below.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/comment_width/ignore.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/condense_wildcard_suffixes/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/condense_wildcard_suffixes/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/control_brace_style/always_next_line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/control_brace_style/always_same_line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/control_brace_style/closing_next_line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/disable_all_formatting/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/disable_all_formatting/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/empty_item_single_line/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/empty_item_single_line/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/enum_discrim_align_threshold/40.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/error_on_line_overflow/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/error_on_unformatted/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/fn_args_layout/compressed.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/fn_args_layout/tall.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/fn_args_layout/vertical.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/fn_single_line/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/fn_single_line/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/force_explicit_abi/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/force_explicit_abi/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/force_multiline_block/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/force_multiline_block/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/format_macro_bodies/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/format_macro_bodies/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/format_macro_matchers/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/format_macro_matchers/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/format_strings/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/format_strings/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/hard_tabs/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/hard_tabs/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/imports_indent/block.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/imports_layout/horizontal_vertical.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/imports_layout/merge_mixed.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/imports_layout/mixed.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/indent_style/block_args.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/indent_style/block_array.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/indent_style/block_call.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/indent_style/block_chain.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/indent_style/block_generic.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/indent_style/block_struct_lit.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/indent_style/block_tab_spaces_call.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/indent_style/block_trailing_comma_call/two.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/indent_style/block_where_pred.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/indent_style/default.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/indent_style/rfc_control.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/indent_style/rfc_where.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/indent_style/visual_args.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/indent_style/visual_array.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/indent_style/visual_call.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/indent_style/visual_chain.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/indent_style/visual_generics.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/indent_style/visual_struct_lit.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/indent_style/visual_trailing_comma.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/indent_style/visual_where_pred.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/match_arm_blocks/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/match_arm_blocks/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/match_block_trailing_comma/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/match_block_trailing_comma/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/merge_derives/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/normalize_comments/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/normalize_comments/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/normalize_doc_attributes/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/normalize_doc_attributes/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/recursive/disabled/foo.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/recursive/disabled/lib.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/recursive/enabled/foo.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/recursive/enabled/lib.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/remove_nested_parens/remove_nested_parens.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/reorder_impl_items/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/reorder_impl_items/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/reorder_imports/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/reorder_imports/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/reorder_modules/dolor/mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/reorder_modules/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/reorder_modules/ipsum/mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/reorder_modules/lorem/mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/reorder_modules/sit/mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/reorder_modules/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/skip_children/foo/mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/skip_children/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/space_before_colon/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/spaces_around_ranges/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/spaces_around_ranges/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/struct_field_align_threshold/20.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/struct_lit_single_line/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/tab_spaces/2.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/tab_spaces/4.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/trailing_comma/always.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/trailing_comma/never.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/trailing_comma/vertical.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/trailing_semicolon/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/trailing_semicolon/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/type_punctuation_density/compressed.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/type_punctuation_density/wide.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/use_field_init_shorthand/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/use_field_init_shorthand/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/use_small_heuristics/max.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/use_try_shorthand/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/use_try_shorthand/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/use_try_shorthand/true_2015_edition.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/where_single_line/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/wrap_comments/false.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/configs/wrap_comments/true.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/const_generics.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/control-brace-style-always-next-line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/control-brace-style-always-same-line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/doc-attrib.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/doc-comment-with-example.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/doc.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/dyn_trait.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/else-if-brace-style-always-next-line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/else-if-brace-style-always-same-line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/else-if-brace-style-closing-next-line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/empty-tuple-no-conversion-to-unit-struct.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/empty_file.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/enum.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/existential_type.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/expr-block.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/expr-overflow-delimited.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/expr.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/extern.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/extern_not_explicit.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/file-lines-1.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/file-lines-2.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/file-lines-3.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/file-lines-4.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/file-lines-5.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/file-lines-6.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/file-lines-7.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/file-lines-8.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/file-lines-item.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/fn-args-with-last-line-comment.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/fn-custom-2.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/fn-custom-3.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/fn-custom-4.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/fn-custom-6.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/fn-custom-7.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/fn-custom-8.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/fn-custom.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/fn-param-attributes.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/fn-simple.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/fn-single-line/version_two.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/fn-ty.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/fn.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/fn_args_indent-block.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/fn_args_layout-vertical.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/fn_once.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/format_strings/issue-202.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/format_strings/issue-2833.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/format_strings/issue-3263.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/format_strings/issue-687.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/format_strings/issue564.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/hard-tabs.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/hello.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/if_while_or_patterns.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/immovable_generators.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/impl.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/impls.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/import-fencepost-length.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/imports-impl-only-use.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/imports-reorder-lines-and-items.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/imports-reorder-lines.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/imports-reorder.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/imports.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/imports_2015_edition.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/imports_block_indent.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/imports_raw_identifiers.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/indented-impl.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/invalid-rust-code-in-doc-comment.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1021.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1049.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1055.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1096.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1111.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1113.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1120.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1124.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1127.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1158.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1177.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1192.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1210/a.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1210/b.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1210/c.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1210/d.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1210/e.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1211.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1214.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1216.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1239.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1247.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1255.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1278.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1350.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1366.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1397.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1468.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1598.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1624.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1681.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1693.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1703.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1800.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1802.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1824.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-1914.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2025.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2103.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2111.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2123.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2164.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2179/two.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2197.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2256.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2324.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2329.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2342.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2346.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2401.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2445.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2446.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2479.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2482/a.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2482/b.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2482/c.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2496.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2520.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2523.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2526.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2551.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2554.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2582.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2641.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2644.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2673-nonmodrs-mods/foo.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2673-nonmodrs-mods/foo/bar.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2673-nonmodrs-mods/lib.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2728.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2759.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2761.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2794.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2810.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2835.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2863.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2869.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2896.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2916.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2917/minimal.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2917/packed_simd.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2922.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2927-2.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2927.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2930.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2936.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2941.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2955.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2973.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2976.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2977/block.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2977/impl.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2977/item.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2977/trait.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2985.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-2995.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3029.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3032.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3038.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3043.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3049.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3055/backtick.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3055/empty-code-block.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3055/original.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3059.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3066.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3105.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3118.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3124.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3131.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3132.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3153.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3170.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3182.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3184.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3194.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3198.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3213/version_two.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3217.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3224.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3227/two.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3234.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3241.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3253/bar.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3253/foo.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3253/lib.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3253/paths/bar_foo.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3253/paths/excluded.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3253/paths/foo_bar.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3265.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3270/two.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3270/wrap.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3272/v2.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3278/version_two.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3295/two.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3302.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3304.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3314.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3343.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3423.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3434/lib.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3434/no_entry.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3434/not_skip_macro.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3442.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3465.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3494/crlf.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3494/lf.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3499.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3508.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3515.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3532.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3539.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3554.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3567.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3568.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3585/extern_crate.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3585/reorder_imports_disabled.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3585/reorder_imports_enabled.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3585/use.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3592.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3595.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3601.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3614/version_two.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3636.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3639.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3645.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3651.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3665/lib.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3665/not_skip_attribute.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3665/sub_mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3672.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3675.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3701/two.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3709.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3711.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3717.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3718.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3740.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3741.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3750.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3751.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3759.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3779/ice.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3779/lib.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3786.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3787.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3815.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3840/version-two_hard-tabs.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3840/version-two_soft-tabs.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3845.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3851.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3882.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3904/two.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3908.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3923.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3929.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3933/imp-a.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3933/imp-b.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3933/lib.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3933/utils.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3934.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3956/graphics.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3956/graphics_emu.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3956/lib.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3974.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-3992.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-447.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-510.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-539.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-64.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-683.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-691.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-770.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-811.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-831.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-850.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-855.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-913.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-945.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue-977.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue_3839.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue_3844.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue_3853.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue_3854.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/issue_3868.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/item-brace-style-always-next-line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/item-brace-style-prefer-same-line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/item-brace-style-same-line-where.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/itemized-blocks/no_wrap.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/itemized-blocks/rewrite_fail.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/itemized-blocks/urls.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/itemized-blocks/wrap.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/label_break.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/large-block.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/large_vec.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/lazy_static.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/license-templates/empty_license_path.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/license-templates/license.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/long-fn-1/version_two.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/long-match-arms-brace-newline.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/long-use-statement-issue-3154.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/long_field_access.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/loop.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/macro_not_expr.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/macro_rules.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/macros.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/markdown-comment-with-options.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/markdown-comment.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/match-block-trailing-comma.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/match-flattening.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/match-nowrap-trailing-comma.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/match-nowrap.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/match.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/match_overflow_expr.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/max-line-length-in-chars.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/merge_imports.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/mod-1.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/mod-2.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/mod_skip_child.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/multi-file.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/multiline_string_in_macro_def.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/multiple.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/nested-if-else.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/nested-visual-block.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/nested_skipped/mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/nestedmod/mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/nestedmod/mod2a.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/nestedmod/mod2b.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/nestedmod/mod2c.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/nestedmod/mymod1/mod3a.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/nestedmod/submod2/a.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/nestedmod/submod2/mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/no_arg_with_commnet.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/no_new_line_beginning.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/normalize_doc_attributes_should_not_imply_format_doc_comments.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/normalize_multiline_doc_attribute.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/obsolete_in_place.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/one_line_if_v2.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/other.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/paren.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/path_clarity/foo.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/path_clarity/foo/bar.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/paths.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/pattern-condense-wildcards.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/pattern.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/preserves_carriage_return_for_unix.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/preserves_carriage_return_for_windows.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/pub-restricted.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/raw_identifiers.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/remove_blank_lines.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/reorder-impl-items.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/should_not_format_string_when_format_strings_is_not_set.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/single-line-if-else.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/single-line-macro/v2.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/skip.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/skip_mod.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/soft-wrapping.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/space-not-before-newline.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/spaces-around-ranges.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/static.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/string-lit-2.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/string-lit-custom.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/string-lit.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/string_punctuation.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/struct-field-attributes.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/struct_lits.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/struct_lits_multiline.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/struct_lits_visual.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/struct_lits_visual_multiline.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/struct_tuple_visual.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/structs.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/trailing-comma-never.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/trailing_commas.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/trailing_comments/hard_tabs.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/trailing_comments/soft_tabs.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/trait.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/trait_2015_edition.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/try-conversion.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/tuple.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/type-ascription.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/type.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/type_alias.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/unicode.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/unindent_if_else_cond_comment.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/unions.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/visibility.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/visual-fn-type.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/where-clause-rfc.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/where-clause.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/width-heuristics.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/target/wrap_comments_should_not_imply_format_doc_comments.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/writemode/source/fn-single-line.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/writemode/source/json.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/writemode/source/modified.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/writemode/source/stdin.rs (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/writemode/target/checkstyle.xml (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/writemode/target/modified.txt (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/writemode/target/output.json (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/writemode/target/stdin.json (100%) rename {rustfmt-core => rustfmt-lib/rustfmt-core}/tests/writemode/target/stdin.xml (100%) rename {rustfmt-emitter => rustfmt-lib/rustfmt-emitter}/.gitignore (100%) rename {rustfmt-emitter => rustfmt-lib/rustfmt-emitter}/Cargo.toml (100%) rename {rustfmt-emitter => rustfmt-lib/rustfmt-emitter}/src/checkstyle.rs (100%) rename {rustfmt-emitter => rustfmt-lib/rustfmt-emitter}/src/checkstyle/xml.rs (100%) rename {rustfmt-emitter => rustfmt-lib/rustfmt-emitter}/src/diff.rs (100%) rename {rustfmt-emitter => rustfmt-lib/rustfmt-emitter}/src/files.rs (100%) rename {rustfmt-emitter => rustfmt-lib/rustfmt-emitter}/src/json.rs (100%) rename {rustfmt-emitter => rustfmt-lib/rustfmt-emitter}/src/lib.rs (100%) rename {rustfmt-emitter => rustfmt-lib/rustfmt-emitter}/src/modified_lines.rs (100%) rename {rustfmt-emitter => rustfmt-lib/rustfmt-emitter}/src/rustfmt_diff.rs (100%) rename {rustfmt-emitter => rustfmt-lib/rustfmt-emitter}/src/stdout.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 2c2f84a3493..9b30859d8dd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,7 +46,7 @@ structopt = "0.3" term = "0.6" thiserror = "1.0" -rustfmt_core = { path = "rustfmt-core" } +rustfmt_core = { path = "rustfmt-lib/rustfmt-core" } [dev-dependencies] lazy_static = "1.0" diff --git a/rustfmt-lib/.gitignore b/rustfmt-lib/.gitignore new file mode 100644 index 00000000000..06aba01b651 --- /dev/null +++ b/rustfmt-lib/.gitignore @@ -0,0 +1,2 @@ +Cargo.lock +/target diff --git a/rustfmt-lib/Cargo.toml b/rustfmt-lib/Cargo.toml new file mode 100644 index 00000000000..56672f89036 --- /dev/null +++ b/rustfmt-lib/Cargo.toml @@ -0,0 +1,6 @@ +[workspace] +members = [ + "rustfmt-config", + "rustfmt-core", + "rustfmt-emitter", +] diff --git a/rustfmt-config/.gitignore b/rustfmt-lib/rustfmt-config/.gitignore similarity index 100% rename from rustfmt-config/.gitignore rename to rustfmt-lib/rustfmt-config/.gitignore diff --git a/rustfmt-config/Cargo.toml b/rustfmt-lib/rustfmt-config/Cargo.toml similarity index 100% rename from rustfmt-config/Cargo.toml rename to rustfmt-lib/rustfmt-config/Cargo.toml diff --git a/rustfmt-config/config_proc_macro/.gitignore b/rustfmt-lib/rustfmt-config/config_proc_macro/.gitignore similarity index 100% rename from rustfmt-config/config_proc_macro/.gitignore rename to rustfmt-lib/rustfmt-config/config_proc_macro/.gitignore diff --git a/rustfmt-config/config_proc_macro/Cargo.toml b/rustfmt-lib/rustfmt-config/config_proc_macro/Cargo.toml similarity index 100% rename from rustfmt-config/config_proc_macro/Cargo.toml rename to rustfmt-lib/rustfmt-config/config_proc_macro/Cargo.toml diff --git a/rustfmt-config/config_proc_macro/src/attrs.rs b/rustfmt-lib/rustfmt-config/config_proc_macro/src/attrs.rs similarity index 100% rename from rustfmt-config/config_proc_macro/src/attrs.rs rename to rustfmt-lib/rustfmt-config/config_proc_macro/src/attrs.rs diff --git a/rustfmt-config/config_proc_macro/src/config_type.rs b/rustfmt-lib/rustfmt-config/config_proc_macro/src/config_type.rs similarity index 100% rename from rustfmt-config/config_proc_macro/src/config_type.rs rename to rustfmt-lib/rustfmt-config/config_proc_macro/src/config_type.rs diff --git a/rustfmt-config/config_proc_macro/src/item_enum.rs b/rustfmt-lib/rustfmt-config/config_proc_macro/src/item_enum.rs similarity index 100% rename from rustfmt-config/config_proc_macro/src/item_enum.rs rename to rustfmt-lib/rustfmt-config/config_proc_macro/src/item_enum.rs diff --git a/rustfmt-config/config_proc_macro/src/item_struct.rs b/rustfmt-lib/rustfmt-config/config_proc_macro/src/item_struct.rs similarity index 100% rename from rustfmt-config/config_proc_macro/src/item_struct.rs rename to rustfmt-lib/rustfmt-config/config_proc_macro/src/item_struct.rs diff --git a/rustfmt-config/config_proc_macro/src/lib.rs b/rustfmt-lib/rustfmt-config/config_proc_macro/src/lib.rs similarity index 100% rename from rustfmt-config/config_proc_macro/src/lib.rs rename to rustfmt-lib/rustfmt-config/config_proc_macro/src/lib.rs diff --git a/rustfmt-config/config_proc_macro/src/utils.rs b/rustfmt-lib/rustfmt-config/config_proc_macro/src/utils.rs similarity index 100% rename from rustfmt-config/config_proc_macro/src/utils.rs rename to rustfmt-lib/rustfmt-config/config_proc_macro/src/utils.rs diff --git a/rustfmt-config/config_proc_macro/tests/smoke.rs b/rustfmt-lib/rustfmt-config/config_proc_macro/tests/smoke.rs similarity index 73% rename from rustfmt-config/config_proc_macro/tests/smoke.rs rename to rustfmt-lib/rustfmt-config/config_proc_macro/tests/smoke.rs index 940a8a0c251..46e323dd86f 100644 --- a/rustfmt-config/config_proc_macro/tests/smoke.rs +++ b/rustfmt-lib/rustfmt-config/config_proc_macro/tests/smoke.rs @@ -1,7 +1,5 @@ -pub mod config { - pub trait ConfigType: Sized { - fn doc_hint() -> String; - } +pub trait ConfigType: Sized { + fn doc_hint() -> String; } #[allow(dead_code)] diff --git a/rustfmt-config/src/config_type.rs b/rustfmt-lib/rustfmt-config/src/config_type.rs similarity index 99% rename from rustfmt-config/src/config_type.rs rename to rustfmt-lib/rustfmt-config/src/config_type.rs index f6291fc49d8..a864742a8ed 100644 --- a/rustfmt-config/src/config_type.rs +++ b/rustfmt-lib/rustfmt-config/src/config_type.rs @@ -349,3 +349,4 @@ macro_rules! is_nightly_channel { option_env!("CFG_RELEASE_CHANNEL").map_or(true, |c| c == "nightly" || c == "dev") }; } + diff --git a/rustfmt-config/src/file_lines.rs b/rustfmt-lib/rustfmt-config/src/file_lines.rs similarity index 100% rename from rustfmt-config/src/file_lines.rs rename to rustfmt-lib/rustfmt-config/src/file_lines.rs diff --git a/rustfmt-config/src/lib.rs b/rustfmt-lib/rustfmt-config/src/lib.rs similarity index 99% rename from rustfmt-config/src/lib.rs rename to rustfmt-lib/rustfmt-config/src/lib.rs index 13aadcaa3a0..8dbdacb9054 100644 --- a/rustfmt-config/src/lib.rs +++ b/rustfmt-lib/rustfmt-config/src/lib.rs @@ -488,7 +488,7 @@ mod test { #[test] fn test_valid_license_template_path() { - if !crate::is_nightly_channel!() { + if !option_env!("CFG_RELEASE_CHANNEL").map_or(true, |c| c == "nightly" || c == "dev") { return; } let toml = r#"license_template_path = "tests/license-template/lt.txt""#; @@ -498,7 +498,7 @@ mod test { #[test] fn test_conflicting_recursive_skip_children() { - if !crate::is_nightly_channel!() { + if !option_env!("CFG_RELEASE_CHANNEL").map_or(true, |c| c == "nightly" || c == "dev") { return; } diff --git a/rustfmt-config/src/license.rs b/rustfmt-lib/rustfmt-config/src/license.rs similarity index 100% rename from rustfmt-config/src/license.rs rename to rustfmt-lib/rustfmt-config/src/license.rs diff --git a/rustfmt-config/src/lists.rs b/rustfmt-lib/rustfmt-config/src/lists.rs similarity index 100% rename from rustfmt-config/src/lists.rs rename to rustfmt-lib/rustfmt-config/src/lists.rs diff --git a/rustfmt-config/src/options.rs b/rustfmt-lib/rustfmt-config/src/options.rs similarity index 100% rename from rustfmt-config/src/options.rs rename to rustfmt-lib/rustfmt-config/src/options.rs diff --git a/rustfmt-core/tests/license-template/lt.txt b/rustfmt-lib/rustfmt-config/tests/license-template/lt.txt similarity index 100% rename from rustfmt-core/tests/license-template/lt.txt rename to rustfmt-lib/rustfmt-config/tests/license-template/lt.txt diff --git a/rustfmt-core/.gitignore b/rustfmt-lib/rustfmt-core/.gitignore similarity index 100% rename from rustfmt-core/.gitignore rename to rustfmt-lib/rustfmt-core/.gitignore diff --git a/rustfmt-core/Cargo.toml b/rustfmt-lib/rustfmt-core/Cargo.toml similarity index 100% rename from rustfmt-core/Cargo.toml rename to rustfmt-lib/rustfmt-core/Cargo.toml diff --git a/rustfmt-core/src/attr.rs b/rustfmt-lib/rustfmt-core/src/attr.rs similarity index 100% rename from rustfmt-core/src/attr.rs rename to rustfmt-lib/rustfmt-core/src/attr.rs diff --git a/rustfmt-core/src/attr/doc_comment.rs b/rustfmt-lib/rustfmt-core/src/attr/doc_comment.rs similarity index 100% rename from rustfmt-core/src/attr/doc_comment.rs rename to rustfmt-lib/rustfmt-core/src/attr/doc_comment.rs diff --git a/rustfmt-core/src/chains.rs b/rustfmt-lib/rustfmt-core/src/chains.rs similarity index 100% rename from rustfmt-core/src/chains.rs rename to rustfmt-lib/rustfmt-core/src/chains.rs diff --git a/rustfmt-core/src/closures.rs b/rustfmt-lib/rustfmt-core/src/closures.rs similarity index 100% rename from rustfmt-core/src/closures.rs rename to rustfmt-lib/rustfmt-core/src/closures.rs diff --git a/rustfmt-core/src/comment.rs b/rustfmt-lib/rustfmt-core/src/comment.rs similarity index 100% rename from rustfmt-core/src/comment.rs rename to rustfmt-lib/rustfmt-core/src/comment.rs diff --git a/rustfmt-core/src/coverage.rs b/rustfmt-lib/rustfmt-core/src/coverage.rs similarity index 100% rename from rustfmt-core/src/coverage.rs rename to rustfmt-lib/rustfmt-core/src/coverage.rs diff --git a/rustfmt-core/src/expr.rs b/rustfmt-lib/rustfmt-core/src/expr.rs similarity index 100% rename from rustfmt-core/src/expr.rs rename to rustfmt-lib/rustfmt-core/src/expr.rs diff --git a/rustfmt-core/src/format_report_formatter.rs b/rustfmt-lib/rustfmt-core/src/format_report_formatter.rs similarity index 100% rename from rustfmt-core/src/format_report_formatter.rs rename to rustfmt-lib/rustfmt-core/src/format_report_formatter.rs diff --git a/rustfmt-core/src/formatting.rs b/rustfmt-lib/rustfmt-core/src/formatting.rs similarity index 100% rename from rustfmt-core/src/formatting.rs rename to rustfmt-lib/rustfmt-core/src/formatting.rs diff --git a/rustfmt-core/src/formatting/newline_style.rs b/rustfmt-lib/rustfmt-core/src/formatting/newline_style.rs similarity index 100% rename from rustfmt-core/src/formatting/newline_style.rs rename to rustfmt-lib/rustfmt-core/src/formatting/newline_style.rs diff --git a/rustfmt-core/src/ignore_path.rs b/rustfmt-lib/rustfmt-core/src/ignore_path.rs similarity index 100% rename from rustfmt-core/src/ignore_path.rs rename to rustfmt-lib/rustfmt-core/src/ignore_path.rs diff --git a/rustfmt-core/src/imports.rs b/rustfmt-lib/rustfmt-core/src/imports.rs similarity index 100% rename from rustfmt-core/src/imports.rs rename to rustfmt-lib/rustfmt-core/src/imports.rs diff --git a/rustfmt-core/src/issues.rs b/rustfmt-lib/rustfmt-core/src/issues.rs similarity index 100% rename from rustfmt-core/src/issues.rs rename to rustfmt-lib/rustfmt-core/src/issues.rs diff --git a/rustfmt-core/src/items.rs b/rustfmt-lib/rustfmt-core/src/items.rs similarity index 100% rename from rustfmt-core/src/items.rs rename to rustfmt-lib/rustfmt-core/src/items.rs diff --git a/rustfmt-core/src/lib.rs b/rustfmt-lib/rustfmt-core/src/lib.rs similarity index 100% rename from rustfmt-core/src/lib.rs rename to rustfmt-lib/rustfmt-core/src/lib.rs diff --git a/rustfmt-core/src/lists.rs b/rustfmt-lib/rustfmt-core/src/lists.rs similarity index 100% rename from rustfmt-core/src/lists.rs rename to rustfmt-lib/rustfmt-core/src/lists.rs diff --git a/rustfmt-core/src/macros.rs b/rustfmt-lib/rustfmt-core/src/macros.rs similarity index 100% rename from rustfmt-core/src/macros.rs rename to rustfmt-lib/rustfmt-core/src/macros.rs diff --git a/rustfmt-core/src/matches.rs b/rustfmt-lib/rustfmt-core/src/matches.rs similarity index 100% rename from rustfmt-core/src/matches.rs rename to rustfmt-lib/rustfmt-core/src/matches.rs diff --git a/rustfmt-core/src/missed_spans.rs b/rustfmt-lib/rustfmt-core/src/missed_spans.rs similarity index 100% rename from rustfmt-core/src/missed_spans.rs rename to rustfmt-lib/rustfmt-core/src/missed_spans.rs diff --git a/rustfmt-core/src/modules.rs b/rustfmt-lib/rustfmt-core/src/modules.rs similarity index 100% rename from rustfmt-core/src/modules.rs rename to rustfmt-lib/rustfmt-core/src/modules.rs diff --git a/rustfmt-core/src/modules/visitor.rs b/rustfmt-lib/rustfmt-core/src/modules/visitor.rs similarity index 100% rename from rustfmt-core/src/modules/visitor.rs rename to rustfmt-lib/rustfmt-core/src/modules/visitor.rs diff --git a/rustfmt-core/src/overflow.rs b/rustfmt-lib/rustfmt-core/src/overflow.rs similarity index 100% rename from rustfmt-core/src/overflow.rs rename to rustfmt-lib/rustfmt-core/src/overflow.rs diff --git a/rustfmt-core/src/pairs.rs b/rustfmt-lib/rustfmt-core/src/pairs.rs similarity index 100% rename from rustfmt-core/src/pairs.rs rename to rustfmt-lib/rustfmt-core/src/pairs.rs diff --git a/rustfmt-core/src/patterns.rs b/rustfmt-lib/rustfmt-core/src/patterns.rs similarity index 100% rename from rustfmt-core/src/patterns.rs rename to rustfmt-lib/rustfmt-core/src/patterns.rs diff --git a/rustfmt-core/src/release_channel.rs b/rustfmt-lib/rustfmt-core/src/release_channel.rs similarity index 100% rename from rustfmt-core/src/release_channel.rs rename to rustfmt-lib/rustfmt-core/src/release_channel.rs diff --git a/rustfmt-core/src/reorder.rs b/rustfmt-lib/rustfmt-core/src/reorder.rs similarity index 100% rename from rustfmt-core/src/reorder.rs rename to rustfmt-lib/rustfmt-core/src/reorder.rs diff --git a/rustfmt-core/src/rewrite.rs b/rustfmt-lib/rustfmt-core/src/rewrite.rs similarity index 100% rename from rustfmt-core/src/rewrite.rs rename to rustfmt-lib/rustfmt-core/src/rewrite.rs diff --git a/rustfmt-core/src/shape.rs b/rustfmt-lib/rustfmt-core/src/shape.rs similarity index 100% rename from rustfmt-core/src/shape.rs rename to rustfmt-lib/rustfmt-core/src/shape.rs diff --git a/rustfmt-core/src/skip.rs b/rustfmt-lib/rustfmt-core/src/skip.rs similarity index 100% rename from rustfmt-core/src/skip.rs rename to rustfmt-lib/rustfmt-core/src/skip.rs diff --git a/rustfmt-core/src/source_file.rs b/rustfmt-lib/rustfmt-core/src/source_file.rs similarity index 100% rename from rustfmt-core/src/source_file.rs rename to rustfmt-lib/rustfmt-core/src/source_file.rs diff --git a/rustfmt-core/src/source_map.rs b/rustfmt-lib/rustfmt-core/src/source_map.rs similarity index 100% rename from rustfmt-core/src/source_map.rs rename to rustfmt-lib/rustfmt-core/src/source_map.rs diff --git a/rustfmt-core/src/spanned.rs b/rustfmt-lib/rustfmt-core/src/spanned.rs similarity index 100% rename from rustfmt-core/src/spanned.rs rename to rustfmt-lib/rustfmt-core/src/spanned.rs diff --git a/rustfmt-core/src/stmt.rs b/rustfmt-lib/rustfmt-core/src/stmt.rs similarity index 100% rename from rustfmt-core/src/stmt.rs rename to rustfmt-lib/rustfmt-core/src/stmt.rs diff --git a/rustfmt-core/src/string.rs b/rustfmt-lib/rustfmt-core/src/string.rs similarity index 100% rename from rustfmt-core/src/string.rs rename to rustfmt-lib/rustfmt-core/src/string.rs diff --git a/rustfmt-core/src/syntux.rs b/rustfmt-lib/rustfmt-core/src/syntux.rs similarity index 100% rename from rustfmt-core/src/syntux.rs rename to rustfmt-lib/rustfmt-core/src/syntux.rs diff --git a/rustfmt-core/src/syntux/parser.rs b/rustfmt-lib/rustfmt-core/src/syntux/parser.rs similarity index 100% rename from rustfmt-core/src/syntux/parser.rs rename to rustfmt-lib/rustfmt-core/src/syntux/parser.rs diff --git a/rustfmt-core/src/syntux/session.rs b/rustfmt-lib/rustfmt-core/src/syntux/session.rs similarity index 100% rename from rustfmt-core/src/syntux/session.rs rename to rustfmt-lib/rustfmt-core/src/syntux/session.rs diff --git a/rustfmt-core/src/test/configuration_snippet.rs b/rustfmt-lib/rustfmt-core/src/test/configuration_snippet.rs similarity index 98% rename from rustfmt-core/src/test/configuration_snippet.rs rename to rustfmt-lib/rustfmt-core/src/test/configuration_snippet.rs index 28967090209..a873ea76ec4 100644 --- a/rustfmt-core/src/test/configuration_snippet.rs +++ b/rustfmt-lib/rustfmt-core/src/test/configuration_snippet.rs @@ -4,12 +4,13 @@ use std::io::{BufRead, BufReader, Write}; use std::iter::Enumerate; use std::path::{Path, PathBuf}; -use super::{print_mismatches, write_message, DIFF_CONTEXT_SIZE}; +use rustfmt_emitter::rustfmt_diff::{make_diff, Mismatch}; + use crate::config::{Config, EmitMode, Verbosity}; -use crate::rustfmt_diff::{make_diff, Mismatch}; use crate::{Input, Session}; +use super::{print_mismatches, write_message, DIFF_CONTEXT_SIZE}; -const CONFIGURATIONS_FILE_NAME: &str = "../Configurations.md"; +const CONFIGURATIONS_FILE_NAME: &str = "../../Configurations.md"; // This enum is used to represent one of three text features in Configurations.md: a block of code // with its starting line number, the name of a rustfmt configuration option, or the value of a diff --git a/rustfmt-core/src/test/mod.rs b/rustfmt-lib/rustfmt-core/src/test/mod.rs similarity index 99% rename from rustfmt-core/src/test/mod.rs rename to rustfmt-lib/rustfmt-core/src/test/mod.rs index 37d342bfc24..8ccf3be75d5 100644 --- a/rustfmt-core/src/test/mod.rs +++ b/rustfmt-lib/rustfmt-core/src/test/mod.rs @@ -7,10 +7,13 @@ use std::path::{Path, PathBuf}; use std::str::Chars; use std::thread; +use rustfmt_emitter::rustfmt_diff::{ + make_diff, print_diff, Mismatch, ModifiedChunk, OutputWriter, +}; + use crate::config::{Color, Config, EmitMode, FileName, NewlineStyle, ReportTactic}; use crate::formatting::{ReportedErrors, SourceFile}; use crate::is_nightly_channel; -use crate::rustfmt_diff::{make_diff, print_diff, DiffLine, Mismatch, ModifiedChunk, OutputWriter}; use crate::source_file; use crate::{FormatReport, FormatReportFormatterBuilder, Input, Session}; @@ -388,7 +391,7 @@ fn self_tests() { let mut files = get_test_files(Path::new("tests"), false); files.push(PathBuf::from("src/lib.rs")); - let (reports, count, fails) = check_files(files, &Some(PathBuf::from("../rustfmt.toml"))); + let (reports, count, fails) = check_files(files, &Some(PathBuf::from("../../rustfmt.toml"))); let mut warnings = 0; // Display results. diff --git a/rustfmt-core/src/types.rs b/rustfmt-lib/rustfmt-core/src/types.rs similarity index 100% rename from rustfmt-core/src/types.rs rename to rustfmt-lib/rustfmt-core/src/types.rs diff --git a/rustfmt-core/src/utils.rs b/rustfmt-lib/rustfmt-core/src/utils.rs similarity index 100% rename from rustfmt-core/src/utils.rs rename to rustfmt-lib/rustfmt-core/src/utils.rs diff --git a/rustfmt-core/src/vertical.rs b/rustfmt-lib/rustfmt-core/src/vertical.rs similarity index 100% rename from rustfmt-core/src/vertical.rs rename to rustfmt-lib/rustfmt-core/src/vertical.rs diff --git a/rustfmt-core/src/visitor.rs b/rustfmt-lib/rustfmt-core/src/visitor.rs similarity index 100% rename from rustfmt-core/src/visitor.rs rename to rustfmt-lib/rustfmt-core/src/visitor.rs diff --git a/rustfmt-core/tests/config/issue-1111.toml b/rustfmt-lib/rustfmt-core/tests/config/issue-1111.toml similarity index 100% rename from rustfmt-core/tests/config/issue-1111.toml rename to rustfmt-lib/rustfmt-core/tests/config/issue-1111.toml diff --git a/rustfmt-core/tests/config/issue-2641.toml b/rustfmt-lib/rustfmt-core/tests/config/issue-2641.toml similarity index 100% rename from rustfmt-core/tests/config/issue-2641.toml rename to rustfmt-lib/rustfmt-core/tests/config/issue-2641.toml diff --git a/rustfmt-core/tests/config/issue-3779.toml b/rustfmt-lib/rustfmt-core/tests/config/issue-3779.toml similarity index 100% rename from rustfmt-core/tests/config/issue-3779.toml rename to rustfmt-lib/rustfmt-core/tests/config/issue-3779.toml diff --git a/rustfmt-core/tests/config/issue-3802.toml b/rustfmt-lib/rustfmt-core/tests/config/issue-3802.toml similarity index 100% rename from rustfmt-core/tests/config/issue-3802.toml rename to rustfmt-lib/rustfmt-core/tests/config/issue-3802.toml diff --git a/rustfmt-core/tests/config/issue-3933.toml b/rustfmt-lib/rustfmt-core/tests/config/issue-3933.toml similarity index 100% rename from rustfmt-core/tests/config/issue-3933.toml rename to rustfmt-lib/rustfmt-core/tests/config/issue-3933.toml diff --git a/rustfmt-core/tests/config/issue-3956.toml b/rustfmt-lib/rustfmt-core/tests/config/issue-3956.toml similarity index 100% rename from rustfmt-core/tests/config/issue-3956.toml rename to rustfmt-lib/rustfmt-core/tests/config/issue-3956.toml diff --git a/rustfmt-core/tests/config/skip_children.toml b/rustfmt-lib/rustfmt-core/tests/config/skip_children.toml similarity index 100% rename from rustfmt-core/tests/config/skip_children.toml rename to rustfmt-lib/rustfmt-core/tests/config/skip_children.toml diff --git a/rustfmt-core/tests/config/small_tabs.toml b/rustfmt-lib/rustfmt-core/tests/config/small_tabs.toml similarity index 100% rename from rustfmt-core/tests/config/small_tabs.toml rename to rustfmt-lib/rustfmt-core/tests/config/small_tabs.toml diff --git a/rustfmt-core/tests/coverage/source/comments.rs b/rustfmt-lib/rustfmt-core/tests/coverage/source/comments.rs similarity index 100% rename from rustfmt-core/tests/coverage/source/comments.rs rename to rustfmt-lib/rustfmt-core/tests/coverage/source/comments.rs diff --git a/rustfmt-core/tests/coverage/target/comments.rs b/rustfmt-lib/rustfmt-core/tests/coverage/target/comments.rs similarity index 100% rename from rustfmt-core/tests/coverage/target/comments.rs rename to rustfmt-lib/rustfmt-core/tests/coverage/target/comments.rs diff --git a/rustfmt-lib/rustfmt-core/tests/license-template/lt.txt b/rustfmt-lib/rustfmt-core/tests/license-template/lt.txt new file mode 100644 index 00000000000..ea4390371a0 --- /dev/null +++ b/rustfmt-lib/rustfmt-core/tests/license-template/lt.txt @@ -0,0 +1,2 @@ +// rustfmt-license_template_path: tests/license-template/lt.txt +// Copyright {\d+} The rustfmt developers. diff --git a/rustfmt-core/tests/source/alignment_2633/block_style.rs b/rustfmt-lib/rustfmt-core/tests/source/alignment_2633/block_style.rs similarity index 100% rename from rustfmt-core/tests/source/alignment_2633/block_style.rs rename to rustfmt-lib/rustfmt-core/tests/source/alignment_2633/block_style.rs diff --git a/rustfmt-core/tests/source/alignment_2633/visual_style.rs b/rustfmt-lib/rustfmt-core/tests/source/alignment_2633/visual_style.rs similarity index 100% rename from rustfmt-core/tests/source/alignment_2633/visual_style.rs rename to rustfmt-lib/rustfmt-core/tests/source/alignment_2633/visual_style.rs diff --git a/rustfmt-core/tests/source/array_comment.rs b/rustfmt-lib/rustfmt-core/tests/source/array_comment.rs similarity index 100% rename from rustfmt-core/tests/source/array_comment.rs rename to rustfmt-lib/rustfmt-core/tests/source/array_comment.rs diff --git a/rustfmt-core/tests/source/assignment.rs b/rustfmt-lib/rustfmt-core/tests/source/assignment.rs similarity index 100% rename from rustfmt-core/tests/source/assignment.rs rename to rustfmt-lib/rustfmt-core/tests/source/assignment.rs diff --git a/rustfmt-core/tests/source/associated-types-bounds-wrapping.rs b/rustfmt-lib/rustfmt-core/tests/source/associated-types-bounds-wrapping.rs similarity index 100% rename from rustfmt-core/tests/source/associated-types-bounds-wrapping.rs rename to rustfmt-lib/rustfmt-core/tests/source/associated-types-bounds-wrapping.rs diff --git a/rustfmt-core/tests/source/associated_type_bounds.rs b/rustfmt-lib/rustfmt-core/tests/source/associated_type_bounds.rs similarity index 100% rename from rustfmt-core/tests/source/associated_type_bounds.rs rename to rustfmt-lib/rustfmt-core/tests/source/associated_type_bounds.rs diff --git a/rustfmt-core/tests/source/async_block.rs b/rustfmt-lib/rustfmt-core/tests/source/async_block.rs similarity index 100% rename from rustfmt-core/tests/source/async_block.rs rename to rustfmt-lib/rustfmt-core/tests/source/async_block.rs diff --git a/rustfmt-core/tests/source/async_fn.rs b/rustfmt-lib/rustfmt-core/tests/source/async_fn.rs similarity index 100% rename from rustfmt-core/tests/source/async_fn.rs rename to rustfmt-lib/rustfmt-core/tests/source/async_fn.rs diff --git a/rustfmt-core/tests/source/attrib.rs b/rustfmt-lib/rustfmt-core/tests/source/attrib.rs similarity index 100% rename from rustfmt-core/tests/source/attrib.rs rename to rustfmt-lib/rustfmt-core/tests/source/attrib.rs diff --git a/rustfmt-core/tests/source/big-impl-block.rs b/rustfmt-lib/rustfmt-core/tests/source/big-impl-block.rs similarity index 100% rename from rustfmt-core/tests/source/big-impl-block.rs rename to rustfmt-lib/rustfmt-core/tests/source/big-impl-block.rs diff --git a/rustfmt-core/tests/source/big-impl-visual.rs b/rustfmt-lib/rustfmt-core/tests/source/big-impl-visual.rs similarity index 100% rename from rustfmt-core/tests/source/big-impl-visual.rs rename to rustfmt-lib/rustfmt-core/tests/source/big-impl-visual.rs diff --git a/rustfmt-core/tests/source/binary-expr.rs b/rustfmt-lib/rustfmt-core/tests/source/binary-expr.rs similarity index 100% rename from rustfmt-core/tests/source/binary-expr.rs rename to rustfmt-lib/rustfmt-core/tests/source/binary-expr.rs diff --git a/rustfmt-core/tests/source/break-and-continue.rs b/rustfmt-lib/rustfmt-core/tests/source/break-and-continue.rs similarity index 100% rename from rustfmt-core/tests/source/break-and-continue.rs rename to rustfmt-lib/rustfmt-core/tests/source/break-and-continue.rs diff --git a/rustfmt-core/tests/source/catch.rs b/rustfmt-lib/rustfmt-core/tests/source/catch.rs similarity index 100% rename from rustfmt-core/tests/source/catch.rs rename to rustfmt-lib/rustfmt-core/tests/source/catch.rs diff --git a/rustfmt-core/tests/source/cfg_if/detect/arch/aarch64.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/aarch64.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/detect/arch/aarch64.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/aarch64.rs diff --git a/rustfmt-core/tests/source/cfg_if/detect/arch/arm.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/arm.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/detect/arch/arm.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/arm.rs diff --git a/rustfmt-core/tests/source/cfg_if/detect/arch/mips.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/mips.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/detect/arch/mips.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/mips.rs diff --git a/rustfmt-core/tests/source/cfg_if/detect/arch/mips64.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/mips64.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/detect/arch/mips64.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/mips64.rs diff --git a/rustfmt-core/tests/source/cfg_if/detect/arch/powerpc.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/powerpc.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/detect/arch/powerpc.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/powerpc.rs diff --git a/rustfmt-core/tests/source/cfg_if/detect/arch/powerpc64.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/powerpc64.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/detect/arch/powerpc64.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/powerpc64.rs diff --git a/rustfmt-core/tests/source/cfg_if/detect/arch/x86.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/x86.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/detect/arch/x86.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/x86.rs diff --git a/rustfmt-core/tests/source/cfg_if/detect/bit.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/bit.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/detect/bit.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/bit.rs diff --git a/rustfmt-core/tests/source/cfg_if/detect/cache.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/cache.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/detect/cache.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/cache.rs diff --git a/rustfmt-core/tests/source/cfg_if/detect/error_macros.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/error_macros.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/detect/error_macros.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/error_macros.rs diff --git a/rustfmt-core/tests/source/cfg_if/detect/mod.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/mod.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/detect/mod.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/mod.rs diff --git a/rustfmt-core/tests/source/cfg_if/detect/os/aarch64.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/aarch64.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/detect/os/aarch64.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/aarch64.rs diff --git a/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/aarch64.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/aarch64.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/detect/os/freebsd/aarch64.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/aarch64.rs diff --git a/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/arm.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/arm.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/detect/os/freebsd/arm.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/arm.rs diff --git a/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/auxvec.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/auxvec.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/detect/os/freebsd/auxvec.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/auxvec.rs diff --git a/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/mod.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/mod.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/detect/os/freebsd/mod.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/mod.rs diff --git a/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/powerpc.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/powerpc.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/detect/os/freebsd/powerpc.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/powerpc.rs diff --git a/rustfmt-core/tests/source/cfg_if/detect/os/linux/aarch64.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/aarch64.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/detect/os/linux/aarch64.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/aarch64.rs diff --git a/rustfmt-core/tests/source/cfg_if/detect/os/linux/arm.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/arm.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/detect/os/linux/arm.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/arm.rs diff --git a/rustfmt-core/tests/source/cfg_if/detect/os/linux/auxvec.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/auxvec.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/detect/os/linux/auxvec.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/auxvec.rs diff --git a/rustfmt-core/tests/source/cfg_if/detect/os/linux/cpuinfo.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/cpuinfo.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/detect/os/linux/cpuinfo.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/cpuinfo.rs diff --git a/rustfmt-core/tests/source/cfg_if/detect/os/linux/mips.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/mips.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/detect/os/linux/mips.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/mips.rs diff --git a/rustfmt-core/tests/source/cfg_if/detect/os/linux/mod.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/mod.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/detect/os/linux/mod.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/mod.rs diff --git a/rustfmt-core/tests/source/cfg_if/detect/os/linux/powerpc.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/powerpc.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/detect/os/linux/powerpc.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/powerpc.rs diff --git a/rustfmt-core/tests/source/cfg_if/detect/os/other.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/other.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/detect/os/other.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/other.rs diff --git a/rustfmt-core/tests/source/cfg_if/detect/os/x86.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/x86.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/detect/os/x86.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/x86.rs diff --git a/rustfmt-core/tests/source/cfg_if/lib.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/lib.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/lib.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/lib.rs diff --git a/rustfmt-core/tests/source/cfg_if/mod.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_if/mod.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_if/mod.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_if/mod.rs diff --git a/rustfmt-core/tests/source/cfg_mod/bar.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_mod/bar.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_mod/bar.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_mod/bar.rs diff --git a/rustfmt-core/tests/source/cfg_mod/dir/dir1/dir2/wasm32.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_mod/dir/dir1/dir2/wasm32.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_mod/dir/dir1/dir2/wasm32.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_mod/dir/dir1/dir2/wasm32.rs diff --git a/rustfmt-core/tests/source/cfg_mod/dir/dir1/dir3/wasm32.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_mod/dir/dir1/dir3/wasm32.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_mod/dir/dir1/dir3/wasm32.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_mod/dir/dir1/dir3/wasm32.rs diff --git a/rustfmt-core/tests/source/cfg_mod/foo.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_mod/foo.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_mod/foo.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_mod/foo.rs diff --git a/rustfmt-core/tests/source/cfg_mod/mod.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_mod/mod.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_mod/mod.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_mod/mod.rs diff --git a/rustfmt-core/tests/source/cfg_mod/other.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_mod/other.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_mod/other.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_mod/other.rs diff --git a/rustfmt-core/tests/source/cfg_mod/wasm32.rs b/rustfmt-lib/rustfmt-core/tests/source/cfg_mod/wasm32.rs similarity index 100% rename from rustfmt-core/tests/source/cfg_mod/wasm32.rs rename to rustfmt-lib/rustfmt-core/tests/source/cfg_mod/wasm32.rs diff --git a/rustfmt-core/tests/source/chains-visual.rs b/rustfmt-lib/rustfmt-core/tests/source/chains-visual.rs similarity index 100% rename from rustfmt-core/tests/source/chains-visual.rs rename to rustfmt-lib/rustfmt-core/tests/source/chains-visual.rs diff --git a/rustfmt-core/tests/source/chains.rs b/rustfmt-lib/rustfmt-core/tests/source/chains.rs similarity index 100% rename from rustfmt-core/tests/source/chains.rs rename to rustfmt-lib/rustfmt-core/tests/source/chains.rs diff --git a/rustfmt-core/tests/source/chains_with_comment.rs b/rustfmt-lib/rustfmt-core/tests/source/chains_with_comment.rs similarity index 100% rename from rustfmt-core/tests/source/chains_with_comment.rs rename to rustfmt-lib/rustfmt-core/tests/source/chains_with_comment.rs diff --git a/rustfmt-core/tests/source/closure-block-inside-macro.rs b/rustfmt-lib/rustfmt-core/tests/source/closure-block-inside-macro.rs similarity index 100% rename from rustfmt-core/tests/source/closure-block-inside-macro.rs rename to rustfmt-lib/rustfmt-core/tests/source/closure-block-inside-macro.rs diff --git a/rustfmt-core/tests/source/closure_block_style.rs b/rustfmt-lib/rustfmt-core/tests/source/closure_block_style.rs similarity index 100% rename from rustfmt-core/tests/source/closure_block_style.rs rename to rustfmt-lib/rustfmt-core/tests/source/closure_block_style.rs diff --git a/rustfmt-core/tests/source/closure_block_style_no_comma.rs b/rustfmt-lib/rustfmt-core/tests/source/closure_block_style_no_comma.rs similarity index 100% rename from rustfmt-core/tests/source/closure_block_style_no_comma.rs rename to rustfmt-lib/rustfmt-core/tests/source/closure_block_style_no_comma.rs diff --git a/rustfmt-core/tests/source/closure_visual_style.rs b/rustfmt-lib/rustfmt-core/tests/source/closure_visual_style.rs similarity index 100% rename from rustfmt-core/tests/source/closure_visual_style.rs rename to rustfmt-lib/rustfmt-core/tests/source/closure_visual_style.rs diff --git a/rustfmt-core/tests/source/comment.rs b/rustfmt-lib/rustfmt-core/tests/source/comment.rs similarity index 100% rename from rustfmt-core/tests/source/comment.rs rename to rustfmt-lib/rustfmt-core/tests/source/comment.rs diff --git a/rustfmt-core/tests/source/comment2.rs b/rustfmt-lib/rustfmt-core/tests/source/comment2.rs similarity index 100% rename from rustfmt-core/tests/source/comment2.rs rename to rustfmt-lib/rustfmt-core/tests/source/comment2.rs diff --git a/rustfmt-core/tests/source/comment3.rs b/rustfmt-lib/rustfmt-core/tests/source/comment3.rs similarity index 100% rename from rustfmt-core/tests/source/comment3.rs rename to rustfmt-lib/rustfmt-core/tests/source/comment3.rs diff --git a/rustfmt-core/tests/source/comment4.rs b/rustfmt-lib/rustfmt-core/tests/source/comment4.rs similarity index 100% rename from rustfmt-core/tests/source/comment4.rs rename to rustfmt-lib/rustfmt-core/tests/source/comment4.rs diff --git a/rustfmt-core/tests/source/comment5.rs b/rustfmt-lib/rustfmt-core/tests/source/comment5.rs similarity index 100% rename from rustfmt-core/tests/source/comment5.rs rename to rustfmt-lib/rustfmt-core/tests/source/comment5.rs diff --git a/rustfmt-core/tests/source/comment6.rs b/rustfmt-lib/rustfmt-core/tests/source/comment6.rs similarity index 100% rename from rustfmt-core/tests/source/comment6.rs rename to rustfmt-lib/rustfmt-core/tests/source/comment6.rs diff --git a/rustfmt-core/tests/source/comment_crlf_newline.rs b/rustfmt-lib/rustfmt-core/tests/source/comment_crlf_newline.rs similarity index 100% rename from rustfmt-core/tests/source/comment_crlf_newline.rs rename to rustfmt-lib/rustfmt-core/tests/source/comment_crlf_newline.rs diff --git a/rustfmt-core/tests/source/configs/blank_lines_lower_bound/1.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/blank_lines_lower_bound/1.rs similarity index 100% rename from rustfmt-core/tests/source/configs/blank_lines_lower_bound/1.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/blank_lines_lower_bound/1.rs diff --git a/rustfmt-core/tests/source/configs/brace_style/fn_always_next_line.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/brace_style/fn_always_next_line.rs similarity index 100% rename from rustfmt-core/tests/source/configs/brace_style/fn_always_next_line.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/brace_style/fn_always_next_line.rs diff --git a/rustfmt-core/tests/source/configs/brace_style/fn_prefer_same_line.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/brace_style/fn_prefer_same_line.rs similarity index 100% rename from rustfmt-core/tests/source/configs/brace_style/fn_prefer_same_line.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/brace_style/fn_prefer_same_line.rs diff --git a/rustfmt-core/tests/source/configs/brace_style/fn_same_line_where.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/brace_style/fn_same_line_where.rs similarity index 100% rename from rustfmt-core/tests/source/configs/brace_style/fn_same_line_where.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/brace_style/fn_same_line_where.rs diff --git a/rustfmt-core/tests/source/configs/brace_style/item_always_next_line.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/brace_style/item_always_next_line.rs similarity index 100% rename from rustfmt-core/tests/source/configs/brace_style/item_always_next_line.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/brace_style/item_always_next_line.rs diff --git a/rustfmt-core/tests/source/configs/brace_style/item_prefer_same_line.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/brace_style/item_prefer_same_line.rs similarity index 100% rename from rustfmt-core/tests/source/configs/brace_style/item_prefer_same_line.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/brace_style/item_prefer_same_line.rs diff --git a/rustfmt-core/tests/source/configs/brace_style/item_same_line_where.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/brace_style/item_same_line_where.rs similarity index 100% rename from rustfmt-core/tests/source/configs/brace_style/item_same_line_where.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/brace_style/item_same_line_where.rs diff --git a/rustfmt-core/tests/source/configs/comment_width/above.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/comment_width/above.rs similarity index 100% rename from rustfmt-core/tests/source/configs/comment_width/above.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/comment_width/above.rs diff --git a/rustfmt-core/tests/source/configs/comment_width/below.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/comment_width/below.rs similarity index 100% rename from rustfmt-core/tests/source/configs/comment_width/below.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/comment_width/below.rs diff --git a/rustfmt-core/tests/source/configs/comment_width/ignore.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/comment_width/ignore.rs similarity index 100% rename from rustfmt-core/tests/source/configs/comment_width/ignore.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/comment_width/ignore.rs diff --git a/rustfmt-core/tests/source/configs/condense_wildcard_suffixes/false.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/condense_wildcard_suffixes/false.rs similarity index 100% rename from rustfmt-core/tests/source/configs/condense_wildcard_suffixes/false.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/condense_wildcard_suffixes/false.rs diff --git a/rustfmt-core/tests/source/configs/condense_wildcard_suffixes/true.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/condense_wildcard_suffixes/true.rs similarity index 100% rename from rustfmt-core/tests/source/configs/condense_wildcard_suffixes/true.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/condense_wildcard_suffixes/true.rs diff --git a/rustfmt-core/tests/source/configs/control_brace_style/always_next_line.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/control_brace_style/always_next_line.rs similarity index 100% rename from rustfmt-core/tests/source/configs/control_brace_style/always_next_line.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/control_brace_style/always_next_line.rs diff --git a/rustfmt-core/tests/source/configs/control_brace_style/always_same_line.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/control_brace_style/always_same_line.rs similarity index 100% rename from rustfmt-core/tests/source/configs/control_brace_style/always_same_line.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/control_brace_style/always_same_line.rs diff --git a/rustfmt-core/tests/source/configs/control_brace_style/closing_next_line.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/control_brace_style/closing_next_line.rs similarity index 100% rename from rustfmt-core/tests/source/configs/control_brace_style/closing_next_line.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/control_brace_style/closing_next_line.rs diff --git a/rustfmt-core/tests/source/configs/disable_all_formatting/false.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/disable_all_formatting/false.rs similarity index 100% rename from rustfmt-core/tests/source/configs/disable_all_formatting/false.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/disable_all_formatting/false.rs diff --git a/rustfmt-core/tests/source/configs/disable_all_formatting/true.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/disable_all_formatting/true.rs similarity index 100% rename from rustfmt-core/tests/source/configs/disable_all_formatting/true.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/disable_all_formatting/true.rs diff --git a/rustfmt-core/tests/source/configs/empty_item_single_line/false.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/empty_item_single_line/false.rs similarity index 100% rename from rustfmt-core/tests/source/configs/empty_item_single_line/false.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/empty_item_single_line/false.rs diff --git a/rustfmt-core/tests/source/configs/empty_item_single_line/true.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/empty_item_single_line/true.rs similarity index 100% rename from rustfmt-core/tests/source/configs/empty_item_single_line/true.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/empty_item_single_line/true.rs diff --git a/rustfmt-core/tests/source/configs/enum_discrim_align_threshold/40.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/enum_discrim_align_threshold/40.rs similarity index 100% rename from rustfmt-core/tests/source/configs/enum_discrim_align_threshold/40.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/enum_discrim_align_threshold/40.rs diff --git a/rustfmt-core/tests/source/configs/error_on_line_overflow/false.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/error_on_line_overflow/false.rs similarity index 100% rename from rustfmt-core/tests/source/configs/error_on_line_overflow/false.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/error_on_line_overflow/false.rs diff --git a/rustfmt-core/tests/source/configs/fn_args_layout/compressed.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/fn_args_layout/compressed.rs similarity index 100% rename from rustfmt-core/tests/source/configs/fn_args_layout/compressed.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/fn_args_layout/compressed.rs diff --git a/rustfmt-core/tests/source/configs/fn_args_layout/tall.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/fn_args_layout/tall.rs similarity index 100% rename from rustfmt-core/tests/source/configs/fn_args_layout/tall.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/fn_args_layout/tall.rs diff --git a/rustfmt-core/tests/source/configs/fn_args_layout/vertical.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/fn_args_layout/vertical.rs similarity index 100% rename from rustfmt-core/tests/source/configs/fn_args_layout/vertical.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/fn_args_layout/vertical.rs diff --git a/rustfmt-core/tests/source/configs/fn_single_line/false.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/fn_single_line/false.rs similarity index 100% rename from rustfmt-core/tests/source/configs/fn_single_line/false.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/fn_single_line/false.rs diff --git a/rustfmt-core/tests/source/configs/fn_single_line/true.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/fn_single_line/true.rs similarity index 100% rename from rustfmt-core/tests/source/configs/fn_single_line/true.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/fn_single_line/true.rs diff --git a/rustfmt-core/tests/source/configs/force_explicit_abi/false.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/force_explicit_abi/false.rs similarity index 100% rename from rustfmt-core/tests/source/configs/force_explicit_abi/false.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/force_explicit_abi/false.rs diff --git a/rustfmt-core/tests/source/configs/force_explicit_abi/true.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/force_explicit_abi/true.rs similarity index 100% rename from rustfmt-core/tests/source/configs/force_explicit_abi/true.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/force_explicit_abi/true.rs diff --git a/rustfmt-core/tests/source/configs/force_multiline_block/false.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/force_multiline_block/false.rs similarity index 100% rename from rustfmt-core/tests/source/configs/force_multiline_block/false.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/force_multiline_block/false.rs diff --git a/rustfmt-core/tests/source/configs/force_multiline_block/true.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/force_multiline_block/true.rs similarity index 100% rename from rustfmt-core/tests/source/configs/force_multiline_block/true.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/force_multiline_block/true.rs diff --git a/rustfmt-core/tests/source/configs/format_macro_bodies/false.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/format_macro_bodies/false.rs similarity index 100% rename from rustfmt-core/tests/source/configs/format_macro_bodies/false.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/format_macro_bodies/false.rs diff --git a/rustfmt-core/tests/source/configs/format_macro_bodies/true.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/format_macro_bodies/true.rs similarity index 100% rename from rustfmt-core/tests/source/configs/format_macro_bodies/true.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/format_macro_bodies/true.rs diff --git a/rustfmt-core/tests/source/configs/format_macro_matchers/false.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/format_macro_matchers/false.rs similarity index 100% rename from rustfmt-core/tests/source/configs/format_macro_matchers/false.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/format_macro_matchers/false.rs diff --git a/rustfmt-core/tests/source/configs/format_macro_matchers/true.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/format_macro_matchers/true.rs similarity index 100% rename from rustfmt-core/tests/source/configs/format_macro_matchers/true.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/format_macro_matchers/true.rs diff --git a/rustfmt-core/tests/source/configs/format_strings/false.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/format_strings/false.rs similarity index 100% rename from rustfmt-core/tests/source/configs/format_strings/false.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/format_strings/false.rs diff --git a/rustfmt-core/tests/source/configs/format_strings/true.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/format_strings/true.rs similarity index 100% rename from rustfmt-core/tests/source/configs/format_strings/true.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/format_strings/true.rs diff --git a/rustfmt-core/tests/source/configs/hard_tabs/false.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/hard_tabs/false.rs similarity index 100% rename from rustfmt-core/tests/source/configs/hard_tabs/false.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/hard_tabs/false.rs diff --git a/rustfmt-core/tests/source/configs/hard_tabs/true.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/hard_tabs/true.rs similarity index 100% rename from rustfmt-core/tests/source/configs/hard_tabs/true.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/hard_tabs/true.rs diff --git a/rustfmt-core/tests/source/configs/imports_layout/merge_mixed.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/imports_layout/merge_mixed.rs similarity index 100% rename from rustfmt-core/tests/source/configs/imports_layout/merge_mixed.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/imports_layout/merge_mixed.rs diff --git a/rustfmt-core/tests/source/configs/indent_style/block_args.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_args.rs similarity index 100% rename from rustfmt-core/tests/source/configs/indent_style/block_args.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_args.rs diff --git a/rustfmt-core/tests/source/configs/indent_style/block_array.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_array.rs similarity index 100% rename from rustfmt-core/tests/source/configs/indent_style/block_array.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_array.rs diff --git a/rustfmt-core/tests/source/configs/indent_style/block_call.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_call.rs similarity index 100% rename from rustfmt-core/tests/source/configs/indent_style/block_call.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_call.rs diff --git a/rustfmt-core/tests/source/configs/indent_style/block_chain.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_chain.rs similarity index 100% rename from rustfmt-core/tests/source/configs/indent_style/block_chain.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_chain.rs diff --git a/rustfmt-core/tests/source/configs/indent_style/block_generic.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_generic.rs similarity index 100% rename from rustfmt-core/tests/source/configs/indent_style/block_generic.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_generic.rs diff --git a/rustfmt-core/tests/source/configs/indent_style/block_struct_lit.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_struct_lit.rs similarity index 100% rename from rustfmt-core/tests/source/configs/indent_style/block_struct_lit.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_struct_lit.rs diff --git a/rustfmt-core/tests/source/configs/indent_style/block_trailing_comma_call/two.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_trailing_comma_call/two.rs similarity index 100% rename from rustfmt-core/tests/source/configs/indent_style/block_trailing_comma_call/two.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_trailing_comma_call/two.rs diff --git a/rustfmt-core/tests/source/configs/indent_style/block_where_pred.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_where_pred.rs similarity index 100% rename from rustfmt-core/tests/source/configs/indent_style/block_where_pred.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_where_pred.rs diff --git a/rustfmt-core/tests/source/configs/indent_style/default.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/default.rs similarity index 100% rename from rustfmt-core/tests/source/configs/indent_style/default.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/default.rs diff --git a/rustfmt-core/tests/source/configs/indent_style/rfc_where.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/rfc_where.rs similarity index 100% rename from rustfmt-core/tests/source/configs/indent_style/rfc_where.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/rfc_where.rs diff --git a/rustfmt-core/tests/source/configs/indent_style/visual_args.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_args.rs similarity index 100% rename from rustfmt-core/tests/source/configs/indent_style/visual_args.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_args.rs diff --git a/rustfmt-core/tests/source/configs/indent_style/visual_array.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_array.rs similarity index 100% rename from rustfmt-core/tests/source/configs/indent_style/visual_array.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_array.rs diff --git a/rustfmt-core/tests/source/configs/indent_style/visual_call.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_call.rs similarity index 100% rename from rustfmt-core/tests/source/configs/indent_style/visual_call.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_call.rs diff --git a/rustfmt-core/tests/source/configs/indent_style/visual_chain.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_chain.rs similarity index 100% rename from rustfmt-core/tests/source/configs/indent_style/visual_chain.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_chain.rs diff --git a/rustfmt-core/tests/source/configs/indent_style/visual_generics.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_generics.rs similarity index 100% rename from rustfmt-core/tests/source/configs/indent_style/visual_generics.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_generics.rs diff --git a/rustfmt-core/tests/source/configs/indent_style/visual_struct_lit.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_struct_lit.rs similarity index 100% rename from rustfmt-core/tests/source/configs/indent_style/visual_struct_lit.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_struct_lit.rs diff --git a/rustfmt-core/tests/source/configs/indent_style/visual_trailing_comma.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_trailing_comma.rs similarity index 100% rename from rustfmt-core/tests/source/configs/indent_style/visual_trailing_comma.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_trailing_comma.rs diff --git a/rustfmt-core/tests/source/configs/indent_style/visual_where_pred.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_where_pred.rs similarity index 100% rename from rustfmt-core/tests/source/configs/indent_style/visual_where_pred.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_where_pred.rs diff --git a/rustfmt-core/tests/source/configs/match_arm_blocks/false.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/match_arm_blocks/false.rs similarity index 100% rename from rustfmt-core/tests/source/configs/match_arm_blocks/false.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/match_arm_blocks/false.rs diff --git a/rustfmt-core/tests/source/configs/match_arm_blocks/true.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/match_arm_blocks/true.rs similarity index 100% rename from rustfmt-core/tests/source/configs/match_arm_blocks/true.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/match_arm_blocks/true.rs diff --git a/rustfmt-core/tests/source/configs/match_block_trailing_comma/false.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/match_block_trailing_comma/false.rs similarity index 100% rename from rustfmt-core/tests/source/configs/match_block_trailing_comma/false.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/match_block_trailing_comma/false.rs diff --git a/rustfmt-core/tests/source/configs/match_block_trailing_comma/true.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/match_block_trailing_comma/true.rs similarity index 100% rename from rustfmt-core/tests/source/configs/match_block_trailing_comma/true.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/match_block_trailing_comma/true.rs diff --git a/rustfmt-core/tests/source/configs/merge_derives/true.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/merge_derives/true.rs similarity index 100% rename from rustfmt-core/tests/source/configs/merge_derives/true.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/merge_derives/true.rs diff --git a/rustfmt-core/tests/source/configs/normalize_comments/false.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/normalize_comments/false.rs similarity index 100% rename from rustfmt-core/tests/source/configs/normalize_comments/false.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/normalize_comments/false.rs diff --git a/rustfmt-core/tests/source/configs/normalize_comments/true.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/normalize_comments/true.rs similarity index 100% rename from rustfmt-core/tests/source/configs/normalize_comments/true.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/normalize_comments/true.rs diff --git a/rustfmt-core/tests/source/configs/normalize_doc_attributes/false.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/normalize_doc_attributes/false.rs similarity index 100% rename from rustfmt-core/tests/source/configs/normalize_doc_attributes/false.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/normalize_doc_attributes/false.rs diff --git a/rustfmt-core/tests/source/configs/normalize_doc_attributes/true.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/normalize_doc_attributes/true.rs similarity index 100% rename from rustfmt-core/tests/source/configs/normalize_doc_attributes/true.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/normalize_doc_attributes/true.rs diff --git a/rustfmt-core/tests/source/configs/recursive/disabled/foo.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/recursive/disabled/foo.rs similarity index 100% rename from rustfmt-core/tests/source/configs/recursive/disabled/foo.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/recursive/disabled/foo.rs diff --git a/rustfmt-core/tests/source/configs/recursive/disabled/lib.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/recursive/disabled/lib.rs similarity index 100% rename from rustfmt-core/tests/source/configs/recursive/disabled/lib.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/recursive/disabled/lib.rs diff --git a/rustfmt-core/tests/source/configs/recursive/enabled/foo.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/recursive/enabled/foo.rs similarity index 100% rename from rustfmt-core/tests/source/configs/recursive/enabled/foo.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/recursive/enabled/foo.rs diff --git a/rustfmt-core/tests/source/configs/recursive/enabled/lib.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/recursive/enabled/lib.rs similarity index 100% rename from rustfmt-core/tests/source/configs/recursive/enabled/lib.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/recursive/enabled/lib.rs diff --git a/rustfmt-core/tests/source/configs/remove_nested_parens/remove_nested_parens.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/remove_nested_parens/remove_nested_parens.rs similarity index 100% rename from rustfmt-core/tests/source/configs/remove_nested_parens/remove_nested_parens.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/remove_nested_parens/remove_nested_parens.rs diff --git a/rustfmt-core/tests/source/configs/reorder_impl_items/false.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/reorder_impl_items/false.rs similarity index 100% rename from rustfmt-core/tests/source/configs/reorder_impl_items/false.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/reorder_impl_items/false.rs diff --git a/rustfmt-core/tests/source/configs/reorder_impl_items/true.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/reorder_impl_items/true.rs similarity index 100% rename from rustfmt-core/tests/source/configs/reorder_impl_items/true.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/reorder_impl_items/true.rs diff --git a/rustfmt-core/tests/source/configs/reorder_imports/false.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/reorder_imports/false.rs similarity index 100% rename from rustfmt-core/tests/source/configs/reorder_imports/false.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/reorder_imports/false.rs diff --git a/rustfmt-core/tests/source/configs/reorder_imports/true.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/reorder_imports/true.rs similarity index 100% rename from rustfmt-core/tests/source/configs/reorder_imports/true.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/reorder_imports/true.rs diff --git a/rustfmt-core/tests/source/configs/reorder_modules/dolor/mod.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/reorder_modules/dolor/mod.rs similarity index 100% rename from rustfmt-core/tests/source/configs/reorder_modules/dolor/mod.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/reorder_modules/dolor/mod.rs diff --git a/rustfmt-core/tests/source/configs/reorder_modules/false.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/reorder_modules/false.rs similarity index 100% rename from rustfmt-core/tests/source/configs/reorder_modules/false.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/reorder_modules/false.rs diff --git a/rustfmt-core/tests/source/configs/reorder_modules/ipsum/mod.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/reorder_modules/ipsum/mod.rs similarity index 100% rename from rustfmt-core/tests/source/configs/reorder_modules/ipsum/mod.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/reorder_modules/ipsum/mod.rs diff --git a/rustfmt-core/tests/source/configs/reorder_modules/lorem/mod.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/reorder_modules/lorem/mod.rs similarity index 100% rename from rustfmt-core/tests/source/configs/reorder_modules/lorem/mod.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/reorder_modules/lorem/mod.rs diff --git a/rustfmt-core/tests/source/configs/reorder_modules/sit/mod.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/reorder_modules/sit/mod.rs similarity index 100% rename from rustfmt-core/tests/source/configs/reorder_modules/sit/mod.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/reorder_modules/sit/mod.rs diff --git a/rustfmt-core/tests/source/configs/reorder_modules/true.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/reorder_modules/true.rs similarity index 100% rename from rustfmt-core/tests/source/configs/reorder_modules/true.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/reorder_modules/true.rs diff --git a/rustfmt-core/tests/source/configs/skip_children/foo/mod.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/skip_children/foo/mod.rs similarity index 100% rename from rustfmt-core/tests/source/configs/skip_children/foo/mod.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/skip_children/foo/mod.rs diff --git a/rustfmt-core/tests/source/configs/skip_children/true.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/skip_children/true.rs similarity index 100% rename from rustfmt-core/tests/source/configs/skip_children/true.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/skip_children/true.rs diff --git a/rustfmt-core/tests/source/configs/space_before_colon/true.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/space_before_colon/true.rs similarity index 100% rename from rustfmt-core/tests/source/configs/space_before_colon/true.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/space_before_colon/true.rs diff --git a/rustfmt-core/tests/source/configs/spaces_around_ranges/false.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/spaces_around_ranges/false.rs similarity index 100% rename from rustfmt-core/tests/source/configs/spaces_around_ranges/false.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/spaces_around_ranges/false.rs diff --git a/rustfmt-core/tests/source/configs/spaces_around_ranges/true.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/spaces_around_ranges/true.rs similarity index 100% rename from rustfmt-core/tests/source/configs/spaces_around_ranges/true.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/spaces_around_ranges/true.rs diff --git a/rustfmt-core/tests/source/configs/struct_field_align_threshold/20.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/struct_field_align_threshold/20.rs similarity index 100% rename from rustfmt-core/tests/source/configs/struct_field_align_threshold/20.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/struct_field_align_threshold/20.rs diff --git a/rustfmt-core/tests/source/configs/struct_lit_single_line/false.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/struct_lit_single_line/false.rs similarity index 100% rename from rustfmt-core/tests/source/configs/struct_lit_single_line/false.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/struct_lit_single_line/false.rs diff --git a/rustfmt-core/tests/source/configs/tab_spaces/2.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/tab_spaces/2.rs similarity index 100% rename from rustfmt-core/tests/source/configs/tab_spaces/2.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/tab_spaces/2.rs diff --git a/rustfmt-core/tests/source/configs/tab_spaces/4.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/tab_spaces/4.rs similarity index 100% rename from rustfmt-core/tests/source/configs/tab_spaces/4.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/tab_spaces/4.rs diff --git a/rustfmt-core/tests/source/configs/trailing_comma/always.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/trailing_comma/always.rs similarity index 100% rename from rustfmt-core/tests/source/configs/trailing_comma/always.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/trailing_comma/always.rs diff --git a/rustfmt-core/tests/source/configs/trailing_comma/never.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/trailing_comma/never.rs similarity index 100% rename from rustfmt-core/tests/source/configs/trailing_comma/never.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/trailing_comma/never.rs diff --git a/rustfmt-core/tests/source/configs/trailing_comma/vertical.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/trailing_comma/vertical.rs similarity index 100% rename from rustfmt-core/tests/source/configs/trailing_comma/vertical.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/trailing_comma/vertical.rs diff --git a/rustfmt-core/tests/source/configs/type_punctuation_density/compressed.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/type_punctuation_density/compressed.rs similarity index 100% rename from rustfmt-core/tests/source/configs/type_punctuation_density/compressed.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/type_punctuation_density/compressed.rs diff --git a/rustfmt-core/tests/source/configs/type_punctuation_density/wide.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/type_punctuation_density/wide.rs similarity index 100% rename from rustfmt-core/tests/source/configs/type_punctuation_density/wide.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/type_punctuation_density/wide.rs diff --git a/rustfmt-core/tests/source/configs/use_field_init_shorthand/false.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/use_field_init_shorthand/false.rs similarity index 100% rename from rustfmt-core/tests/source/configs/use_field_init_shorthand/false.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/use_field_init_shorthand/false.rs diff --git a/rustfmt-core/tests/source/configs/use_field_init_shorthand/true.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/use_field_init_shorthand/true.rs similarity index 100% rename from rustfmt-core/tests/source/configs/use_field_init_shorthand/true.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/use_field_init_shorthand/true.rs diff --git a/rustfmt-core/tests/source/configs/use_small_heuristics/max.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/use_small_heuristics/max.rs similarity index 100% rename from rustfmt-core/tests/source/configs/use_small_heuristics/max.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/use_small_heuristics/max.rs diff --git a/rustfmt-core/tests/source/configs/use_try_shorthand/false.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/use_try_shorthand/false.rs similarity index 100% rename from rustfmt-core/tests/source/configs/use_try_shorthand/false.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/use_try_shorthand/false.rs diff --git a/rustfmt-core/tests/source/configs/use_try_shorthand/true.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/use_try_shorthand/true.rs similarity index 100% rename from rustfmt-core/tests/source/configs/use_try_shorthand/true.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/use_try_shorthand/true.rs diff --git a/rustfmt-core/tests/source/configs/use_try_shorthand/true_2015_edition.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/use_try_shorthand/true_2015_edition.rs similarity index 100% rename from rustfmt-core/tests/source/configs/use_try_shorthand/true_2015_edition.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/use_try_shorthand/true_2015_edition.rs diff --git a/rustfmt-core/tests/source/configs/where_single_line/true.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/where_single_line/true.rs similarity index 100% rename from rustfmt-core/tests/source/configs/where_single_line/true.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/where_single_line/true.rs diff --git a/rustfmt-core/tests/source/configs/wrap_comments/false.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/wrap_comments/false.rs similarity index 100% rename from rustfmt-core/tests/source/configs/wrap_comments/false.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/wrap_comments/false.rs diff --git a/rustfmt-core/tests/source/configs/wrap_comments/true.rs b/rustfmt-lib/rustfmt-core/tests/source/configs/wrap_comments/true.rs similarity index 100% rename from rustfmt-core/tests/source/configs/wrap_comments/true.rs rename to rustfmt-lib/rustfmt-core/tests/source/configs/wrap_comments/true.rs diff --git a/rustfmt-core/tests/source/const_generics.rs b/rustfmt-lib/rustfmt-core/tests/source/const_generics.rs similarity index 100% rename from rustfmt-core/tests/source/const_generics.rs rename to rustfmt-lib/rustfmt-core/tests/source/const_generics.rs diff --git a/rustfmt-core/tests/source/control-brace-style-always-next-line.rs b/rustfmt-lib/rustfmt-core/tests/source/control-brace-style-always-next-line.rs similarity index 100% rename from rustfmt-core/tests/source/control-brace-style-always-next-line.rs rename to rustfmt-lib/rustfmt-core/tests/source/control-brace-style-always-next-line.rs diff --git a/rustfmt-core/tests/source/control-brace-style-always-same-line.rs b/rustfmt-lib/rustfmt-core/tests/source/control-brace-style-always-same-line.rs similarity index 100% rename from rustfmt-core/tests/source/control-brace-style-always-same-line.rs rename to rustfmt-lib/rustfmt-core/tests/source/control-brace-style-always-same-line.rs diff --git a/rustfmt-core/tests/source/doc-attrib.rs b/rustfmt-lib/rustfmt-core/tests/source/doc-attrib.rs similarity index 100% rename from rustfmt-core/tests/source/doc-attrib.rs rename to rustfmt-lib/rustfmt-core/tests/source/doc-attrib.rs diff --git a/rustfmt-core/tests/source/doc-comment-with-example.rs b/rustfmt-lib/rustfmt-core/tests/source/doc-comment-with-example.rs similarity index 100% rename from rustfmt-core/tests/source/doc-comment-with-example.rs rename to rustfmt-lib/rustfmt-core/tests/source/doc-comment-with-example.rs diff --git a/rustfmt-core/tests/source/doc.rs b/rustfmt-lib/rustfmt-core/tests/source/doc.rs similarity index 100% rename from rustfmt-core/tests/source/doc.rs rename to rustfmt-lib/rustfmt-core/tests/source/doc.rs diff --git a/rustfmt-core/tests/source/dyn_trait.rs b/rustfmt-lib/rustfmt-core/tests/source/dyn_trait.rs similarity index 100% rename from rustfmt-core/tests/source/dyn_trait.rs rename to rustfmt-lib/rustfmt-core/tests/source/dyn_trait.rs diff --git a/rustfmt-core/tests/source/else-if-brace-style-always-next-line.rs b/rustfmt-lib/rustfmt-core/tests/source/else-if-brace-style-always-next-line.rs similarity index 100% rename from rustfmt-core/tests/source/else-if-brace-style-always-next-line.rs rename to rustfmt-lib/rustfmt-core/tests/source/else-if-brace-style-always-next-line.rs diff --git a/rustfmt-core/tests/source/else-if-brace-style-always-same-line.rs b/rustfmt-lib/rustfmt-core/tests/source/else-if-brace-style-always-same-line.rs similarity index 100% rename from rustfmt-core/tests/source/else-if-brace-style-always-same-line.rs rename to rustfmt-lib/rustfmt-core/tests/source/else-if-brace-style-always-same-line.rs diff --git a/rustfmt-core/tests/source/else-if-brace-style-closing-next-line.rs b/rustfmt-lib/rustfmt-core/tests/source/else-if-brace-style-closing-next-line.rs similarity index 100% rename from rustfmt-core/tests/source/else-if-brace-style-closing-next-line.rs rename to rustfmt-lib/rustfmt-core/tests/source/else-if-brace-style-closing-next-line.rs diff --git a/rustfmt-core/tests/source/empty_file.rs b/rustfmt-lib/rustfmt-core/tests/source/empty_file.rs similarity index 100% rename from rustfmt-core/tests/source/empty_file.rs rename to rustfmt-lib/rustfmt-core/tests/source/empty_file.rs diff --git a/rustfmt-core/tests/source/enum.rs b/rustfmt-lib/rustfmt-core/tests/source/enum.rs similarity index 100% rename from rustfmt-core/tests/source/enum.rs rename to rustfmt-lib/rustfmt-core/tests/source/enum.rs diff --git a/rustfmt-core/tests/source/existential_type.rs b/rustfmt-lib/rustfmt-core/tests/source/existential_type.rs similarity index 100% rename from rustfmt-core/tests/source/existential_type.rs rename to rustfmt-lib/rustfmt-core/tests/source/existential_type.rs diff --git a/rustfmt-core/tests/source/expr-block.rs b/rustfmt-lib/rustfmt-core/tests/source/expr-block.rs similarity index 100% rename from rustfmt-core/tests/source/expr-block.rs rename to rustfmt-lib/rustfmt-core/tests/source/expr-block.rs diff --git a/rustfmt-core/tests/source/expr-overflow-delimited.rs b/rustfmt-lib/rustfmt-core/tests/source/expr-overflow-delimited.rs similarity index 100% rename from rustfmt-core/tests/source/expr-overflow-delimited.rs rename to rustfmt-lib/rustfmt-core/tests/source/expr-overflow-delimited.rs diff --git a/rustfmt-core/tests/source/expr.rs b/rustfmt-lib/rustfmt-core/tests/source/expr.rs similarity index 100% rename from rustfmt-core/tests/source/expr.rs rename to rustfmt-lib/rustfmt-core/tests/source/expr.rs diff --git a/rustfmt-core/tests/source/extern.rs b/rustfmt-lib/rustfmt-core/tests/source/extern.rs similarity index 100% rename from rustfmt-core/tests/source/extern.rs rename to rustfmt-lib/rustfmt-core/tests/source/extern.rs diff --git a/rustfmt-core/tests/source/extern_not_explicit.rs b/rustfmt-lib/rustfmt-core/tests/source/extern_not_explicit.rs similarity index 100% rename from rustfmt-core/tests/source/extern_not_explicit.rs rename to rustfmt-lib/rustfmt-core/tests/source/extern_not_explicit.rs diff --git a/rustfmt-core/tests/source/file-lines-1.rs b/rustfmt-lib/rustfmt-core/tests/source/file-lines-1.rs similarity index 100% rename from rustfmt-core/tests/source/file-lines-1.rs rename to rustfmt-lib/rustfmt-core/tests/source/file-lines-1.rs diff --git a/rustfmt-core/tests/source/file-lines-2.rs b/rustfmt-lib/rustfmt-core/tests/source/file-lines-2.rs similarity index 100% rename from rustfmt-core/tests/source/file-lines-2.rs rename to rustfmt-lib/rustfmt-core/tests/source/file-lines-2.rs diff --git a/rustfmt-core/tests/source/file-lines-3.rs b/rustfmt-lib/rustfmt-core/tests/source/file-lines-3.rs similarity index 100% rename from rustfmt-core/tests/source/file-lines-3.rs rename to rustfmt-lib/rustfmt-core/tests/source/file-lines-3.rs diff --git a/rustfmt-core/tests/source/file-lines-4.rs b/rustfmt-lib/rustfmt-core/tests/source/file-lines-4.rs similarity index 100% rename from rustfmt-core/tests/source/file-lines-4.rs rename to rustfmt-lib/rustfmt-core/tests/source/file-lines-4.rs diff --git a/rustfmt-core/tests/source/file-lines-5.rs b/rustfmt-lib/rustfmt-core/tests/source/file-lines-5.rs similarity index 100% rename from rustfmt-core/tests/source/file-lines-5.rs rename to rustfmt-lib/rustfmt-core/tests/source/file-lines-5.rs diff --git a/rustfmt-core/tests/source/file-lines-6.rs b/rustfmt-lib/rustfmt-core/tests/source/file-lines-6.rs similarity index 100% rename from rustfmt-core/tests/source/file-lines-6.rs rename to rustfmt-lib/rustfmt-core/tests/source/file-lines-6.rs diff --git a/rustfmt-core/tests/source/file-lines-7.rs b/rustfmt-lib/rustfmt-core/tests/source/file-lines-7.rs similarity index 100% rename from rustfmt-core/tests/source/file-lines-7.rs rename to rustfmt-lib/rustfmt-core/tests/source/file-lines-7.rs diff --git a/rustfmt-core/tests/source/file-lines-8.rs b/rustfmt-lib/rustfmt-core/tests/source/file-lines-8.rs similarity index 100% rename from rustfmt-core/tests/source/file-lines-8.rs rename to rustfmt-lib/rustfmt-core/tests/source/file-lines-8.rs diff --git a/rustfmt-core/tests/source/file-lines-item.rs b/rustfmt-lib/rustfmt-core/tests/source/file-lines-item.rs similarity index 100% rename from rustfmt-core/tests/source/file-lines-item.rs rename to rustfmt-lib/rustfmt-core/tests/source/file-lines-item.rs diff --git a/rustfmt-core/tests/source/fn-custom-2.rs b/rustfmt-lib/rustfmt-core/tests/source/fn-custom-2.rs similarity index 100% rename from rustfmt-core/tests/source/fn-custom-2.rs rename to rustfmt-lib/rustfmt-core/tests/source/fn-custom-2.rs diff --git a/rustfmt-core/tests/source/fn-custom-3.rs b/rustfmt-lib/rustfmt-core/tests/source/fn-custom-3.rs similarity index 100% rename from rustfmt-core/tests/source/fn-custom-3.rs rename to rustfmt-lib/rustfmt-core/tests/source/fn-custom-3.rs diff --git a/rustfmt-core/tests/source/fn-custom-4.rs b/rustfmt-lib/rustfmt-core/tests/source/fn-custom-4.rs similarity index 100% rename from rustfmt-core/tests/source/fn-custom-4.rs rename to rustfmt-lib/rustfmt-core/tests/source/fn-custom-4.rs diff --git a/rustfmt-core/tests/source/fn-custom-6.rs b/rustfmt-lib/rustfmt-core/tests/source/fn-custom-6.rs similarity index 100% rename from rustfmt-core/tests/source/fn-custom-6.rs rename to rustfmt-lib/rustfmt-core/tests/source/fn-custom-6.rs diff --git a/rustfmt-core/tests/source/fn-custom-7.rs b/rustfmt-lib/rustfmt-core/tests/source/fn-custom-7.rs similarity index 100% rename from rustfmt-core/tests/source/fn-custom-7.rs rename to rustfmt-lib/rustfmt-core/tests/source/fn-custom-7.rs diff --git a/rustfmt-core/tests/source/fn-custom-8.rs b/rustfmt-lib/rustfmt-core/tests/source/fn-custom-8.rs similarity index 100% rename from rustfmt-core/tests/source/fn-custom-8.rs rename to rustfmt-lib/rustfmt-core/tests/source/fn-custom-8.rs diff --git a/rustfmt-core/tests/source/fn-custom.rs b/rustfmt-lib/rustfmt-core/tests/source/fn-custom.rs similarity index 100% rename from rustfmt-core/tests/source/fn-custom.rs rename to rustfmt-lib/rustfmt-core/tests/source/fn-custom.rs diff --git a/rustfmt-core/tests/source/fn-param-attributes.rs b/rustfmt-lib/rustfmt-core/tests/source/fn-param-attributes.rs similarity index 100% rename from rustfmt-core/tests/source/fn-param-attributes.rs rename to rustfmt-lib/rustfmt-core/tests/source/fn-param-attributes.rs diff --git a/rustfmt-core/tests/source/fn-simple.rs b/rustfmt-lib/rustfmt-core/tests/source/fn-simple.rs similarity index 100% rename from rustfmt-core/tests/source/fn-simple.rs rename to rustfmt-lib/rustfmt-core/tests/source/fn-simple.rs diff --git a/rustfmt-core/tests/source/fn-single-line/version_two.rs b/rustfmt-lib/rustfmt-core/tests/source/fn-single-line/version_two.rs similarity index 100% rename from rustfmt-core/tests/source/fn-single-line/version_two.rs rename to rustfmt-lib/rustfmt-core/tests/source/fn-single-line/version_two.rs diff --git a/rustfmt-core/tests/source/fn_args_indent-block.rs b/rustfmt-lib/rustfmt-core/tests/source/fn_args_indent-block.rs similarity index 100% rename from rustfmt-core/tests/source/fn_args_indent-block.rs rename to rustfmt-lib/rustfmt-core/tests/source/fn_args_indent-block.rs diff --git a/rustfmt-core/tests/source/fn_args_layout-vertical.rs b/rustfmt-lib/rustfmt-core/tests/source/fn_args_layout-vertical.rs similarity index 100% rename from rustfmt-core/tests/source/fn_args_layout-vertical.rs rename to rustfmt-lib/rustfmt-core/tests/source/fn_args_layout-vertical.rs diff --git a/rustfmt-core/tests/source/hard-tabs.rs b/rustfmt-lib/rustfmt-core/tests/source/hard-tabs.rs similarity index 100% rename from rustfmt-core/tests/source/hard-tabs.rs rename to rustfmt-lib/rustfmt-core/tests/source/hard-tabs.rs diff --git a/rustfmt-core/tests/source/hello.rs b/rustfmt-lib/rustfmt-core/tests/source/hello.rs similarity index 100% rename from rustfmt-core/tests/source/hello.rs rename to rustfmt-lib/rustfmt-core/tests/source/hello.rs diff --git a/rustfmt-core/tests/source/hello2.rs b/rustfmt-lib/rustfmt-core/tests/source/hello2.rs similarity index 100% rename from rustfmt-core/tests/source/hello2.rs rename to rustfmt-lib/rustfmt-core/tests/source/hello2.rs diff --git a/rustfmt-core/tests/source/if_while_or_patterns.rs b/rustfmt-lib/rustfmt-core/tests/source/if_while_or_patterns.rs similarity index 100% rename from rustfmt-core/tests/source/if_while_or_patterns.rs rename to rustfmt-lib/rustfmt-core/tests/source/if_while_or_patterns.rs diff --git a/rustfmt-core/tests/source/immovable_generators.rs b/rustfmt-lib/rustfmt-core/tests/source/immovable_generators.rs similarity index 100% rename from rustfmt-core/tests/source/immovable_generators.rs rename to rustfmt-lib/rustfmt-core/tests/source/immovable_generators.rs diff --git a/rustfmt-core/tests/source/impls.rs b/rustfmt-lib/rustfmt-core/tests/source/impls.rs similarity index 100% rename from rustfmt-core/tests/source/impls.rs rename to rustfmt-lib/rustfmt-core/tests/source/impls.rs diff --git a/rustfmt-core/tests/source/imports-impl-only-use.rs b/rustfmt-lib/rustfmt-core/tests/source/imports-impl-only-use.rs similarity index 100% rename from rustfmt-core/tests/source/imports-impl-only-use.rs rename to rustfmt-lib/rustfmt-core/tests/source/imports-impl-only-use.rs diff --git a/rustfmt-core/tests/source/imports-reorder-lines-and-items.rs b/rustfmt-lib/rustfmt-core/tests/source/imports-reorder-lines-and-items.rs similarity index 100% rename from rustfmt-core/tests/source/imports-reorder-lines-and-items.rs rename to rustfmt-lib/rustfmt-core/tests/source/imports-reorder-lines-and-items.rs diff --git a/rustfmt-core/tests/source/imports-reorder-lines.rs b/rustfmt-lib/rustfmt-core/tests/source/imports-reorder-lines.rs similarity index 100% rename from rustfmt-core/tests/source/imports-reorder-lines.rs rename to rustfmt-lib/rustfmt-core/tests/source/imports-reorder-lines.rs diff --git a/rustfmt-core/tests/source/imports-reorder.rs b/rustfmt-lib/rustfmt-core/tests/source/imports-reorder.rs similarity index 100% rename from rustfmt-core/tests/source/imports-reorder.rs rename to rustfmt-lib/rustfmt-core/tests/source/imports-reorder.rs diff --git a/rustfmt-core/tests/source/imports.rs b/rustfmt-lib/rustfmt-core/tests/source/imports.rs similarity index 100% rename from rustfmt-core/tests/source/imports.rs rename to rustfmt-lib/rustfmt-core/tests/source/imports.rs diff --git a/rustfmt-core/tests/source/imports_2015_edition.rs b/rustfmt-lib/rustfmt-core/tests/source/imports_2015_edition.rs similarity index 100% rename from rustfmt-core/tests/source/imports_2015_edition.rs rename to rustfmt-lib/rustfmt-core/tests/source/imports_2015_edition.rs diff --git a/rustfmt-core/tests/source/imports_block_indent.rs b/rustfmt-lib/rustfmt-core/tests/source/imports_block_indent.rs similarity index 100% rename from rustfmt-core/tests/source/imports_block_indent.rs rename to rustfmt-lib/rustfmt-core/tests/source/imports_block_indent.rs diff --git a/rustfmt-core/tests/source/imports_raw_identifiers.rs b/rustfmt-lib/rustfmt-core/tests/source/imports_raw_identifiers.rs similarity index 100% rename from rustfmt-core/tests/source/imports_raw_identifiers.rs rename to rustfmt-lib/rustfmt-core/tests/source/imports_raw_identifiers.rs diff --git a/rustfmt-core/tests/source/invalid-rust-code-in-doc-comment.rs b/rustfmt-lib/rustfmt-core/tests/source/invalid-rust-code-in-doc-comment.rs similarity index 100% rename from rustfmt-core/tests/source/invalid-rust-code-in-doc-comment.rs rename to rustfmt-lib/rustfmt-core/tests/source/invalid-rust-code-in-doc-comment.rs diff --git a/rustfmt-core/tests/source/issue-1021.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-1021.rs similarity index 100% rename from rustfmt-core/tests/source/issue-1021.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-1021.rs diff --git a/rustfmt-core/tests/source/issue-1049.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-1049.rs similarity index 100% rename from rustfmt-core/tests/source/issue-1049.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-1049.rs diff --git a/rustfmt-core/tests/source/issue-1111.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-1111.rs similarity index 100% rename from rustfmt-core/tests/source/issue-1111.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-1111.rs diff --git a/rustfmt-core/tests/source/issue-1120.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-1120.rs similarity index 100% rename from rustfmt-core/tests/source/issue-1120.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-1120.rs diff --git a/rustfmt-core/tests/source/issue-1124.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-1124.rs similarity index 100% rename from rustfmt-core/tests/source/issue-1124.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-1124.rs diff --git a/rustfmt-core/tests/source/issue-1127.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-1127.rs similarity index 100% rename from rustfmt-core/tests/source/issue-1127.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-1127.rs diff --git a/rustfmt-core/tests/source/issue-1158.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-1158.rs similarity index 100% rename from rustfmt-core/tests/source/issue-1158.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-1158.rs diff --git a/rustfmt-core/tests/source/issue-1177.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-1177.rs similarity index 100% rename from rustfmt-core/tests/source/issue-1177.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-1177.rs diff --git a/rustfmt-core/tests/source/issue-1192.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-1192.rs similarity index 100% rename from rustfmt-core/tests/source/issue-1192.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-1192.rs diff --git a/rustfmt-core/tests/source/issue-1210/a.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-1210/a.rs similarity index 100% rename from rustfmt-core/tests/source/issue-1210/a.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-1210/a.rs diff --git a/rustfmt-core/tests/source/issue-1210/b.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-1210/b.rs similarity index 100% rename from rustfmt-core/tests/source/issue-1210/b.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-1210/b.rs diff --git a/rustfmt-core/tests/source/issue-1210/c.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-1210/c.rs similarity index 100% rename from rustfmt-core/tests/source/issue-1210/c.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-1210/c.rs diff --git a/rustfmt-core/tests/source/issue-1210/d.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-1210/d.rs similarity index 100% rename from rustfmt-core/tests/source/issue-1210/d.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-1210/d.rs diff --git a/rustfmt-core/tests/source/issue-1210/e.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-1210/e.rs similarity index 100% rename from rustfmt-core/tests/source/issue-1210/e.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-1210/e.rs diff --git a/rustfmt-core/tests/source/issue-1211.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-1211.rs similarity index 100% rename from rustfmt-core/tests/source/issue-1211.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-1211.rs diff --git a/rustfmt-core/tests/source/issue-1216.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-1216.rs similarity index 100% rename from rustfmt-core/tests/source/issue-1216.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-1216.rs diff --git a/rustfmt-core/tests/source/issue-1239.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-1239.rs similarity index 100% rename from rustfmt-core/tests/source/issue-1239.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-1239.rs diff --git a/rustfmt-core/tests/source/issue-1278.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-1278.rs similarity index 100% rename from rustfmt-core/tests/source/issue-1278.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-1278.rs diff --git a/rustfmt-core/tests/source/issue-1350.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-1350.rs similarity index 100% rename from rustfmt-core/tests/source/issue-1350.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-1350.rs diff --git a/rustfmt-core/tests/source/issue-1366.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-1366.rs similarity index 100% rename from rustfmt-core/tests/source/issue-1366.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-1366.rs diff --git a/rustfmt-core/tests/source/issue-1468.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-1468.rs similarity index 100% rename from rustfmt-core/tests/source/issue-1468.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-1468.rs diff --git a/rustfmt-core/tests/source/issue-1693.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-1693.rs similarity index 100% rename from rustfmt-core/tests/source/issue-1693.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-1693.rs diff --git a/rustfmt-core/tests/source/issue-1800.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-1800.rs similarity index 100% rename from rustfmt-core/tests/source/issue-1800.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-1800.rs diff --git a/rustfmt-core/tests/source/issue-1914.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-1914.rs similarity index 100% rename from rustfmt-core/tests/source/issue-1914.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-1914.rs diff --git a/rustfmt-core/tests/source/issue-2025.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2025.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2025.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2025.rs diff --git a/rustfmt-core/tests/source/issue-2111.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2111.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2111.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2111.rs diff --git a/rustfmt-core/tests/source/issue-2164.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2164.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2164.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2164.rs diff --git a/rustfmt-core/tests/source/issue-2179/two.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2179/two.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2179/two.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2179/two.rs diff --git a/rustfmt-core/tests/source/issue-2256.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2256.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2256.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2256.rs diff --git a/rustfmt-core/tests/source/issue-2342.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2342.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2342.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2342.rs diff --git a/rustfmt-core/tests/source/issue-2445.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2445.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2445.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2445.rs diff --git a/rustfmt-core/tests/source/issue-2446.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2446.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2446.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2446.rs diff --git a/rustfmt-core/tests/source/issue-2479.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2479.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2479.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2479.rs diff --git a/rustfmt-core/tests/source/issue-2482/a.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2482/a.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2482/a.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2482/a.rs diff --git a/rustfmt-core/tests/source/issue-2482/b.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2482/b.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2482/b.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2482/b.rs diff --git a/rustfmt-core/tests/source/issue-2482/c.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2482/c.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2482/c.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2482/c.rs diff --git a/rustfmt-core/tests/source/issue-2496.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2496.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2496.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2496.rs diff --git a/rustfmt-core/tests/source/issue-2520.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2520.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2520.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2520.rs diff --git a/rustfmt-core/tests/source/issue-2523.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2523.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2523.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2523.rs diff --git a/rustfmt-core/tests/source/issue-2582.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2582.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2582.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2582.rs diff --git a/rustfmt-core/tests/source/issue-2641.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2641.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2641.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2641.rs diff --git a/rustfmt-core/tests/source/issue-2644.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2644.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2644.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2644.rs diff --git a/rustfmt-core/tests/source/issue-2728.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2728.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2728.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2728.rs diff --git a/rustfmt-core/tests/source/issue-2761.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2761.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2761.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2761.rs diff --git a/rustfmt-core/tests/source/issue-2794.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2794.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2794.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2794.rs diff --git a/rustfmt-core/tests/source/issue-2835.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2835.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2835.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2835.rs diff --git a/rustfmt-core/tests/source/issue-2863.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2863.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2863.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2863.rs diff --git a/rustfmt-core/tests/source/issue-2869.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2869.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2869.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2869.rs diff --git a/rustfmt-core/tests/source/issue-2896.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2896.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2896.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2896.rs diff --git a/rustfmt-core/tests/source/issue-2917/packed_simd.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2917/packed_simd.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2917/packed_simd.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2917/packed_simd.rs diff --git a/rustfmt-core/tests/source/issue-2922.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2922.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2922.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2922.rs diff --git a/rustfmt-core/tests/source/issue-2927-2.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2927-2.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2927-2.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2927-2.rs diff --git a/rustfmt-core/tests/source/issue-2927.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2927.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2927.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2927.rs diff --git a/rustfmt-core/tests/source/issue-2930.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2930.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2930.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2930.rs diff --git a/rustfmt-core/tests/source/issue-2936.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2936.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2936.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2936.rs diff --git a/rustfmt-core/tests/source/issue-2955.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2955.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2955.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2955.rs diff --git a/rustfmt-core/tests/source/issue-2973.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2973.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2973.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2973.rs diff --git a/rustfmt-core/tests/source/issue-2977/impl.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2977/impl.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2977/impl.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2977/impl.rs diff --git a/rustfmt-core/tests/source/issue-2977/trait.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2977/trait.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2977/trait.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2977/trait.rs diff --git a/rustfmt-core/tests/source/issue-2985.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2985.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2985.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2985.rs diff --git a/rustfmt-core/tests/source/issue-2995.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-2995.rs similarity index 100% rename from rustfmt-core/tests/source/issue-2995.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-2995.rs diff --git a/rustfmt-core/tests/source/issue-3029.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3029.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3029.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3029.rs diff --git a/rustfmt-core/tests/source/issue-3038.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3038.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3038.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3038.rs diff --git a/rustfmt-core/tests/source/issue-3049.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3049.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3049.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3049.rs diff --git a/rustfmt-core/tests/source/issue-3055/original.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3055/original.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3055/original.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3055/original.rs diff --git a/rustfmt-core/tests/source/issue-3059.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3059.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3059.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3059.rs diff --git a/rustfmt-core/tests/source/issue-3066.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3066.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3066.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3066.rs diff --git a/rustfmt-core/tests/source/issue-3131.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3131.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3131.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3131.rs diff --git a/rustfmt-core/tests/source/issue-3153.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3153.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3153.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3153.rs diff --git a/rustfmt-core/tests/source/issue-3170.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3170.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3170.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3170.rs diff --git a/rustfmt-core/tests/source/issue-3194.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3194.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3194.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3194.rs diff --git a/rustfmt-core/tests/source/issue-3198.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3198.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3198.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3198.rs diff --git a/rustfmt-core/tests/source/issue-3213/version_two.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3213/version_two.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3213/version_two.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3213/version_two.rs diff --git a/rustfmt-core/tests/source/issue-3217.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3217.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3217.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3217.rs diff --git a/rustfmt-core/tests/source/issue-3227/two.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3227/two.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3227/two.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3227/two.rs diff --git a/rustfmt-core/tests/source/issue-3234.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3234.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3234.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3234.rs diff --git a/rustfmt-core/tests/source/issue-3241.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3241.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3241.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3241.rs diff --git a/rustfmt-core/tests/source/issue-3253/bar.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3253/bar.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3253/bar.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3253/bar.rs diff --git a/rustfmt-core/tests/source/issue-3253/foo.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3253/foo.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3253/foo.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3253/foo.rs diff --git a/rustfmt-core/tests/source/issue-3253/lib.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3253/lib.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3253/lib.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3253/lib.rs diff --git a/rustfmt-core/tests/source/issue-3253/paths/bar_foo.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3253/paths/bar_foo.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3253/paths/bar_foo.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3253/paths/bar_foo.rs diff --git a/rustfmt-core/tests/source/issue-3253/paths/excluded.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3253/paths/excluded.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3253/paths/excluded.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3253/paths/excluded.rs diff --git a/rustfmt-core/tests/source/issue-3253/paths/foo_bar.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3253/paths/foo_bar.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3253/paths/foo_bar.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3253/paths/foo_bar.rs diff --git a/rustfmt-core/tests/source/issue-3265.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3265.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3265.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3265.rs diff --git a/rustfmt-core/tests/source/issue-3270/two.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3270/two.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3270/two.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3270/two.rs diff --git a/rustfmt-core/tests/source/issue-3272/v2.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3272/v2.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3272/v2.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3272/v2.rs diff --git a/rustfmt-core/tests/source/issue-3278/version_two.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3278/version_two.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3278/version_two.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3278/version_two.rs diff --git a/rustfmt-core/tests/source/issue-3295/two.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3295/two.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3295/two.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3295/two.rs diff --git a/rustfmt-core/tests/source/issue-3302.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3302.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3302.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3302.rs diff --git a/rustfmt-core/tests/source/issue-3343.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3343.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3343.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3343.rs diff --git a/rustfmt-core/tests/source/issue-3423.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3423.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3423.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3423.rs diff --git a/rustfmt-core/tests/source/issue-3434/lib.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3434/lib.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3434/lib.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3434/lib.rs diff --git a/rustfmt-core/tests/source/issue-3434/no_entry.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3434/no_entry.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3434/no_entry.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3434/no_entry.rs diff --git a/rustfmt-core/tests/source/issue-3434/not_skip_macro.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3434/not_skip_macro.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3434/not_skip_macro.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3434/not_skip_macro.rs diff --git a/rustfmt-core/tests/source/issue-3465.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3465.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3465.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3465.rs diff --git a/rustfmt-core/tests/source/issue-3494/crlf.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3494/crlf.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3494/crlf.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3494/crlf.rs diff --git a/rustfmt-core/tests/source/issue-3494/lf.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3494/lf.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3494/lf.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3494/lf.rs diff --git a/rustfmt-core/tests/source/issue-3508.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3508.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3508.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3508.rs diff --git a/rustfmt-core/tests/source/issue-3515.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3515.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3515.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3515.rs diff --git a/rustfmt-core/tests/source/issue-3532.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3532.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3532.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3532.rs diff --git a/rustfmt-core/tests/source/issue-3585/extern_crate.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3585/extern_crate.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3585/extern_crate.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3585/extern_crate.rs diff --git a/rustfmt-core/tests/source/issue-3585/reorder_imports_disabled.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3585/reorder_imports_disabled.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3585/reorder_imports_disabled.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3585/reorder_imports_disabled.rs diff --git a/rustfmt-core/tests/source/issue-3585/reorder_imports_enabled.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3585/reorder_imports_enabled.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3585/reorder_imports_enabled.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3585/reorder_imports_enabled.rs diff --git a/rustfmt-core/tests/source/issue-3585/use.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3585/use.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3585/use.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3585/use.rs diff --git a/rustfmt-core/tests/source/issue-3636.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3636.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3636.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3636.rs diff --git a/rustfmt-core/tests/source/issue-3639.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3639.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3639.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3639.rs diff --git a/rustfmt-core/tests/source/issue-3651.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3651.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3651.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3651.rs diff --git a/rustfmt-core/tests/source/issue-3665/lib.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3665/lib.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3665/lib.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3665/lib.rs diff --git a/rustfmt-core/tests/source/issue-3665/not_skip_attribute.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3665/not_skip_attribute.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3665/not_skip_attribute.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3665/not_skip_attribute.rs diff --git a/rustfmt-core/tests/source/issue-3665/sub_mod.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3665/sub_mod.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3665/sub_mod.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3665/sub_mod.rs diff --git a/rustfmt-core/tests/source/issue-3672.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3672.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3672.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3672.rs diff --git a/rustfmt-core/tests/source/issue-3675.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3675.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3675.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3675.rs diff --git a/rustfmt-core/tests/source/issue-3701/two.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3701/two.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3701/two.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3701/two.rs diff --git a/rustfmt-core/tests/source/issue-3709.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3709.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3709.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3709.rs diff --git a/rustfmt-core/tests/source/issue-3740.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3740.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3740.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3740.rs diff --git a/rustfmt-core/tests/source/issue-3750.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3750.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3750.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3750.rs diff --git a/rustfmt-core/tests/source/issue-3751.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3751.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3751.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3751.rs diff --git a/rustfmt-core/tests/source/issue-3779/ice.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3779/ice.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3779/ice.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3779/ice.rs diff --git a/rustfmt-core/tests/source/issue-3779/lib.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3779/lib.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3779/lib.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3779/lib.rs diff --git a/rustfmt-core/tests/source/issue-3786.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3786.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3786.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3786.rs diff --git a/rustfmt-core/tests/source/issue-3787.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3787.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3787.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3787.rs diff --git a/rustfmt-core/tests/source/issue-3840/version-two_hard-tabs.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3840/version-two_hard-tabs.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3840/version-two_hard-tabs.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3840/version-two_hard-tabs.rs diff --git a/rustfmt-core/tests/source/issue-3840/version-two_soft-tabs.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3840/version-two_soft-tabs.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3840/version-two_soft-tabs.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3840/version-two_soft-tabs.rs diff --git a/rustfmt-core/tests/source/issue-3851.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3851.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3851.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3851.rs diff --git a/rustfmt-core/tests/source/issue-3904/two.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3904/two.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3904/two.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3904/two.rs diff --git a/rustfmt-core/tests/source/issue-3908.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3908.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3908.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3908.rs diff --git a/rustfmt-core/tests/source/issue-3923.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3923.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3923.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3923.rs diff --git a/rustfmt-core/tests/source/issue-3929.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3929.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3929.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3929.rs diff --git a/rustfmt-core/tests/source/issue-3933/imp-a.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3933/imp-a.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3933/imp-a.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3933/imp-a.rs diff --git a/rustfmt-core/tests/source/issue-3933/imp-b.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3933/imp-b.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3933/imp-b.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3933/imp-b.rs diff --git a/rustfmt-core/tests/source/issue-3933/lib.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3933/lib.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3933/lib.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3933/lib.rs diff --git a/rustfmt-core/tests/source/issue-3933/utils.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-3933/utils.rs similarity index 100% rename from rustfmt-core/tests/source/issue-3933/utils.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-3933/utils.rs diff --git a/rustfmt-core/tests/source/issue-447.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-447.rs similarity index 100% rename from rustfmt-core/tests/source/issue-447.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-447.rs diff --git a/rustfmt-core/tests/source/issue-510.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-510.rs similarity index 100% rename from rustfmt-core/tests/source/issue-510.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-510.rs diff --git a/rustfmt-core/tests/source/issue-539.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-539.rs similarity index 100% rename from rustfmt-core/tests/source/issue-539.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-539.rs diff --git a/rustfmt-core/tests/source/issue-683.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-683.rs similarity index 100% rename from rustfmt-core/tests/source/issue-683.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-683.rs diff --git a/rustfmt-core/tests/source/issue-811.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-811.rs similarity index 100% rename from rustfmt-core/tests/source/issue-811.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-811.rs diff --git a/rustfmt-core/tests/source/issue-850.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-850.rs similarity index 100% rename from rustfmt-core/tests/source/issue-850.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-850.rs diff --git a/rustfmt-core/tests/source/issue-855.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-855.rs similarity index 100% rename from rustfmt-core/tests/source/issue-855.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-855.rs diff --git a/rustfmt-core/tests/source/issue-913.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-913.rs similarity index 100% rename from rustfmt-core/tests/source/issue-913.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-913.rs diff --git a/rustfmt-core/tests/source/issue-945.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-945.rs similarity index 100% rename from rustfmt-core/tests/source/issue-945.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-945.rs diff --git a/rustfmt-core/tests/source/issue-977.rs b/rustfmt-lib/rustfmt-core/tests/source/issue-977.rs similarity index 100% rename from rustfmt-core/tests/source/issue-977.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue-977.rs diff --git a/rustfmt-core/tests/source/issue_3839.rs b/rustfmt-lib/rustfmt-core/tests/source/issue_3839.rs similarity index 100% rename from rustfmt-core/tests/source/issue_3839.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue_3839.rs diff --git a/rustfmt-core/tests/source/issue_3844.rs b/rustfmt-lib/rustfmt-core/tests/source/issue_3844.rs similarity index 100% rename from rustfmt-core/tests/source/issue_3844.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue_3844.rs diff --git a/rustfmt-core/tests/source/issue_3853.rs b/rustfmt-lib/rustfmt-core/tests/source/issue_3853.rs similarity index 100% rename from rustfmt-core/tests/source/issue_3853.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue_3853.rs diff --git a/rustfmt-core/tests/source/issue_3868.rs b/rustfmt-lib/rustfmt-core/tests/source/issue_3868.rs similarity index 100% rename from rustfmt-core/tests/source/issue_3868.rs rename to rustfmt-lib/rustfmt-core/tests/source/issue_3868.rs diff --git a/rustfmt-core/tests/source/item-brace-style-always-next-line.rs b/rustfmt-lib/rustfmt-core/tests/source/item-brace-style-always-next-line.rs similarity index 100% rename from rustfmt-core/tests/source/item-brace-style-always-next-line.rs rename to rustfmt-lib/rustfmt-core/tests/source/item-brace-style-always-next-line.rs diff --git a/rustfmt-core/tests/source/item-brace-style-prefer-same-line.rs b/rustfmt-lib/rustfmt-core/tests/source/item-brace-style-prefer-same-line.rs similarity index 100% rename from rustfmt-core/tests/source/item-brace-style-prefer-same-line.rs rename to rustfmt-lib/rustfmt-core/tests/source/item-brace-style-prefer-same-line.rs diff --git a/rustfmt-core/tests/source/item-brace-style-same-line-where.rs b/rustfmt-lib/rustfmt-core/tests/source/item-brace-style-same-line-where.rs similarity index 100% rename from rustfmt-core/tests/source/item-brace-style-same-line-where.rs rename to rustfmt-lib/rustfmt-core/tests/source/item-brace-style-same-line-where.rs diff --git a/rustfmt-core/tests/source/itemized-blocks/no_wrap.rs b/rustfmt-lib/rustfmt-core/tests/source/itemized-blocks/no_wrap.rs similarity index 100% rename from rustfmt-core/tests/source/itemized-blocks/no_wrap.rs rename to rustfmt-lib/rustfmt-core/tests/source/itemized-blocks/no_wrap.rs diff --git a/rustfmt-core/tests/source/itemized-blocks/rewrite_fail.rs b/rustfmt-lib/rustfmt-core/tests/source/itemized-blocks/rewrite_fail.rs similarity index 100% rename from rustfmt-core/tests/source/itemized-blocks/rewrite_fail.rs rename to rustfmt-lib/rustfmt-core/tests/source/itemized-blocks/rewrite_fail.rs diff --git a/rustfmt-core/tests/source/itemized-blocks/urls.rs b/rustfmt-lib/rustfmt-core/tests/source/itemized-blocks/urls.rs similarity index 100% rename from rustfmt-core/tests/source/itemized-blocks/urls.rs rename to rustfmt-lib/rustfmt-core/tests/source/itemized-blocks/urls.rs diff --git a/rustfmt-core/tests/source/itemized-blocks/wrap.rs b/rustfmt-lib/rustfmt-core/tests/source/itemized-blocks/wrap.rs similarity index 100% rename from rustfmt-core/tests/source/itemized-blocks/wrap.rs rename to rustfmt-lib/rustfmt-core/tests/source/itemized-blocks/wrap.rs diff --git a/rustfmt-core/tests/source/label_break.rs b/rustfmt-lib/rustfmt-core/tests/source/label_break.rs similarity index 100% rename from rustfmt-core/tests/source/label_break.rs rename to rustfmt-lib/rustfmt-core/tests/source/label_break.rs diff --git a/rustfmt-core/tests/source/large-block.rs b/rustfmt-lib/rustfmt-core/tests/source/large-block.rs similarity index 100% rename from rustfmt-core/tests/source/large-block.rs rename to rustfmt-lib/rustfmt-core/tests/source/large-block.rs diff --git a/rustfmt-core/tests/source/large_vec.rs b/rustfmt-lib/rustfmt-core/tests/source/large_vec.rs similarity index 100% rename from rustfmt-core/tests/source/large_vec.rs rename to rustfmt-lib/rustfmt-core/tests/source/large_vec.rs diff --git a/rustfmt-core/tests/source/lazy_static.rs b/rustfmt-lib/rustfmt-core/tests/source/lazy_static.rs similarity index 100% rename from rustfmt-core/tests/source/lazy_static.rs rename to rustfmt-lib/rustfmt-core/tests/source/lazy_static.rs diff --git a/rustfmt-core/tests/source/license-templates/empty_license_path.rs b/rustfmt-lib/rustfmt-core/tests/source/license-templates/empty_license_path.rs similarity index 100% rename from rustfmt-core/tests/source/license-templates/empty_license_path.rs rename to rustfmt-lib/rustfmt-core/tests/source/license-templates/empty_license_path.rs diff --git a/rustfmt-core/tests/source/license-templates/license.rs b/rustfmt-lib/rustfmt-core/tests/source/license-templates/license.rs similarity index 100% rename from rustfmt-core/tests/source/license-templates/license.rs rename to rustfmt-lib/rustfmt-core/tests/source/license-templates/license.rs diff --git a/rustfmt-core/tests/source/long-fn-1/version_two.rs b/rustfmt-lib/rustfmt-core/tests/source/long-fn-1/version_two.rs similarity index 100% rename from rustfmt-core/tests/source/long-fn-1/version_two.rs rename to rustfmt-lib/rustfmt-core/tests/source/long-fn-1/version_two.rs diff --git a/rustfmt-core/tests/source/long-match-arms-brace-newline.rs b/rustfmt-lib/rustfmt-core/tests/source/long-match-arms-brace-newline.rs similarity index 100% rename from rustfmt-core/tests/source/long-match-arms-brace-newline.rs rename to rustfmt-lib/rustfmt-core/tests/source/long-match-arms-brace-newline.rs diff --git a/rustfmt-core/tests/source/long-use-statement-issue-3154.rs b/rustfmt-lib/rustfmt-core/tests/source/long-use-statement-issue-3154.rs similarity index 100% rename from rustfmt-core/tests/source/long-use-statement-issue-3154.rs rename to rustfmt-lib/rustfmt-core/tests/source/long-use-statement-issue-3154.rs diff --git a/rustfmt-core/tests/source/long_field_access.rs b/rustfmt-lib/rustfmt-core/tests/source/long_field_access.rs similarity index 100% rename from rustfmt-core/tests/source/long_field_access.rs rename to rustfmt-lib/rustfmt-core/tests/source/long_field_access.rs diff --git a/rustfmt-core/tests/source/loop.rs b/rustfmt-lib/rustfmt-core/tests/source/loop.rs similarity index 100% rename from rustfmt-core/tests/source/loop.rs rename to rustfmt-lib/rustfmt-core/tests/source/loop.rs diff --git a/rustfmt-core/tests/source/macro_not_expr.rs b/rustfmt-lib/rustfmt-core/tests/source/macro_not_expr.rs similarity index 100% rename from rustfmt-core/tests/source/macro_not_expr.rs rename to rustfmt-lib/rustfmt-core/tests/source/macro_not_expr.rs diff --git a/rustfmt-core/tests/source/macro_rules.rs b/rustfmt-lib/rustfmt-core/tests/source/macro_rules.rs similarity index 100% rename from rustfmt-core/tests/source/macro_rules.rs rename to rustfmt-lib/rustfmt-core/tests/source/macro_rules.rs diff --git a/rustfmt-core/tests/source/macros.rs b/rustfmt-lib/rustfmt-core/tests/source/macros.rs similarity index 100% rename from rustfmt-core/tests/source/macros.rs rename to rustfmt-lib/rustfmt-core/tests/source/macros.rs diff --git a/rustfmt-core/tests/source/markdown-comment-with-options.rs b/rustfmt-lib/rustfmt-core/tests/source/markdown-comment-with-options.rs similarity index 100% rename from rustfmt-core/tests/source/markdown-comment-with-options.rs rename to rustfmt-lib/rustfmt-core/tests/source/markdown-comment-with-options.rs diff --git a/rustfmt-core/tests/source/markdown-comment.rs b/rustfmt-lib/rustfmt-core/tests/source/markdown-comment.rs similarity index 100% rename from rustfmt-core/tests/source/markdown-comment.rs rename to rustfmt-lib/rustfmt-core/tests/source/markdown-comment.rs diff --git a/rustfmt-core/tests/source/match-block-trailing-comma.rs b/rustfmt-lib/rustfmt-core/tests/source/match-block-trailing-comma.rs similarity index 100% rename from rustfmt-core/tests/source/match-block-trailing-comma.rs rename to rustfmt-lib/rustfmt-core/tests/source/match-block-trailing-comma.rs diff --git a/rustfmt-core/tests/source/match-flattening.rs b/rustfmt-lib/rustfmt-core/tests/source/match-flattening.rs similarity index 100% rename from rustfmt-core/tests/source/match-flattening.rs rename to rustfmt-lib/rustfmt-core/tests/source/match-flattening.rs diff --git a/rustfmt-core/tests/source/match-nowrap-trailing-comma.rs b/rustfmt-lib/rustfmt-core/tests/source/match-nowrap-trailing-comma.rs similarity index 100% rename from rustfmt-core/tests/source/match-nowrap-trailing-comma.rs rename to rustfmt-lib/rustfmt-core/tests/source/match-nowrap-trailing-comma.rs diff --git a/rustfmt-core/tests/source/match-nowrap.rs b/rustfmt-lib/rustfmt-core/tests/source/match-nowrap.rs similarity index 100% rename from rustfmt-core/tests/source/match-nowrap.rs rename to rustfmt-lib/rustfmt-core/tests/source/match-nowrap.rs diff --git a/rustfmt-core/tests/source/match.rs b/rustfmt-lib/rustfmt-core/tests/source/match.rs similarity index 100% rename from rustfmt-core/tests/source/match.rs rename to rustfmt-lib/rustfmt-core/tests/source/match.rs diff --git a/rustfmt-core/tests/source/match_overflow_expr.rs b/rustfmt-lib/rustfmt-core/tests/source/match_overflow_expr.rs similarity index 100% rename from rustfmt-core/tests/source/match_overflow_expr.rs rename to rustfmt-lib/rustfmt-core/tests/source/match_overflow_expr.rs diff --git a/rustfmt-core/tests/source/max-line-length-in-chars.rs b/rustfmt-lib/rustfmt-core/tests/source/max-line-length-in-chars.rs similarity index 100% rename from rustfmt-core/tests/source/max-line-length-in-chars.rs rename to rustfmt-lib/rustfmt-core/tests/source/max-line-length-in-chars.rs diff --git a/rustfmt-core/tests/source/merge_imports.rs b/rustfmt-lib/rustfmt-core/tests/source/merge_imports.rs similarity index 100% rename from rustfmt-core/tests/source/merge_imports.rs rename to rustfmt-lib/rustfmt-core/tests/source/merge_imports.rs diff --git a/rustfmt-core/tests/source/mod-1.rs b/rustfmt-lib/rustfmt-core/tests/source/mod-1.rs similarity index 100% rename from rustfmt-core/tests/source/mod-1.rs rename to rustfmt-lib/rustfmt-core/tests/source/mod-1.rs diff --git a/rustfmt-core/tests/source/mod-2.rs b/rustfmt-lib/rustfmt-core/tests/source/mod-2.rs similarity index 100% rename from rustfmt-core/tests/source/mod-2.rs rename to rustfmt-lib/rustfmt-core/tests/source/mod-2.rs diff --git a/rustfmt-core/tests/source/mod_skip_child.rs b/rustfmt-lib/rustfmt-core/tests/source/mod_skip_child.rs similarity index 100% rename from rustfmt-core/tests/source/mod_skip_child.rs rename to rustfmt-lib/rustfmt-core/tests/source/mod_skip_child.rs diff --git a/rustfmt-core/tests/source/multiple.rs b/rustfmt-lib/rustfmt-core/tests/source/multiple.rs similarity index 100% rename from rustfmt-core/tests/source/multiple.rs rename to rustfmt-lib/rustfmt-core/tests/source/multiple.rs diff --git a/rustfmt-core/tests/source/nested-if-else.rs b/rustfmt-lib/rustfmt-core/tests/source/nested-if-else.rs similarity index 100% rename from rustfmt-core/tests/source/nested-if-else.rs rename to rustfmt-lib/rustfmt-core/tests/source/nested-if-else.rs diff --git a/rustfmt-core/tests/source/nested_skipped/mod.rs b/rustfmt-lib/rustfmt-core/tests/source/nested_skipped/mod.rs similarity index 100% rename from rustfmt-core/tests/source/nested_skipped/mod.rs rename to rustfmt-lib/rustfmt-core/tests/source/nested_skipped/mod.rs diff --git a/rustfmt-core/tests/source/nestedmod/mod.rs b/rustfmt-lib/rustfmt-core/tests/source/nestedmod/mod.rs similarity index 100% rename from rustfmt-core/tests/source/nestedmod/mod.rs rename to rustfmt-lib/rustfmt-core/tests/source/nestedmod/mod.rs diff --git a/rustfmt-core/tests/source/nestedmod/mod2a.rs b/rustfmt-lib/rustfmt-core/tests/source/nestedmod/mod2a.rs similarity index 100% rename from rustfmt-core/tests/source/nestedmod/mod2a.rs rename to rustfmt-lib/rustfmt-core/tests/source/nestedmod/mod2a.rs diff --git a/rustfmt-core/tests/source/nestedmod/mod2b.rs b/rustfmt-lib/rustfmt-core/tests/source/nestedmod/mod2b.rs similarity index 100% rename from rustfmt-core/tests/source/nestedmod/mod2b.rs rename to rustfmt-lib/rustfmt-core/tests/source/nestedmod/mod2b.rs diff --git a/rustfmt-core/tests/source/nestedmod/mod2c.rs b/rustfmt-lib/rustfmt-core/tests/source/nestedmod/mod2c.rs similarity index 100% rename from rustfmt-core/tests/source/nestedmod/mod2c.rs rename to rustfmt-lib/rustfmt-core/tests/source/nestedmod/mod2c.rs diff --git a/rustfmt-core/tests/source/nestedmod/mymod1/mod3a.rs b/rustfmt-lib/rustfmt-core/tests/source/nestedmod/mymod1/mod3a.rs similarity index 100% rename from rustfmt-core/tests/source/nestedmod/mymod1/mod3a.rs rename to rustfmt-lib/rustfmt-core/tests/source/nestedmod/mymod1/mod3a.rs diff --git a/rustfmt-core/tests/source/nestedmod/submod2/a.rs b/rustfmt-lib/rustfmt-core/tests/source/nestedmod/submod2/a.rs similarity index 100% rename from rustfmt-core/tests/source/nestedmod/submod2/a.rs rename to rustfmt-lib/rustfmt-core/tests/source/nestedmod/submod2/a.rs diff --git a/rustfmt-core/tests/source/nestedmod/submod2/mod.rs b/rustfmt-lib/rustfmt-core/tests/source/nestedmod/submod2/mod.rs similarity index 100% rename from rustfmt-core/tests/source/nestedmod/submod2/mod.rs rename to rustfmt-lib/rustfmt-core/tests/source/nestedmod/submod2/mod.rs diff --git a/rustfmt-core/tests/source/no_arg_with_commnet.rs b/rustfmt-lib/rustfmt-core/tests/source/no_arg_with_commnet.rs similarity index 100% rename from rustfmt-core/tests/source/no_arg_with_commnet.rs rename to rustfmt-lib/rustfmt-core/tests/source/no_arg_with_commnet.rs diff --git a/rustfmt-core/tests/source/no_new_line_beginning.rs b/rustfmt-lib/rustfmt-core/tests/source/no_new_line_beginning.rs similarity index 100% rename from rustfmt-core/tests/source/no_new_line_beginning.rs rename to rustfmt-lib/rustfmt-core/tests/source/no_new_line_beginning.rs diff --git a/rustfmt-core/tests/source/normalize_doc_attributes_should_not_imply_format_doc_comments.rs b/rustfmt-lib/rustfmt-core/tests/source/normalize_doc_attributes_should_not_imply_format_doc_comments.rs similarity index 100% rename from rustfmt-core/tests/source/normalize_doc_attributes_should_not_imply_format_doc_comments.rs rename to rustfmt-lib/rustfmt-core/tests/source/normalize_doc_attributes_should_not_imply_format_doc_comments.rs diff --git a/rustfmt-core/tests/source/normalize_multiline_doc_attribute.rs b/rustfmt-lib/rustfmt-core/tests/source/normalize_multiline_doc_attribute.rs similarity index 100% rename from rustfmt-core/tests/source/normalize_multiline_doc_attribute.rs rename to rustfmt-lib/rustfmt-core/tests/source/normalize_multiline_doc_attribute.rs diff --git a/rustfmt-core/tests/source/one_line_if_v2.rs b/rustfmt-lib/rustfmt-core/tests/source/one_line_if_v2.rs similarity index 100% rename from rustfmt-core/tests/source/one_line_if_v2.rs rename to rustfmt-lib/rustfmt-core/tests/source/one_line_if_v2.rs diff --git a/rustfmt-core/tests/source/other.rs b/rustfmt-lib/rustfmt-core/tests/source/other.rs similarity index 100% rename from rustfmt-core/tests/source/other.rs rename to rustfmt-lib/rustfmt-core/tests/source/other.rs diff --git a/rustfmt-core/tests/source/paren.rs b/rustfmt-lib/rustfmt-core/tests/source/paren.rs similarity index 100% rename from rustfmt-core/tests/source/paren.rs rename to rustfmt-lib/rustfmt-core/tests/source/paren.rs diff --git a/rustfmt-core/tests/source/path_clarity/foo.rs b/rustfmt-lib/rustfmt-core/tests/source/path_clarity/foo.rs similarity index 100% rename from rustfmt-core/tests/source/path_clarity/foo.rs rename to rustfmt-lib/rustfmt-core/tests/source/path_clarity/foo.rs diff --git a/rustfmt-core/tests/source/path_clarity/foo/bar.rs b/rustfmt-lib/rustfmt-core/tests/source/path_clarity/foo/bar.rs similarity index 100% rename from rustfmt-core/tests/source/path_clarity/foo/bar.rs rename to rustfmt-lib/rustfmt-core/tests/source/path_clarity/foo/bar.rs diff --git a/rustfmt-core/tests/source/paths.rs b/rustfmt-lib/rustfmt-core/tests/source/paths.rs similarity index 100% rename from rustfmt-core/tests/source/paths.rs rename to rustfmt-lib/rustfmt-core/tests/source/paths.rs diff --git a/rustfmt-core/tests/source/pattern-condense-wildcards.rs b/rustfmt-lib/rustfmt-core/tests/source/pattern-condense-wildcards.rs similarity index 100% rename from rustfmt-core/tests/source/pattern-condense-wildcards.rs rename to rustfmt-lib/rustfmt-core/tests/source/pattern-condense-wildcards.rs diff --git a/rustfmt-core/tests/source/pattern.rs b/rustfmt-lib/rustfmt-core/tests/source/pattern.rs similarity index 100% rename from rustfmt-core/tests/source/pattern.rs rename to rustfmt-lib/rustfmt-core/tests/source/pattern.rs diff --git a/rustfmt-core/tests/source/preserves_carriage_return_for_unix.rs b/rustfmt-lib/rustfmt-core/tests/source/preserves_carriage_return_for_unix.rs similarity index 100% rename from rustfmt-core/tests/source/preserves_carriage_return_for_unix.rs rename to rustfmt-lib/rustfmt-core/tests/source/preserves_carriage_return_for_unix.rs diff --git a/rustfmt-core/tests/source/preserves_carriage_return_for_windows.rs b/rustfmt-lib/rustfmt-core/tests/source/preserves_carriage_return_for_windows.rs similarity index 100% rename from rustfmt-core/tests/source/preserves_carriage_return_for_windows.rs rename to rustfmt-lib/rustfmt-core/tests/source/preserves_carriage_return_for_windows.rs diff --git a/rustfmt-core/tests/source/pub-restricted.rs b/rustfmt-lib/rustfmt-core/tests/source/pub-restricted.rs similarity index 100% rename from rustfmt-core/tests/source/pub-restricted.rs rename to rustfmt-lib/rustfmt-core/tests/source/pub-restricted.rs diff --git a/rustfmt-core/tests/source/remove_blank_lines.rs b/rustfmt-lib/rustfmt-core/tests/source/remove_blank_lines.rs similarity index 100% rename from rustfmt-core/tests/source/remove_blank_lines.rs rename to rustfmt-lib/rustfmt-core/tests/source/remove_blank_lines.rs diff --git a/rustfmt-core/tests/source/reorder-impl-items.rs b/rustfmt-lib/rustfmt-core/tests/source/reorder-impl-items.rs similarity index 100% rename from rustfmt-core/tests/source/reorder-impl-items.rs rename to rustfmt-lib/rustfmt-core/tests/source/reorder-impl-items.rs diff --git a/rustfmt-core/tests/source/single-line-if-else.rs b/rustfmt-lib/rustfmt-core/tests/source/single-line-if-else.rs similarity index 100% rename from rustfmt-core/tests/source/single-line-if-else.rs rename to rustfmt-lib/rustfmt-core/tests/source/single-line-if-else.rs diff --git a/rustfmt-core/tests/source/single-line-macro/v2.rs b/rustfmt-lib/rustfmt-core/tests/source/single-line-macro/v2.rs similarity index 100% rename from rustfmt-core/tests/source/single-line-macro/v2.rs rename to rustfmt-lib/rustfmt-core/tests/source/single-line-macro/v2.rs diff --git a/rustfmt-core/tests/source/soft-wrapping.rs b/rustfmt-lib/rustfmt-core/tests/source/soft-wrapping.rs similarity index 100% rename from rustfmt-core/tests/source/soft-wrapping.rs rename to rustfmt-lib/rustfmt-core/tests/source/soft-wrapping.rs diff --git a/rustfmt-core/tests/source/space-not-before-newline.rs b/rustfmt-lib/rustfmt-core/tests/source/space-not-before-newline.rs similarity index 100% rename from rustfmt-core/tests/source/space-not-before-newline.rs rename to rustfmt-lib/rustfmt-core/tests/source/space-not-before-newline.rs diff --git a/rustfmt-core/tests/source/spaces-around-ranges.rs b/rustfmt-lib/rustfmt-core/tests/source/spaces-around-ranges.rs similarity index 100% rename from rustfmt-core/tests/source/spaces-around-ranges.rs rename to rustfmt-lib/rustfmt-core/tests/source/spaces-around-ranges.rs diff --git a/rustfmt-core/tests/source/static.rs b/rustfmt-lib/rustfmt-core/tests/source/static.rs similarity index 100% rename from rustfmt-core/tests/source/static.rs rename to rustfmt-lib/rustfmt-core/tests/source/static.rs diff --git a/rustfmt-core/tests/source/string-lit-2.rs b/rustfmt-lib/rustfmt-core/tests/source/string-lit-2.rs similarity index 100% rename from rustfmt-core/tests/source/string-lit-2.rs rename to rustfmt-lib/rustfmt-core/tests/source/string-lit-2.rs diff --git a/rustfmt-core/tests/source/string-lit.rs b/rustfmt-lib/rustfmt-core/tests/source/string-lit.rs similarity index 100% rename from rustfmt-core/tests/source/string-lit.rs rename to rustfmt-lib/rustfmt-core/tests/source/string-lit.rs diff --git a/rustfmt-core/tests/source/string_punctuation.rs b/rustfmt-lib/rustfmt-core/tests/source/string_punctuation.rs similarity index 100% rename from rustfmt-core/tests/source/string_punctuation.rs rename to rustfmt-lib/rustfmt-core/tests/source/string_punctuation.rs diff --git a/rustfmt-core/tests/source/struct-field-attributes.rs b/rustfmt-lib/rustfmt-core/tests/source/struct-field-attributes.rs similarity index 100% rename from rustfmt-core/tests/source/struct-field-attributes.rs rename to rustfmt-lib/rustfmt-core/tests/source/struct-field-attributes.rs diff --git a/rustfmt-core/tests/source/struct_lits.rs b/rustfmt-lib/rustfmt-core/tests/source/struct_lits.rs similarity index 100% rename from rustfmt-core/tests/source/struct_lits.rs rename to rustfmt-lib/rustfmt-core/tests/source/struct_lits.rs diff --git a/rustfmt-core/tests/source/struct_lits_multiline.rs b/rustfmt-lib/rustfmt-core/tests/source/struct_lits_multiline.rs similarity index 100% rename from rustfmt-core/tests/source/struct_lits_multiline.rs rename to rustfmt-lib/rustfmt-core/tests/source/struct_lits_multiline.rs diff --git a/rustfmt-core/tests/source/struct_lits_visual.rs b/rustfmt-lib/rustfmt-core/tests/source/struct_lits_visual.rs similarity index 100% rename from rustfmt-core/tests/source/struct_lits_visual.rs rename to rustfmt-lib/rustfmt-core/tests/source/struct_lits_visual.rs diff --git a/rustfmt-core/tests/source/struct_lits_visual_multiline.rs b/rustfmt-lib/rustfmt-core/tests/source/struct_lits_visual_multiline.rs similarity index 100% rename from rustfmt-core/tests/source/struct_lits_visual_multiline.rs rename to rustfmt-lib/rustfmt-core/tests/source/struct_lits_visual_multiline.rs diff --git a/rustfmt-core/tests/source/struct_tuple_visual.rs b/rustfmt-lib/rustfmt-core/tests/source/struct_tuple_visual.rs similarity index 100% rename from rustfmt-core/tests/source/struct_tuple_visual.rs rename to rustfmt-lib/rustfmt-core/tests/source/struct_tuple_visual.rs diff --git a/rustfmt-core/tests/source/structs.rs b/rustfmt-lib/rustfmt-core/tests/source/structs.rs similarity index 100% rename from rustfmt-core/tests/source/structs.rs rename to rustfmt-lib/rustfmt-core/tests/source/structs.rs diff --git a/rustfmt-core/tests/source/trailing-comma-never.rs b/rustfmt-lib/rustfmt-core/tests/source/trailing-comma-never.rs similarity index 100% rename from rustfmt-core/tests/source/trailing-comma-never.rs rename to rustfmt-lib/rustfmt-core/tests/source/trailing-comma-never.rs diff --git a/rustfmt-core/tests/source/trailing_commas.rs b/rustfmt-lib/rustfmt-core/tests/source/trailing_commas.rs similarity index 100% rename from rustfmt-core/tests/source/trailing_commas.rs rename to rustfmt-lib/rustfmt-core/tests/source/trailing_commas.rs diff --git a/rustfmt-core/tests/source/trailing_comments/hard_tabs.rs b/rustfmt-lib/rustfmt-core/tests/source/trailing_comments/hard_tabs.rs similarity index 100% rename from rustfmt-core/tests/source/trailing_comments/hard_tabs.rs rename to rustfmt-lib/rustfmt-core/tests/source/trailing_comments/hard_tabs.rs diff --git a/rustfmt-core/tests/source/trailing_comments/soft_tabs.rs b/rustfmt-lib/rustfmt-core/tests/source/trailing_comments/soft_tabs.rs similarity index 100% rename from rustfmt-core/tests/source/trailing_comments/soft_tabs.rs rename to rustfmt-lib/rustfmt-core/tests/source/trailing_comments/soft_tabs.rs diff --git a/rustfmt-core/tests/source/trait.rs b/rustfmt-lib/rustfmt-core/tests/source/trait.rs similarity index 100% rename from rustfmt-core/tests/source/trait.rs rename to rustfmt-lib/rustfmt-core/tests/source/trait.rs diff --git a/rustfmt-core/tests/source/trait_2015_edition.rs b/rustfmt-lib/rustfmt-core/tests/source/trait_2015_edition.rs similarity index 100% rename from rustfmt-core/tests/source/trait_2015_edition.rs rename to rustfmt-lib/rustfmt-core/tests/source/trait_2015_edition.rs diff --git a/rustfmt-core/tests/source/try-conversion.rs b/rustfmt-lib/rustfmt-core/tests/source/try-conversion.rs similarity index 100% rename from rustfmt-core/tests/source/try-conversion.rs rename to rustfmt-lib/rustfmt-core/tests/source/try-conversion.rs diff --git a/rustfmt-core/tests/source/tuple.rs b/rustfmt-lib/rustfmt-core/tests/source/tuple.rs similarity index 100% rename from rustfmt-core/tests/source/tuple.rs rename to rustfmt-lib/rustfmt-core/tests/source/tuple.rs diff --git a/rustfmt-core/tests/source/type-ascription.rs b/rustfmt-lib/rustfmt-core/tests/source/type-ascription.rs similarity index 100% rename from rustfmt-core/tests/source/type-ascription.rs rename to rustfmt-lib/rustfmt-core/tests/source/type-ascription.rs diff --git a/rustfmt-core/tests/source/type.rs b/rustfmt-lib/rustfmt-core/tests/source/type.rs similarity index 100% rename from rustfmt-core/tests/source/type.rs rename to rustfmt-lib/rustfmt-core/tests/source/type.rs diff --git a/rustfmt-core/tests/source/type_alias.rs b/rustfmt-lib/rustfmt-core/tests/source/type_alias.rs similarity index 100% rename from rustfmt-core/tests/source/type_alias.rs rename to rustfmt-lib/rustfmt-core/tests/source/type_alias.rs diff --git a/rustfmt-core/tests/source/unicode.rs b/rustfmt-lib/rustfmt-core/tests/source/unicode.rs similarity index 100% rename from rustfmt-core/tests/source/unicode.rs rename to rustfmt-lib/rustfmt-core/tests/source/unicode.rs diff --git a/rustfmt-core/tests/source/unions.rs b/rustfmt-lib/rustfmt-core/tests/source/unions.rs similarity index 100% rename from rustfmt-core/tests/source/unions.rs rename to rustfmt-lib/rustfmt-core/tests/source/unions.rs diff --git a/rustfmt-core/tests/source/visibility.rs b/rustfmt-lib/rustfmt-core/tests/source/visibility.rs similarity index 100% rename from rustfmt-core/tests/source/visibility.rs rename to rustfmt-lib/rustfmt-core/tests/source/visibility.rs diff --git a/rustfmt-core/tests/source/visual-fn-type.rs b/rustfmt-lib/rustfmt-core/tests/source/visual-fn-type.rs similarity index 100% rename from rustfmt-core/tests/source/visual-fn-type.rs rename to rustfmt-lib/rustfmt-core/tests/source/visual-fn-type.rs diff --git a/rustfmt-core/tests/source/where-clause-rfc.rs b/rustfmt-lib/rustfmt-core/tests/source/where-clause-rfc.rs similarity index 100% rename from rustfmt-core/tests/source/where-clause-rfc.rs rename to rustfmt-lib/rustfmt-core/tests/source/where-clause-rfc.rs diff --git a/rustfmt-core/tests/source/where-clause.rs b/rustfmt-lib/rustfmt-core/tests/source/where-clause.rs similarity index 100% rename from rustfmt-core/tests/source/where-clause.rs rename to rustfmt-lib/rustfmt-core/tests/source/where-clause.rs diff --git a/rustfmt-core/tests/source/width-heuristics.rs b/rustfmt-lib/rustfmt-core/tests/source/width-heuristics.rs similarity index 100% rename from rustfmt-core/tests/source/width-heuristics.rs rename to rustfmt-lib/rustfmt-core/tests/source/width-heuristics.rs diff --git a/rustfmt-core/tests/source/wrap_comments_should_not_imply_format_doc_comments.rs b/rustfmt-lib/rustfmt-core/tests/source/wrap_comments_should_not_imply_format_doc_comments.rs similarity index 100% rename from rustfmt-core/tests/source/wrap_comments_should_not_imply_format_doc_comments.rs rename to rustfmt-lib/rustfmt-core/tests/source/wrap_comments_should_not_imply_format_doc_comments.rs diff --git a/rustfmt-core/tests/target/alignment_2633/block_style.rs b/rustfmt-lib/rustfmt-core/tests/target/alignment_2633/block_style.rs similarity index 100% rename from rustfmt-core/tests/target/alignment_2633/block_style.rs rename to rustfmt-lib/rustfmt-core/tests/target/alignment_2633/block_style.rs diff --git a/rustfmt-core/tests/target/alignment_2633/horizontal_tactic.rs b/rustfmt-lib/rustfmt-core/tests/target/alignment_2633/horizontal_tactic.rs similarity index 100% rename from rustfmt-core/tests/target/alignment_2633/horizontal_tactic.rs rename to rustfmt-lib/rustfmt-core/tests/target/alignment_2633/horizontal_tactic.rs diff --git a/rustfmt-core/tests/target/alignment_2633/visual_style.rs b/rustfmt-lib/rustfmt-core/tests/target/alignment_2633/visual_style.rs similarity index 100% rename from rustfmt-core/tests/target/alignment_2633/visual_style.rs rename to rustfmt-lib/rustfmt-core/tests/target/alignment_2633/visual_style.rs diff --git a/rustfmt-core/tests/target/array_comment.rs b/rustfmt-lib/rustfmt-core/tests/target/array_comment.rs similarity index 100% rename from rustfmt-core/tests/target/array_comment.rs rename to rustfmt-lib/rustfmt-core/tests/target/array_comment.rs diff --git a/rustfmt-core/tests/target/assignment.rs b/rustfmt-lib/rustfmt-core/tests/target/assignment.rs similarity index 100% rename from rustfmt-core/tests/target/assignment.rs rename to rustfmt-lib/rustfmt-core/tests/target/assignment.rs diff --git a/rustfmt-core/tests/target/associated-items.rs b/rustfmt-lib/rustfmt-core/tests/target/associated-items.rs similarity index 100% rename from rustfmt-core/tests/target/associated-items.rs rename to rustfmt-lib/rustfmt-core/tests/target/associated-items.rs diff --git a/rustfmt-core/tests/target/associated-types-bounds-wrapping.rs b/rustfmt-lib/rustfmt-core/tests/target/associated-types-bounds-wrapping.rs similarity index 100% rename from rustfmt-core/tests/target/associated-types-bounds-wrapping.rs rename to rustfmt-lib/rustfmt-core/tests/target/associated-types-bounds-wrapping.rs diff --git a/rustfmt-core/tests/target/associated_type_bounds.rs b/rustfmt-lib/rustfmt-core/tests/target/associated_type_bounds.rs similarity index 100% rename from rustfmt-core/tests/target/associated_type_bounds.rs rename to rustfmt-lib/rustfmt-core/tests/target/associated_type_bounds.rs diff --git a/rustfmt-core/tests/target/associated_type_defaults.rs b/rustfmt-lib/rustfmt-core/tests/target/associated_type_defaults.rs similarity index 100% rename from rustfmt-core/tests/target/associated_type_defaults.rs rename to rustfmt-lib/rustfmt-core/tests/target/associated_type_defaults.rs diff --git a/rustfmt-core/tests/target/async_block.rs b/rustfmt-lib/rustfmt-core/tests/target/async_block.rs similarity index 100% rename from rustfmt-core/tests/target/async_block.rs rename to rustfmt-lib/rustfmt-core/tests/target/async_block.rs diff --git a/rustfmt-core/tests/target/async_closure.rs b/rustfmt-lib/rustfmt-core/tests/target/async_closure.rs similarity index 100% rename from rustfmt-core/tests/target/async_closure.rs rename to rustfmt-lib/rustfmt-core/tests/target/async_closure.rs diff --git a/rustfmt-core/tests/target/async_fn.rs b/rustfmt-lib/rustfmt-core/tests/target/async_fn.rs similarity index 100% rename from rustfmt-core/tests/target/async_fn.rs rename to rustfmt-lib/rustfmt-core/tests/target/async_fn.rs diff --git a/rustfmt-core/tests/target/attrib-block-expr.rs b/rustfmt-lib/rustfmt-core/tests/target/attrib-block-expr.rs similarity index 100% rename from rustfmt-core/tests/target/attrib-block-expr.rs rename to rustfmt-lib/rustfmt-core/tests/target/attrib-block-expr.rs diff --git a/rustfmt-core/tests/target/attrib-extern-crate.rs b/rustfmt-lib/rustfmt-core/tests/target/attrib-extern-crate.rs similarity index 100% rename from rustfmt-core/tests/target/attrib-extern-crate.rs rename to rustfmt-lib/rustfmt-core/tests/target/attrib-extern-crate.rs diff --git a/rustfmt-core/tests/target/attrib.rs b/rustfmt-lib/rustfmt-core/tests/target/attrib.rs similarity index 100% rename from rustfmt-core/tests/target/attrib.rs rename to rustfmt-lib/rustfmt-core/tests/target/attrib.rs diff --git a/rustfmt-core/tests/target/big-impl-block.rs b/rustfmt-lib/rustfmt-core/tests/target/big-impl-block.rs similarity index 100% rename from rustfmt-core/tests/target/big-impl-block.rs rename to rustfmt-lib/rustfmt-core/tests/target/big-impl-block.rs diff --git a/rustfmt-core/tests/target/big-impl-visual.rs b/rustfmt-lib/rustfmt-core/tests/target/big-impl-visual.rs similarity index 100% rename from rustfmt-core/tests/target/big-impl-visual.rs rename to rustfmt-lib/rustfmt-core/tests/target/big-impl-visual.rs diff --git a/rustfmt-core/tests/target/binary-expr.rs b/rustfmt-lib/rustfmt-core/tests/target/binary-expr.rs similarity index 100% rename from rustfmt-core/tests/target/binary-expr.rs rename to rustfmt-lib/rustfmt-core/tests/target/binary-expr.rs diff --git a/rustfmt-core/tests/target/break-and-continue.rs b/rustfmt-lib/rustfmt-core/tests/target/break-and-continue.rs similarity index 100% rename from rustfmt-core/tests/target/break-and-continue.rs rename to rustfmt-lib/rustfmt-core/tests/target/break-and-continue.rs diff --git a/rustfmt-core/tests/target/catch.rs b/rustfmt-lib/rustfmt-core/tests/target/catch.rs similarity index 100% rename from rustfmt-core/tests/target/catch.rs rename to rustfmt-lib/rustfmt-core/tests/target/catch.rs diff --git a/rustfmt-core/tests/target/cfg_if/detect/arch/aarch64.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/aarch64.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/detect/arch/aarch64.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/aarch64.rs diff --git a/rustfmt-core/tests/target/cfg_if/detect/arch/arm.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/arm.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/detect/arch/arm.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/arm.rs diff --git a/rustfmt-core/tests/target/cfg_if/detect/arch/mips.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/mips.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/detect/arch/mips.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/mips.rs diff --git a/rustfmt-core/tests/target/cfg_if/detect/arch/mips64.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/mips64.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/detect/arch/mips64.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/mips64.rs diff --git a/rustfmt-core/tests/target/cfg_if/detect/arch/powerpc.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/powerpc.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/detect/arch/powerpc.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/powerpc.rs diff --git a/rustfmt-core/tests/target/cfg_if/detect/arch/powerpc64.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/powerpc64.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/detect/arch/powerpc64.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/powerpc64.rs diff --git a/rustfmt-core/tests/target/cfg_if/detect/arch/x86.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/x86.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/detect/arch/x86.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/x86.rs diff --git a/rustfmt-core/tests/target/cfg_if/detect/bit.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/bit.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/detect/bit.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/bit.rs diff --git a/rustfmt-core/tests/target/cfg_if/detect/cache.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/cache.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/detect/cache.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/cache.rs diff --git a/rustfmt-core/tests/target/cfg_if/detect/error_macros.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/error_macros.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/detect/error_macros.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/error_macros.rs diff --git a/rustfmt-core/tests/target/cfg_if/detect/mod.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/mod.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/detect/mod.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/mod.rs diff --git a/rustfmt-core/tests/target/cfg_if/detect/os/aarch64.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/aarch64.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/detect/os/aarch64.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/aarch64.rs diff --git a/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/aarch64.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/aarch64.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/detect/os/freebsd/aarch64.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/aarch64.rs diff --git a/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/arm.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/arm.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/detect/os/freebsd/arm.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/arm.rs diff --git a/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/auxvec.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/auxvec.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/detect/os/freebsd/auxvec.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/auxvec.rs diff --git a/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/mod.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/mod.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/detect/os/freebsd/mod.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/mod.rs diff --git a/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/powerpc.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/powerpc.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/detect/os/freebsd/powerpc.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/powerpc.rs diff --git a/rustfmt-core/tests/target/cfg_if/detect/os/linux/aarch64.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/aarch64.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/detect/os/linux/aarch64.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/aarch64.rs diff --git a/rustfmt-core/tests/target/cfg_if/detect/os/linux/arm.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/arm.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/detect/os/linux/arm.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/arm.rs diff --git a/rustfmt-core/tests/target/cfg_if/detect/os/linux/auxvec.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/auxvec.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/detect/os/linux/auxvec.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/auxvec.rs diff --git a/rustfmt-core/tests/target/cfg_if/detect/os/linux/cpuinfo.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/cpuinfo.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/detect/os/linux/cpuinfo.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/cpuinfo.rs diff --git a/rustfmt-core/tests/target/cfg_if/detect/os/linux/mips.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/mips.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/detect/os/linux/mips.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/mips.rs diff --git a/rustfmt-core/tests/target/cfg_if/detect/os/linux/mod.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/mod.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/detect/os/linux/mod.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/mod.rs diff --git a/rustfmt-core/tests/target/cfg_if/detect/os/linux/powerpc.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/powerpc.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/detect/os/linux/powerpc.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/powerpc.rs diff --git a/rustfmt-core/tests/target/cfg_if/detect/os/other.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/other.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/detect/os/other.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/other.rs diff --git a/rustfmt-core/tests/target/cfg_if/detect/os/x86.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/x86.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/detect/os/x86.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/x86.rs diff --git a/rustfmt-core/tests/target/cfg_if/lib.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/lib.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/lib.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/lib.rs diff --git a/rustfmt-core/tests/target/cfg_if/mod.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_if/mod.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_if/mod.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_if/mod.rs diff --git a/rustfmt-core/tests/target/cfg_mod/bar.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_mod/bar.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_mod/bar.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_mod/bar.rs diff --git a/rustfmt-core/tests/target/cfg_mod/dir/dir1/dir2/wasm32.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_mod/dir/dir1/dir2/wasm32.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_mod/dir/dir1/dir2/wasm32.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_mod/dir/dir1/dir2/wasm32.rs diff --git a/rustfmt-core/tests/target/cfg_mod/dir/dir1/dir3/wasm32.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_mod/dir/dir1/dir3/wasm32.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_mod/dir/dir1/dir3/wasm32.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_mod/dir/dir1/dir3/wasm32.rs diff --git a/rustfmt-core/tests/target/cfg_mod/foo.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_mod/foo.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_mod/foo.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_mod/foo.rs diff --git a/rustfmt-core/tests/target/cfg_mod/mod.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_mod/mod.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_mod/mod.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_mod/mod.rs diff --git a/rustfmt-core/tests/target/cfg_mod/other.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_mod/other.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_mod/other.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_mod/other.rs diff --git a/rustfmt-core/tests/target/cfg_mod/wasm32.rs b/rustfmt-lib/rustfmt-core/tests/target/cfg_mod/wasm32.rs similarity index 100% rename from rustfmt-core/tests/target/cfg_mod/wasm32.rs rename to rustfmt-lib/rustfmt-core/tests/target/cfg_mod/wasm32.rs diff --git a/rustfmt-core/tests/target/chains-visual.rs b/rustfmt-lib/rustfmt-core/tests/target/chains-visual.rs similarity index 100% rename from rustfmt-core/tests/target/chains-visual.rs rename to rustfmt-lib/rustfmt-core/tests/target/chains-visual.rs diff --git a/rustfmt-core/tests/target/chains.rs b/rustfmt-lib/rustfmt-core/tests/target/chains.rs similarity index 100% rename from rustfmt-core/tests/target/chains.rs rename to rustfmt-lib/rustfmt-core/tests/target/chains.rs diff --git a/rustfmt-core/tests/target/chains_with_comment.rs b/rustfmt-lib/rustfmt-core/tests/target/chains_with_comment.rs similarity index 100% rename from rustfmt-core/tests/target/chains_with_comment.rs rename to rustfmt-lib/rustfmt-core/tests/target/chains_with_comment.rs diff --git a/rustfmt-core/tests/target/closure-block-inside-macro.rs b/rustfmt-lib/rustfmt-core/tests/target/closure-block-inside-macro.rs similarity index 100% rename from rustfmt-core/tests/target/closure-block-inside-macro.rs rename to rustfmt-lib/rustfmt-core/tests/target/closure-block-inside-macro.rs diff --git a/rustfmt-core/tests/target/closure_block_style.rs b/rustfmt-lib/rustfmt-core/tests/target/closure_block_style.rs similarity index 100% rename from rustfmt-core/tests/target/closure_block_style.rs rename to rustfmt-lib/rustfmt-core/tests/target/closure_block_style.rs diff --git a/rustfmt-core/tests/target/closure_block_style_no_comma.rs b/rustfmt-lib/rustfmt-core/tests/target/closure_block_style_no_comma.rs similarity index 100% rename from rustfmt-core/tests/target/closure_block_style_no_comma.rs rename to rustfmt-lib/rustfmt-core/tests/target/closure_block_style_no_comma.rs diff --git a/rustfmt-core/tests/target/closure_visual_style.rs b/rustfmt-lib/rustfmt-core/tests/target/closure_visual_style.rs similarity index 100% rename from rustfmt-core/tests/target/closure_visual_style.rs rename to rustfmt-lib/rustfmt-core/tests/target/closure_visual_style.rs diff --git a/rustfmt-core/tests/target/comment-inside-const.rs b/rustfmt-lib/rustfmt-core/tests/target/comment-inside-const.rs similarity index 100% rename from rustfmt-core/tests/target/comment-inside-const.rs rename to rustfmt-lib/rustfmt-core/tests/target/comment-inside-const.rs diff --git a/rustfmt-core/tests/target/comment-not-disappear.rs b/rustfmt-lib/rustfmt-core/tests/target/comment-not-disappear.rs similarity index 100% rename from rustfmt-core/tests/target/comment-not-disappear.rs rename to rustfmt-lib/rustfmt-core/tests/target/comment-not-disappear.rs diff --git a/rustfmt-core/tests/target/comment.rs b/rustfmt-lib/rustfmt-core/tests/target/comment.rs similarity index 100% rename from rustfmt-core/tests/target/comment.rs rename to rustfmt-lib/rustfmt-core/tests/target/comment.rs diff --git a/rustfmt-core/tests/target/comment2.rs b/rustfmt-lib/rustfmt-core/tests/target/comment2.rs similarity index 100% rename from rustfmt-core/tests/target/comment2.rs rename to rustfmt-lib/rustfmt-core/tests/target/comment2.rs diff --git a/rustfmt-core/tests/target/comment3.rs b/rustfmt-lib/rustfmt-core/tests/target/comment3.rs similarity index 100% rename from rustfmt-core/tests/target/comment3.rs rename to rustfmt-lib/rustfmt-core/tests/target/comment3.rs diff --git a/rustfmt-core/tests/target/comment4.rs b/rustfmt-lib/rustfmt-core/tests/target/comment4.rs similarity index 100% rename from rustfmt-core/tests/target/comment4.rs rename to rustfmt-lib/rustfmt-core/tests/target/comment4.rs diff --git a/rustfmt-core/tests/target/comment5.rs b/rustfmt-lib/rustfmt-core/tests/target/comment5.rs similarity index 100% rename from rustfmt-core/tests/target/comment5.rs rename to rustfmt-lib/rustfmt-core/tests/target/comment5.rs diff --git a/rustfmt-core/tests/target/comment6.rs b/rustfmt-lib/rustfmt-core/tests/target/comment6.rs similarity index 100% rename from rustfmt-core/tests/target/comment6.rs rename to rustfmt-lib/rustfmt-core/tests/target/comment6.rs diff --git a/rustfmt-core/tests/target/comment_crlf_newline.rs b/rustfmt-lib/rustfmt-core/tests/target/comment_crlf_newline.rs similarity index 100% rename from rustfmt-core/tests/target/comment_crlf_newline.rs rename to rustfmt-lib/rustfmt-core/tests/target/comment_crlf_newline.rs diff --git a/rustfmt-core/tests/target/comments-fn.rs b/rustfmt-lib/rustfmt-core/tests/target/comments-fn.rs similarity index 100% rename from rustfmt-core/tests/target/comments-fn.rs rename to rustfmt-lib/rustfmt-core/tests/target/comments-fn.rs diff --git a/rustfmt-core/tests/target/configs/blank_lines_lower_bound/1.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/blank_lines_lower_bound/1.rs similarity index 100% rename from rustfmt-core/tests/target/configs/blank_lines_lower_bound/1.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/blank_lines_lower_bound/1.rs diff --git a/rustfmt-core/tests/target/configs/brace_style/fn_always_next_line.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/brace_style/fn_always_next_line.rs similarity index 100% rename from rustfmt-core/tests/target/configs/brace_style/fn_always_next_line.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/brace_style/fn_always_next_line.rs diff --git a/rustfmt-core/tests/target/configs/brace_style/fn_prefer_same_line.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/brace_style/fn_prefer_same_line.rs similarity index 100% rename from rustfmt-core/tests/target/configs/brace_style/fn_prefer_same_line.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/brace_style/fn_prefer_same_line.rs diff --git a/rustfmt-core/tests/target/configs/brace_style/fn_same_line_where.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/brace_style/fn_same_line_where.rs similarity index 100% rename from rustfmt-core/tests/target/configs/brace_style/fn_same_line_where.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/brace_style/fn_same_line_where.rs diff --git a/rustfmt-core/tests/target/configs/brace_style/item_always_next_line.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/brace_style/item_always_next_line.rs similarity index 100% rename from rustfmt-core/tests/target/configs/brace_style/item_always_next_line.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/brace_style/item_always_next_line.rs diff --git a/rustfmt-core/tests/target/configs/brace_style/item_prefer_same_line.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/brace_style/item_prefer_same_line.rs similarity index 100% rename from rustfmt-core/tests/target/configs/brace_style/item_prefer_same_line.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/brace_style/item_prefer_same_line.rs diff --git a/rustfmt-core/tests/target/configs/brace_style/item_same_line_where.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/brace_style/item_same_line_where.rs similarity index 100% rename from rustfmt-core/tests/target/configs/brace_style/item_same_line_where.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/brace_style/item_same_line_where.rs diff --git a/rustfmt-core/tests/target/configs/combine_control_expr/false.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/combine_control_expr/false.rs similarity index 100% rename from rustfmt-core/tests/target/configs/combine_control_expr/false.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/combine_control_expr/false.rs diff --git a/rustfmt-core/tests/target/configs/combine_control_expr/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/combine_control_expr/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/combine_control_expr/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/combine_control_expr/true.rs diff --git a/rustfmt-core/tests/target/configs/comment_width/above.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/comment_width/above.rs similarity index 100% rename from rustfmt-core/tests/target/configs/comment_width/above.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/comment_width/above.rs diff --git a/rustfmt-core/tests/target/configs/comment_width/below.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/comment_width/below.rs similarity index 100% rename from rustfmt-core/tests/target/configs/comment_width/below.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/comment_width/below.rs diff --git a/rustfmt-core/tests/target/configs/comment_width/ignore.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/comment_width/ignore.rs similarity index 100% rename from rustfmt-core/tests/target/configs/comment_width/ignore.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/comment_width/ignore.rs diff --git a/rustfmt-core/tests/target/configs/condense_wildcard_suffixes/false.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/condense_wildcard_suffixes/false.rs similarity index 100% rename from rustfmt-core/tests/target/configs/condense_wildcard_suffixes/false.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/condense_wildcard_suffixes/false.rs diff --git a/rustfmt-core/tests/target/configs/condense_wildcard_suffixes/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/condense_wildcard_suffixes/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/condense_wildcard_suffixes/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/condense_wildcard_suffixes/true.rs diff --git a/rustfmt-core/tests/target/configs/control_brace_style/always_next_line.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/control_brace_style/always_next_line.rs similarity index 100% rename from rustfmt-core/tests/target/configs/control_brace_style/always_next_line.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/control_brace_style/always_next_line.rs diff --git a/rustfmt-core/tests/target/configs/control_brace_style/always_same_line.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/control_brace_style/always_same_line.rs similarity index 100% rename from rustfmt-core/tests/target/configs/control_brace_style/always_same_line.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/control_brace_style/always_same_line.rs diff --git a/rustfmt-core/tests/target/configs/control_brace_style/closing_next_line.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/control_brace_style/closing_next_line.rs similarity index 100% rename from rustfmt-core/tests/target/configs/control_brace_style/closing_next_line.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/control_brace_style/closing_next_line.rs diff --git a/rustfmt-core/tests/target/configs/disable_all_formatting/false.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/disable_all_formatting/false.rs similarity index 100% rename from rustfmt-core/tests/target/configs/disable_all_formatting/false.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/disable_all_formatting/false.rs diff --git a/rustfmt-core/tests/target/configs/disable_all_formatting/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/disable_all_formatting/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/disable_all_formatting/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/disable_all_formatting/true.rs diff --git a/rustfmt-core/tests/target/configs/empty_item_single_line/false.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/empty_item_single_line/false.rs similarity index 100% rename from rustfmt-core/tests/target/configs/empty_item_single_line/false.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/empty_item_single_line/false.rs diff --git a/rustfmt-core/tests/target/configs/empty_item_single_line/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/empty_item_single_line/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/empty_item_single_line/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/empty_item_single_line/true.rs diff --git a/rustfmt-core/tests/target/configs/enum_discrim_align_threshold/40.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/enum_discrim_align_threshold/40.rs similarity index 100% rename from rustfmt-core/tests/target/configs/enum_discrim_align_threshold/40.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/enum_discrim_align_threshold/40.rs diff --git a/rustfmt-core/tests/target/configs/error_on_line_overflow/false.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/error_on_line_overflow/false.rs similarity index 100% rename from rustfmt-core/tests/target/configs/error_on_line_overflow/false.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/error_on_line_overflow/false.rs diff --git a/rustfmt-core/tests/target/configs/error_on_unformatted/false.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/error_on_unformatted/false.rs similarity index 100% rename from rustfmt-core/tests/target/configs/error_on_unformatted/false.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/error_on_unformatted/false.rs diff --git a/rustfmt-core/tests/target/configs/fn_args_layout/compressed.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/fn_args_layout/compressed.rs similarity index 100% rename from rustfmt-core/tests/target/configs/fn_args_layout/compressed.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/fn_args_layout/compressed.rs diff --git a/rustfmt-core/tests/target/configs/fn_args_layout/tall.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/fn_args_layout/tall.rs similarity index 100% rename from rustfmt-core/tests/target/configs/fn_args_layout/tall.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/fn_args_layout/tall.rs diff --git a/rustfmt-core/tests/target/configs/fn_args_layout/vertical.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/fn_args_layout/vertical.rs similarity index 100% rename from rustfmt-core/tests/target/configs/fn_args_layout/vertical.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/fn_args_layout/vertical.rs diff --git a/rustfmt-core/tests/target/configs/fn_single_line/false.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/fn_single_line/false.rs similarity index 100% rename from rustfmt-core/tests/target/configs/fn_single_line/false.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/fn_single_line/false.rs diff --git a/rustfmt-core/tests/target/configs/fn_single_line/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/fn_single_line/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/fn_single_line/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/fn_single_line/true.rs diff --git a/rustfmt-core/tests/target/configs/force_explicit_abi/false.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/force_explicit_abi/false.rs similarity index 100% rename from rustfmt-core/tests/target/configs/force_explicit_abi/false.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/force_explicit_abi/false.rs diff --git a/rustfmt-core/tests/target/configs/force_explicit_abi/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/force_explicit_abi/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/force_explicit_abi/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/force_explicit_abi/true.rs diff --git a/rustfmt-core/tests/target/configs/force_multiline_block/false.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/force_multiline_block/false.rs similarity index 100% rename from rustfmt-core/tests/target/configs/force_multiline_block/false.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/force_multiline_block/false.rs diff --git a/rustfmt-core/tests/target/configs/force_multiline_block/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/force_multiline_block/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/force_multiline_block/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/force_multiline_block/true.rs diff --git a/rustfmt-core/tests/target/configs/format_macro_bodies/false.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/format_macro_bodies/false.rs similarity index 100% rename from rustfmt-core/tests/target/configs/format_macro_bodies/false.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/format_macro_bodies/false.rs diff --git a/rustfmt-core/tests/target/configs/format_macro_bodies/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/format_macro_bodies/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/format_macro_bodies/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/format_macro_bodies/true.rs diff --git a/rustfmt-core/tests/target/configs/format_macro_matchers/false.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/format_macro_matchers/false.rs similarity index 100% rename from rustfmt-core/tests/target/configs/format_macro_matchers/false.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/format_macro_matchers/false.rs diff --git a/rustfmt-core/tests/target/configs/format_macro_matchers/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/format_macro_matchers/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/format_macro_matchers/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/format_macro_matchers/true.rs diff --git a/rustfmt-core/tests/target/configs/format_strings/false.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/format_strings/false.rs similarity index 100% rename from rustfmt-core/tests/target/configs/format_strings/false.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/format_strings/false.rs diff --git a/rustfmt-core/tests/target/configs/format_strings/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/format_strings/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/format_strings/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/format_strings/true.rs diff --git a/rustfmt-core/tests/target/configs/hard_tabs/false.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/hard_tabs/false.rs similarity index 100% rename from rustfmt-core/tests/target/configs/hard_tabs/false.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/hard_tabs/false.rs diff --git a/rustfmt-core/tests/target/configs/hard_tabs/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/hard_tabs/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/hard_tabs/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/hard_tabs/true.rs diff --git a/rustfmt-core/tests/target/configs/imports_indent/block.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/imports_indent/block.rs similarity index 100% rename from rustfmt-core/tests/target/configs/imports_indent/block.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/imports_indent/block.rs diff --git a/rustfmt-core/tests/target/configs/imports_layout/horizontal_vertical.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/imports_layout/horizontal_vertical.rs similarity index 100% rename from rustfmt-core/tests/target/configs/imports_layout/horizontal_vertical.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/imports_layout/horizontal_vertical.rs diff --git a/rustfmt-core/tests/target/configs/imports_layout/merge_mixed.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/imports_layout/merge_mixed.rs similarity index 100% rename from rustfmt-core/tests/target/configs/imports_layout/merge_mixed.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/imports_layout/merge_mixed.rs diff --git a/rustfmt-core/tests/target/configs/imports_layout/mixed.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/imports_layout/mixed.rs similarity index 100% rename from rustfmt-core/tests/target/configs/imports_layout/mixed.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/imports_layout/mixed.rs diff --git a/rustfmt-core/tests/target/configs/indent_style/block_args.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_args.rs similarity index 100% rename from rustfmt-core/tests/target/configs/indent_style/block_args.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_args.rs diff --git a/rustfmt-core/tests/target/configs/indent_style/block_array.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_array.rs similarity index 100% rename from rustfmt-core/tests/target/configs/indent_style/block_array.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_array.rs diff --git a/rustfmt-core/tests/target/configs/indent_style/block_call.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_call.rs similarity index 100% rename from rustfmt-core/tests/target/configs/indent_style/block_call.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_call.rs diff --git a/rustfmt-core/tests/target/configs/indent_style/block_chain.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_chain.rs similarity index 100% rename from rustfmt-core/tests/target/configs/indent_style/block_chain.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_chain.rs diff --git a/rustfmt-core/tests/target/configs/indent_style/block_generic.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_generic.rs similarity index 100% rename from rustfmt-core/tests/target/configs/indent_style/block_generic.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_generic.rs diff --git a/rustfmt-core/tests/target/configs/indent_style/block_struct_lit.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_struct_lit.rs similarity index 100% rename from rustfmt-core/tests/target/configs/indent_style/block_struct_lit.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_struct_lit.rs diff --git a/rustfmt-core/tests/target/configs/indent_style/block_tab_spaces_call.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_tab_spaces_call.rs similarity index 100% rename from rustfmt-core/tests/target/configs/indent_style/block_tab_spaces_call.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_tab_spaces_call.rs diff --git a/rustfmt-core/tests/target/configs/indent_style/block_trailing_comma_call/two.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_trailing_comma_call/two.rs similarity index 100% rename from rustfmt-core/tests/target/configs/indent_style/block_trailing_comma_call/two.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_trailing_comma_call/two.rs diff --git a/rustfmt-core/tests/target/configs/indent_style/block_where_pred.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_where_pred.rs similarity index 100% rename from rustfmt-core/tests/target/configs/indent_style/block_where_pred.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_where_pred.rs diff --git a/rustfmt-core/tests/target/configs/indent_style/default.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/default.rs similarity index 100% rename from rustfmt-core/tests/target/configs/indent_style/default.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/default.rs diff --git a/rustfmt-core/tests/target/configs/indent_style/rfc_control.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/rfc_control.rs similarity index 100% rename from rustfmt-core/tests/target/configs/indent_style/rfc_control.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/rfc_control.rs diff --git a/rustfmt-core/tests/target/configs/indent_style/rfc_where.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/rfc_where.rs similarity index 100% rename from rustfmt-core/tests/target/configs/indent_style/rfc_where.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/rfc_where.rs diff --git a/rustfmt-core/tests/target/configs/indent_style/visual_args.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_args.rs similarity index 100% rename from rustfmt-core/tests/target/configs/indent_style/visual_args.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_args.rs diff --git a/rustfmt-core/tests/target/configs/indent_style/visual_array.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_array.rs similarity index 100% rename from rustfmt-core/tests/target/configs/indent_style/visual_array.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_array.rs diff --git a/rustfmt-core/tests/target/configs/indent_style/visual_call.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_call.rs similarity index 100% rename from rustfmt-core/tests/target/configs/indent_style/visual_call.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_call.rs diff --git a/rustfmt-core/tests/target/configs/indent_style/visual_chain.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_chain.rs similarity index 100% rename from rustfmt-core/tests/target/configs/indent_style/visual_chain.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_chain.rs diff --git a/rustfmt-core/tests/target/configs/indent_style/visual_generics.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_generics.rs similarity index 100% rename from rustfmt-core/tests/target/configs/indent_style/visual_generics.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_generics.rs diff --git a/rustfmt-core/tests/target/configs/indent_style/visual_struct_lit.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_struct_lit.rs similarity index 100% rename from rustfmt-core/tests/target/configs/indent_style/visual_struct_lit.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_struct_lit.rs diff --git a/rustfmt-core/tests/target/configs/indent_style/visual_trailing_comma.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_trailing_comma.rs similarity index 100% rename from rustfmt-core/tests/target/configs/indent_style/visual_trailing_comma.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_trailing_comma.rs diff --git a/rustfmt-core/tests/target/configs/indent_style/visual_where_pred.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_where_pred.rs similarity index 100% rename from rustfmt-core/tests/target/configs/indent_style/visual_where_pred.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_where_pred.rs diff --git a/rustfmt-core/tests/target/configs/match_arm_blocks/false.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/match_arm_blocks/false.rs similarity index 100% rename from rustfmt-core/tests/target/configs/match_arm_blocks/false.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/match_arm_blocks/false.rs diff --git a/rustfmt-core/tests/target/configs/match_arm_blocks/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/match_arm_blocks/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/match_arm_blocks/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/match_arm_blocks/true.rs diff --git a/rustfmt-core/tests/target/configs/match_block_trailing_comma/false.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/match_block_trailing_comma/false.rs similarity index 100% rename from rustfmt-core/tests/target/configs/match_block_trailing_comma/false.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/match_block_trailing_comma/false.rs diff --git a/rustfmt-core/tests/target/configs/match_block_trailing_comma/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/match_block_trailing_comma/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/match_block_trailing_comma/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/match_block_trailing_comma/true.rs diff --git a/rustfmt-core/tests/target/configs/merge_derives/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/merge_derives/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/merge_derives/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/merge_derives/true.rs diff --git a/rustfmt-core/tests/target/configs/normalize_comments/false.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/normalize_comments/false.rs similarity index 100% rename from rustfmt-core/tests/target/configs/normalize_comments/false.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/normalize_comments/false.rs diff --git a/rustfmt-core/tests/target/configs/normalize_comments/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/normalize_comments/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/normalize_comments/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/normalize_comments/true.rs diff --git a/rustfmt-core/tests/target/configs/normalize_doc_attributes/false.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/normalize_doc_attributes/false.rs similarity index 100% rename from rustfmt-core/tests/target/configs/normalize_doc_attributes/false.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/normalize_doc_attributes/false.rs diff --git a/rustfmt-core/tests/target/configs/normalize_doc_attributes/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/normalize_doc_attributes/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/normalize_doc_attributes/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/normalize_doc_attributes/true.rs diff --git a/rustfmt-core/tests/target/configs/recursive/disabled/foo.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/recursive/disabled/foo.rs similarity index 100% rename from rustfmt-core/tests/target/configs/recursive/disabled/foo.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/recursive/disabled/foo.rs diff --git a/rustfmt-core/tests/target/configs/recursive/disabled/lib.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/recursive/disabled/lib.rs similarity index 100% rename from rustfmt-core/tests/target/configs/recursive/disabled/lib.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/recursive/disabled/lib.rs diff --git a/rustfmt-core/tests/target/configs/recursive/enabled/foo.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/recursive/enabled/foo.rs similarity index 100% rename from rustfmt-core/tests/target/configs/recursive/enabled/foo.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/recursive/enabled/foo.rs diff --git a/rustfmt-core/tests/target/configs/recursive/enabled/lib.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/recursive/enabled/lib.rs similarity index 100% rename from rustfmt-core/tests/target/configs/recursive/enabled/lib.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/recursive/enabled/lib.rs diff --git a/rustfmt-core/tests/target/configs/remove_nested_parens/remove_nested_parens.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/remove_nested_parens/remove_nested_parens.rs similarity index 100% rename from rustfmt-core/tests/target/configs/remove_nested_parens/remove_nested_parens.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/remove_nested_parens/remove_nested_parens.rs diff --git a/rustfmt-core/tests/target/configs/reorder_impl_items/false.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/reorder_impl_items/false.rs similarity index 100% rename from rustfmt-core/tests/target/configs/reorder_impl_items/false.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/reorder_impl_items/false.rs diff --git a/rustfmt-core/tests/target/configs/reorder_impl_items/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/reorder_impl_items/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/reorder_impl_items/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/reorder_impl_items/true.rs diff --git a/rustfmt-core/tests/target/configs/reorder_imports/false.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/reorder_imports/false.rs similarity index 100% rename from rustfmt-core/tests/target/configs/reorder_imports/false.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/reorder_imports/false.rs diff --git a/rustfmt-core/tests/target/configs/reorder_imports/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/reorder_imports/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/reorder_imports/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/reorder_imports/true.rs diff --git a/rustfmt-core/tests/target/configs/reorder_modules/dolor/mod.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/reorder_modules/dolor/mod.rs similarity index 100% rename from rustfmt-core/tests/target/configs/reorder_modules/dolor/mod.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/reorder_modules/dolor/mod.rs diff --git a/rustfmt-core/tests/target/configs/reorder_modules/false.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/reorder_modules/false.rs similarity index 100% rename from rustfmt-core/tests/target/configs/reorder_modules/false.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/reorder_modules/false.rs diff --git a/rustfmt-core/tests/target/configs/reorder_modules/ipsum/mod.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/reorder_modules/ipsum/mod.rs similarity index 100% rename from rustfmt-core/tests/target/configs/reorder_modules/ipsum/mod.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/reorder_modules/ipsum/mod.rs diff --git a/rustfmt-core/tests/target/configs/reorder_modules/lorem/mod.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/reorder_modules/lorem/mod.rs similarity index 100% rename from rustfmt-core/tests/target/configs/reorder_modules/lorem/mod.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/reorder_modules/lorem/mod.rs diff --git a/rustfmt-core/tests/target/configs/reorder_modules/sit/mod.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/reorder_modules/sit/mod.rs similarity index 100% rename from rustfmt-core/tests/target/configs/reorder_modules/sit/mod.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/reorder_modules/sit/mod.rs diff --git a/rustfmt-core/tests/target/configs/reorder_modules/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/reorder_modules/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/reorder_modules/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/reorder_modules/true.rs diff --git a/rustfmt-core/tests/target/configs/skip_children/foo/mod.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/skip_children/foo/mod.rs similarity index 100% rename from rustfmt-core/tests/target/configs/skip_children/foo/mod.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/skip_children/foo/mod.rs diff --git a/rustfmt-core/tests/target/configs/skip_children/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/skip_children/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/skip_children/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/skip_children/true.rs diff --git a/rustfmt-core/tests/target/configs/space_before_colon/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/space_before_colon/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/space_before_colon/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/space_before_colon/true.rs diff --git a/rustfmt-core/tests/target/configs/spaces_around_ranges/false.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/spaces_around_ranges/false.rs similarity index 100% rename from rustfmt-core/tests/target/configs/spaces_around_ranges/false.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/spaces_around_ranges/false.rs diff --git a/rustfmt-core/tests/target/configs/spaces_around_ranges/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/spaces_around_ranges/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/spaces_around_ranges/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/spaces_around_ranges/true.rs diff --git a/rustfmt-core/tests/target/configs/struct_field_align_threshold/20.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/struct_field_align_threshold/20.rs similarity index 100% rename from rustfmt-core/tests/target/configs/struct_field_align_threshold/20.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/struct_field_align_threshold/20.rs diff --git a/rustfmt-core/tests/target/configs/struct_lit_single_line/false.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/struct_lit_single_line/false.rs similarity index 100% rename from rustfmt-core/tests/target/configs/struct_lit_single_line/false.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/struct_lit_single_line/false.rs diff --git a/rustfmt-core/tests/target/configs/tab_spaces/2.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/tab_spaces/2.rs similarity index 100% rename from rustfmt-core/tests/target/configs/tab_spaces/2.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/tab_spaces/2.rs diff --git a/rustfmt-core/tests/target/configs/tab_spaces/4.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/tab_spaces/4.rs similarity index 100% rename from rustfmt-core/tests/target/configs/tab_spaces/4.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/tab_spaces/4.rs diff --git a/rustfmt-core/tests/target/configs/trailing_comma/always.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/trailing_comma/always.rs similarity index 100% rename from rustfmt-core/tests/target/configs/trailing_comma/always.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/trailing_comma/always.rs diff --git a/rustfmt-core/tests/target/configs/trailing_comma/never.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/trailing_comma/never.rs similarity index 100% rename from rustfmt-core/tests/target/configs/trailing_comma/never.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/trailing_comma/never.rs diff --git a/rustfmt-core/tests/target/configs/trailing_comma/vertical.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/trailing_comma/vertical.rs similarity index 100% rename from rustfmt-core/tests/target/configs/trailing_comma/vertical.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/trailing_comma/vertical.rs diff --git a/rustfmt-core/tests/target/configs/trailing_semicolon/false.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/trailing_semicolon/false.rs similarity index 100% rename from rustfmt-core/tests/target/configs/trailing_semicolon/false.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/trailing_semicolon/false.rs diff --git a/rustfmt-core/tests/target/configs/trailing_semicolon/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/trailing_semicolon/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/trailing_semicolon/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/trailing_semicolon/true.rs diff --git a/rustfmt-core/tests/target/configs/type_punctuation_density/compressed.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/type_punctuation_density/compressed.rs similarity index 100% rename from rustfmt-core/tests/target/configs/type_punctuation_density/compressed.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/type_punctuation_density/compressed.rs diff --git a/rustfmt-core/tests/target/configs/type_punctuation_density/wide.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/type_punctuation_density/wide.rs similarity index 100% rename from rustfmt-core/tests/target/configs/type_punctuation_density/wide.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/type_punctuation_density/wide.rs diff --git a/rustfmt-core/tests/target/configs/use_field_init_shorthand/false.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/use_field_init_shorthand/false.rs similarity index 100% rename from rustfmt-core/tests/target/configs/use_field_init_shorthand/false.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/use_field_init_shorthand/false.rs diff --git a/rustfmt-core/tests/target/configs/use_field_init_shorthand/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/use_field_init_shorthand/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/use_field_init_shorthand/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/use_field_init_shorthand/true.rs diff --git a/rustfmt-core/tests/target/configs/use_small_heuristics/max.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/use_small_heuristics/max.rs similarity index 100% rename from rustfmt-core/tests/target/configs/use_small_heuristics/max.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/use_small_heuristics/max.rs diff --git a/rustfmt-core/tests/target/configs/use_try_shorthand/false.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/use_try_shorthand/false.rs similarity index 100% rename from rustfmt-core/tests/target/configs/use_try_shorthand/false.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/use_try_shorthand/false.rs diff --git a/rustfmt-core/tests/target/configs/use_try_shorthand/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/use_try_shorthand/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/use_try_shorthand/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/use_try_shorthand/true.rs diff --git a/rustfmt-core/tests/target/configs/use_try_shorthand/true_2015_edition.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/use_try_shorthand/true_2015_edition.rs similarity index 100% rename from rustfmt-core/tests/target/configs/use_try_shorthand/true_2015_edition.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/use_try_shorthand/true_2015_edition.rs diff --git a/rustfmt-core/tests/target/configs/where_single_line/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/where_single_line/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/where_single_line/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/where_single_line/true.rs diff --git a/rustfmt-core/tests/target/configs/wrap_comments/false.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/wrap_comments/false.rs similarity index 100% rename from rustfmt-core/tests/target/configs/wrap_comments/false.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/wrap_comments/false.rs diff --git a/rustfmt-core/tests/target/configs/wrap_comments/true.rs b/rustfmt-lib/rustfmt-core/tests/target/configs/wrap_comments/true.rs similarity index 100% rename from rustfmt-core/tests/target/configs/wrap_comments/true.rs rename to rustfmt-lib/rustfmt-core/tests/target/configs/wrap_comments/true.rs diff --git a/rustfmt-core/tests/target/const_generics.rs b/rustfmt-lib/rustfmt-core/tests/target/const_generics.rs similarity index 100% rename from rustfmt-core/tests/target/const_generics.rs rename to rustfmt-lib/rustfmt-core/tests/target/const_generics.rs diff --git a/rustfmt-core/tests/target/control-brace-style-always-next-line.rs b/rustfmt-lib/rustfmt-core/tests/target/control-brace-style-always-next-line.rs similarity index 100% rename from rustfmt-core/tests/target/control-brace-style-always-next-line.rs rename to rustfmt-lib/rustfmt-core/tests/target/control-brace-style-always-next-line.rs diff --git a/rustfmt-core/tests/target/control-brace-style-always-same-line.rs b/rustfmt-lib/rustfmt-core/tests/target/control-brace-style-always-same-line.rs similarity index 100% rename from rustfmt-core/tests/target/control-brace-style-always-same-line.rs rename to rustfmt-lib/rustfmt-core/tests/target/control-brace-style-always-same-line.rs diff --git a/rustfmt-core/tests/target/doc-attrib.rs b/rustfmt-lib/rustfmt-core/tests/target/doc-attrib.rs similarity index 100% rename from rustfmt-core/tests/target/doc-attrib.rs rename to rustfmt-lib/rustfmt-core/tests/target/doc-attrib.rs diff --git a/rustfmt-core/tests/target/doc-comment-with-example.rs b/rustfmt-lib/rustfmt-core/tests/target/doc-comment-with-example.rs similarity index 100% rename from rustfmt-core/tests/target/doc-comment-with-example.rs rename to rustfmt-lib/rustfmt-core/tests/target/doc-comment-with-example.rs diff --git a/rustfmt-core/tests/target/doc.rs b/rustfmt-lib/rustfmt-core/tests/target/doc.rs similarity index 100% rename from rustfmt-core/tests/target/doc.rs rename to rustfmt-lib/rustfmt-core/tests/target/doc.rs diff --git a/rustfmt-core/tests/target/dyn_trait.rs b/rustfmt-lib/rustfmt-core/tests/target/dyn_trait.rs similarity index 100% rename from rustfmt-core/tests/target/dyn_trait.rs rename to rustfmt-lib/rustfmt-core/tests/target/dyn_trait.rs diff --git a/rustfmt-core/tests/target/else-if-brace-style-always-next-line.rs b/rustfmt-lib/rustfmt-core/tests/target/else-if-brace-style-always-next-line.rs similarity index 100% rename from rustfmt-core/tests/target/else-if-brace-style-always-next-line.rs rename to rustfmt-lib/rustfmt-core/tests/target/else-if-brace-style-always-next-line.rs diff --git a/rustfmt-core/tests/target/else-if-brace-style-always-same-line.rs b/rustfmt-lib/rustfmt-core/tests/target/else-if-brace-style-always-same-line.rs similarity index 100% rename from rustfmt-core/tests/target/else-if-brace-style-always-same-line.rs rename to rustfmt-lib/rustfmt-core/tests/target/else-if-brace-style-always-same-line.rs diff --git a/rustfmt-core/tests/target/else-if-brace-style-closing-next-line.rs b/rustfmt-lib/rustfmt-core/tests/target/else-if-brace-style-closing-next-line.rs similarity index 100% rename from rustfmt-core/tests/target/else-if-brace-style-closing-next-line.rs rename to rustfmt-lib/rustfmt-core/tests/target/else-if-brace-style-closing-next-line.rs diff --git a/rustfmt-core/tests/target/empty-tuple-no-conversion-to-unit-struct.rs b/rustfmt-lib/rustfmt-core/tests/target/empty-tuple-no-conversion-to-unit-struct.rs similarity index 100% rename from rustfmt-core/tests/target/empty-tuple-no-conversion-to-unit-struct.rs rename to rustfmt-lib/rustfmt-core/tests/target/empty-tuple-no-conversion-to-unit-struct.rs diff --git a/rustfmt-core/tests/target/empty_file.rs b/rustfmt-lib/rustfmt-core/tests/target/empty_file.rs similarity index 100% rename from rustfmt-core/tests/target/empty_file.rs rename to rustfmt-lib/rustfmt-core/tests/target/empty_file.rs diff --git a/rustfmt-core/tests/target/enum.rs b/rustfmt-lib/rustfmt-core/tests/target/enum.rs similarity index 100% rename from rustfmt-core/tests/target/enum.rs rename to rustfmt-lib/rustfmt-core/tests/target/enum.rs diff --git a/rustfmt-core/tests/target/existential_type.rs b/rustfmt-lib/rustfmt-core/tests/target/existential_type.rs similarity index 100% rename from rustfmt-core/tests/target/existential_type.rs rename to rustfmt-lib/rustfmt-core/tests/target/existential_type.rs diff --git a/rustfmt-core/tests/target/expr-block.rs b/rustfmt-lib/rustfmt-core/tests/target/expr-block.rs similarity index 100% rename from rustfmt-core/tests/target/expr-block.rs rename to rustfmt-lib/rustfmt-core/tests/target/expr-block.rs diff --git a/rustfmt-core/tests/target/expr-overflow-delimited.rs b/rustfmt-lib/rustfmt-core/tests/target/expr-overflow-delimited.rs similarity index 100% rename from rustfmt-core/tests/target/expr-overflow-delimited.rs rename to rustfmt-lib/rustfmt-core/tests/target/expr-overflow-delimited.rs diff --git a/rustfmt-core/tests/target/expr.rs b/rustfmt-lib/rustfmt-core/tests/target/expr.rs similarity index 100% rename from rustfmt-core/tests/target/expr.rs rename to rustfmt-lib/rustfmt-core/tests/target/expr.rs diff --git a/rustfmt-core/tests/target/extern.rs b/rustfmt-lib/rustfmt-core/tests/target/extern.rs similarity index 100% rename from rustfmt-core/tests/target/extern.rs rename to rustfmt-lib/rustfmt-core/tests/target/extern.rs diff --git a/rustfmt-core/tests/target/extern_not_explicit.rs b/rustfmt-lib/rustfmt-core/tests/target/extern_not_explicit.rs similarity index 100% rename from rustfmt-core/tests/target/extern_not_explicit.rs rename to rustfmt-lib/rustfmt-core/tests/target/extern_not_explicit.rs diff --git a/rustfmt-core/tests/target/file-lines-1.rs b/rustfmt-lib/rustfmt-core/tests/target/file-lines-1.rs similarity index 100% rename from rustfmt-core/tests/target/file-lines-1.rs rename to rustfmt-lib/rustfmt-core/tests/target/file-lines-1.rs diff --git a/rustfmt-core/tests/target/file-lines-2.rs b/rustfmt-lib/rustfmt-core/tests/target/file-lines-2.rs similarity index 100% rename from rustfmt-core/tests/target/file-lines-2.rs rename to rustfmt-lib/rustfmt-core/tests/target/file-lines-2.rs diff --git a/rustfmt-core/tests/target/file-lines-3.rs b/rustfmt-lib/rustfmt-core/tests/target/file-lines-3.rs similarity index 100% rename from rustfmt-core/tests/target/file-lines-3.rs rename to rustfmt-lib/rustfmt-core/tests/target/file-lines-3.rs diff --git a/rustfmt-core/tests/target/file-lines-4.rs b/rustfmt-lib/rustfmt-core/tests/target/file-lines-4.rs similarity index 100% rename from rustfmt-core/tests/target/file-lines-4.rs rename to rustfmt-lib/rustfmt-core/tests/target/file-lines-4.rs diff --git a/rustfmt-core/tests/target/file-lines-5.rs b/rustfmt-lib/rustfmt-core/tests/target/file-lines-5.rs similarity index 100% rename from rustfmt-core/tests/target/file-lines-5.rs rename to rustfmt-lib/rustfmt-core/tests/target/file-lines-5.rs diff --git a/rustfmt-core/tests/target/file-lines-6.rs b/rustfmt-lib/rustfmt-core/tests/target/file-lines-6.rs similarity index 100% rename from rustfmt-core/tests/target/file-lines-6.rs rename to rustfmt-lib/rustfmt-core/tests/target/file-lines-6.rs diff --git a/rustfmt-core/tests/target/file-lines-7.rs b/rustfmt-lib/rustfmt-core/tests/target/file-lines-7.rs similarity index 100% rename from rustfmt-core/tests/target/file-lines-7.rs rename to rustfmt-lib/rustfmt-core/tests/target/file-lines-7.rs diff --git a/rustfmt-core/tests/target/file-lines-8.rs b/rustfmt-lib/rustfmt-core/tests/target/file-lines-8.rs similarity index 100% rename from rustfmt-core/tests/target/file-lines-8.rs rename to rustfmt-lib/rustfmt-core/tests/target/file-lines-8.rs diff --git a/rustfmt-core/tests/target/file-lines-item.rs b/rustfmt-lib/rustfmt-core/tests/target/file-lines-item.rs similarity index 100% rename from rustfmt-core/tests/target/file-lines-item.rs rename to rustfmt-lib/rustfmt-core/tests/target/file-lines-item.rs diff --git a/rustfmt-core/tests/target/fn-args-with-last-line-comment.rs b/rustfmt-lib/rustfmt-core/tests/target/fn-args-with-last-line-comment.rs similarity index 100% rename from rustfmt-core/tests/target/fn-args-with-last-line-comment.rs rename to rustfmt-lib/rustfmt-core/tests/target/fn-args-with-last-line-comment.rs diff --git a/rustfmt-core/tests/target/fn-custom-2.rs b/rustfmt-lib/rustfmt-core/tests/target/fn-custom-2.rs similarity index 100% rename from rustfmt-core/tests/target/fn-custom-2.rs rename to rustfmt-lib/rustfmt-core/tests/target/fn-custom-2.rs diff --git a/rustfmt-core/tests/target/fn-custom-3.rs b/rustfmt-lib/rustfmt-core/tests/target/fn-custom-3.rs similarity index 100% rename from rustfmt-core/tests/target/fn-custom-3.rs rename to rustfmt-lib/rustfmt-core/tests/target/fn-custom-3.rs diff --git a/rustfmt-core/tests/target/fn-custom-4.rs b/rustfmt-lib/rustfmt-core/tests/target/fn-custom-4.rs similarity index 100% rename from rustfmt-core/tests/target/fn-custom-4.rs rename to rustfmt-lib/rustfmt-core/tests/target/fn-custom-4.rs diff --git a/rustfmt-core/tests/target/fn-custom-6.rs b/rustfmt-lib/rustfmt-core/tests/target/fn-custom-6.rs similarity index 100% rename from rustfmt-core/tests/target/fn-custom-6.rs rename to rustfmt-lib/rustfmt-core/tests/target/fn-custom-6.rs diff --git a/rustfmt-core/tests/target/fn-custom-7.rs b/rustfmt-lib/rustfmt-core/tests/target/fn-custom-7.rs similarity index 100% rename from rustfmt-core/tests/target/fn-custom-7.rs rename to rustfmt-lib/rustfmt-core/tests/target/fn-custom-7.rs diff --git a/rustfmt-core/tests/target/fn-custom-8.rs b/rustfmt-lib/rustfmt-core/tests/target/fn-custom-8.rs similarity index 100% rename from rustfmt-core/tests/target/fn-custom-8.rs rename to rustfmt-lib/rustfmt-core/tests/target/fn-custom-8.rs diff --git a/rustfmt-core/tests/target/fn-custom.rs b/rustfmt-lib/rustfmt-core/tests/target/fn-custom.rs similarity index 100% rename from rustfmt-core/tests/target/fn-custom.rs rename to rustfmt-lib/rustfmt-core/tests/target/fn-custom.rs diff --git a/rustfmt-core/tests/target/fn-param-attributes.rs b/rustfmt-lib/rustfmt-core/tests/target/fn-param-attributes.rs similarity index 100% rename from rustfmt-core/tests/target/fn-param-attributes.rs rename to rustfmt-lib/rustfmt-core/tests/target/fn-param-attributes.rs diff --git a/rustfmt-core/tests/target/fn-simple.rs b/rustfmt-lib/rustfmt-core/tests/target/fn-simple.rs similarity index 100% rename from rustfmt-core/tests/target/fn-simple.rs rename to rustfmt-lib/rustfmt-core/tests/target/fn-simple.rs diff --git a/rustfmt-core/tests/target/fn-single-line/version_two.rs b/rustfmt-lib/rustfmt-core/tests/target/fn-single-line/version_two.rs similarity index 100% rename from rustfmt-core/tests/target/fn-single-line/version_two.rs rename to rustfmt-lib/rustfmt-core/tests/target/fn-single-line/version_two.rs diff --git a/rustfmt-core/tests/target/fn-ty.rs b/rustfmt-lib/rustfmt-core/tests/target/fn-ty.rs similarity index 100% rename from rustfmt-core/tests/target/fn-ty.rs rename to rustfmt-lib/rustfmt-core/tests/target/fn-ty.rs diff --git a/rustfmt-core/tests/target/fn.rs b/rustfmt-lib/rustfmt-core/tests/target/fn.rs similarity index 100% rename from rustfmt-core/tests/target/fn.rs rename to rustfmt-lib/rustfmt-core/tests/target/fn.rs diff --git a/rustfmt-core/tests/target/fn_args_indent-block.rs b/rustfmt-lib/rustfmt-core/tests/target/fn_args_indent-block.rs similarity index 100% rename from rustfmt-core/tests/target/fn_args_indent-block.rs rename to rustfmt-lib/rustfmt-core/tests/target/fn_args_indent-block.rs diff --git a/rustfmt-core/tests/target/fn_args_layout-vertical.rs b/rustfmt-lib/rustfmt-core/tests/target/fn_args_layout-vertical.rs similarity index 100% rename from rustfmt-core/tests/target/fn_args_layout-vertical.rs rename to rustfmt-lib/rustfmt-core/tests/target/fn_args_layout-vertical.rs diff --git a/rustfmt-core/tests/target/fn_once.rs b/rustfmt-lib/rustfmt-core/tests/target/fn_once.rs similarity index 100% rename from rustfmt-core/tests/target/fn_once.rs rename to rustfmt-lib/rustfmt-core/tests/target/fn_once.rs diff --git a/rustfmt-core/tests/target/format_strings/issue-202.rs b/rustfmt-lib/rustfmt-core/tests/target/format_strings/issue-202.rs similarity index 100% rename from rustfmt-core/tests/target/format_strings/issue-202.rs rename to rustfmt-lib/rustfmt-core/tests/target/format_strings/issue-202.rs diff --git a/rustfmt-core/tests/target/format_strings/issue-2833.rs b/rustfmt-lib/rustfmt-core/tests/target/format_strings/issue-2833.rs similarity index 100% rename from rustfmt-core/tests/target/format_strings/issue-2833.rs rename to rustfmt-lib/rustfmt-core/tests/target/format_strings/issue-2833.rs diff --git a/rustfmt-core/tests/target/format_strings/issue-3263.rs b/rustfmt-lib/rustfmt-core/tests/target/format_strings/issue-3263.rs similarity index 100% rename from rustfmt-core/tests/target/format_strings/issue-3263.rs rename to rustfmt-lib/rustfmt-core/tests/target/format_strings/issue-3263.rs diff --git a/rustfmt-core/tests/target/format_strings/issue-687.rs b/rustfmt-lib/rustfmt-core/tests/target/format_strings/issue-687.rs similarity index 100% rename from rustfmt-core/tests/target/format_strings/issue-687.rs rename to rustfmt-lib/rustfmt-core/tests/target/format_strings/issue-687.rs diff --git a/rustfmt-core/tests/target/format_strings/issue564.rs b/rustfmt-lib/rustfmt-core/tests/target/format_strings/issue564.rs similarity index 100% rename from rustfmt-core/tests/target/format_strings/issue564.rs rename to rustfmt-lib/rustfmt-core/tests/target/format_strings/issue564.rs diff --git a/rustfmt-core/tests/target/hard-tabs.rs b/rustfmt-lib/rustfmt-core/tests/target/hard-tabs.rs similarity index 100% rename from rustfmt-core/tests/target/hard-tabs.rs rename to rustfmt-lib/rustfmt-core/tests/target/hard-tabs.rs diff --git a/rustfmt-core/tests/target/hello.rs b/rustfmt-lib/rustfmt-core/tests/target/hello.rs similarity index 100% rename from rustfmt-core/tests/target/hello.rs rename to rustfmt-lib/rustfmt-core/tests/target/hello.rs diff --git a/rustfmt-core/tests/target/if_while_or_patterns.rs b/rustfmt-lib/rustfmt-core/tests/target/if_while_or_patterns.rs similarity index 100% rename from rustfmt-core/tests/target/if_while_or_patterns.rs rename to rustfmt-lib/rustfmt-core/tests/target/if_while_or_patterns.rs diff --git a/rustfmt-core/tests/target/immovable_generators.rs b/rustfmt-lib/rustfmt-core/tests/target/immovable_generators.rs similarity index 100% rename from rustfmt-core/tests/target/immovable_generators.rs rename to rustfmt-lib/rustfmt-core/tests/target/immovable_generators.rs diff --git a/rustfmt-core/tests/target/impl.rs b/rustfmt-lib/rustfmt-core/tests/target/impl.rs similarity index 100% rename from rustfmt-core/tests/target/impl.rs rename to rustfmt-lib/rustfmt-core/tests/target/impl.rs diff --git a/rustfmt-core/tests/target/impls.rs b/rustfmt-lib/rustfmt-core/tests/target/impls.rs similarity index 100% rename from rustfmt-core/tests/target/impls.rs rename to rustfmt-lib/rustfmt-core/tests/target/impls.rs diff --git a/rustfmt-core/tests/target/import-fencepost-length.rs b/rustfmt-lib/rustfmt-core/tests/target/import-fencepost-length.rs similarity index 100% rename from rustfmt-core/tests/target/import-fencepost-length.rs rename to rustfmt-lib/rustfmt-core/tests/target/import-fencepost-length.rs diff --git a/rustfmt-core/tests/target/imports-impl-only-use.rs b/rustfmt-lib/rustfmt-core/tests/target/imports-impl-only-use.rs similarity index 100% rename from rustfmt-core/tests/target/imports-impl-only-use.rs rename to rustfmt-lib/rustfmt-core/tests/target/imports-impl-only-use.rs diff --git a/rustfmt-core/tests/target/imports-reorder-lines-and-items.rs b/rustfmt-lib/rustfmt-core/tests/target/imports-reorder-lines-and-items.rs similarity index 100% rename from rustfmt-core/tests/target/imports-reorder-lines-and-items.rs rename to rustfmt-lib/rustfmt-core/tests/target/imports-reorder-lines-and-items.rs diff --git a/rustfmt-core/tests/target/imports-reorder-lines.rs b/rustfmt-lib/rustfmt-core/tests/target/imports-reorder-lines.rs similarity index 100% rename from rustfmt-core/tests/target/imports-reorder-lines.rs rename to rustfmt-lib/rustfmt-core/tests/target/imports-reorder-lines.rs diff --git a/rustfmt-core/tests/target/imports-reorder.rs b/rustfmt-lib/rustfmt-core/tests/target/imports-reorder.rs similarity index 100% rename from rustfmt-core/tests/target/imports-reorder.rs rename to rustfmt-lib/rustfmt-core/tests/target/imports-reorder.rs diff --git a/rustfmt-core/tests/target/imports.rs b/rustfmt-lib/rustfmt-core/tests/target/imports.rs similarity index 100% rename from rustfmt-core/tests/target/imports.rs rename to rustfmt-lib/rustfmt-core/tests/target/imports.rs diff --git a/rustfmt-core/tests/target/imports_2015_edition.rs b/rustfmt-lib/rustfmt-core/tests/target/imports_2015_edition.rs similarity index 100% rename from rustfmt-core/tests/target/imports_2015_edition.rs rename to rustfmt-lib/rustfmt-core/tests/target/imports_2015_edition.rs diff --git a/rustfmt-core/tests/target/imports_block_indent.rs b/rustfmt-lib/rustfmt-core/tests/target/imports_block_indent.rs similarity index 100% rename from rustfmt-core/tests/target/imports_block_indent.rs rename to rustfmt-lib/rustfmt-core/tests/target/imports_block_indent.rs diff --git a/rustfmt-core/tests/target/imports_raw_identifiers.rs b/rustfmt-lib/rustfmt-core/tests/target/imports_raw_identifiers.rs similarity index 100% rename from rustfmt-core/tests/target/imports_raw_identifiers.rs rename to rustfmt-lib/rustfmt-core/tests/target/imports_raw_identifiers.rs diff --git a/rustfmt-core/tests/target/indented-impl.rs b/rustfmt-lib/rustfmt-core/tests/target/indented-impl.rs similarity index 100% rename from rustfmt-core/tests/target/indented-impl.rs rename to rustfmt-lib/rustfmt-core/tests/target/indented-impl.rs diff --git a/rustfmt-core/tests/target/invalid-rust-code-in-doc-comment.rs b/rustfmt-lib/rustfmt-core/tests/target/invalid-rust-code-in-doc-comment.rs similarity index 100% rename from rustfmt-core/tests/target/invalid-rust-code-in-doc-comment.rs rename to rustfmt-lib/rustfmt-core/tests/target/invalid-rust-code-in-doc-comment.rs diff --git a/rustfmt-core/tests/target/issue-1021.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1021.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1021.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1021.rs diff --git a/rustfmt-core/tests/target/issue-1049.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1049.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1049.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1049.rs diff --git a/rustfmt-core/tests/target/issue-1055.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1055.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1055.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1055.rs diff --git a/rustfmt-core/tests/target/issue-1096.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1096.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1096.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1096.rs diff --git a/rustfmt-core/tests/target/issue-1111.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1111.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1111.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1111.rs diff --git a/rustfmt-core/tests/target/issue-1113.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1113.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1113.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1113.rs diff --git a/rustfmt-core/tests/target/issue-1120.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1120.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1120.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1120.rs diff --git a/rustfmt-core/tests/target/issue-1124.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1124.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1124.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1124.rs diff --git a/rustfmt-core/tests/target/issue-1127.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1127.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1127.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1127.rs diff --git a/rustfmt-core/tests/target/issue-1158.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1158.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1158.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1158.rs diff --git a/rustfmt-core/tests/target/issue-1177.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1177.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1177.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1177.rs diff --git a/rustfmt-core/tests/target/issue-1192.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1192.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1192.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1192.rs diff --git a/rustfmt-core/tests/target/issue-1210/a.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1210/a.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1210/a.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1210/a.rs diff --git a/rustfmt-core/tests/target/issue-1210/b.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1210/b.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1210/b.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1210/b.rs diff --git a/rustfmt-core/tests/target/issue-1210/c.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1210/c.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1210/c.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1210/c.rs diff --git a/rustfmt-core/tests/target/issue-1210/d.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1210/d.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1210/d.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1210/d.rs diff --git a/rustfmt-core/tests/target/issue-1210/e.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1210/e.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1210/e.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1210/e.rs diff --git a/rustfmt-core/tests/target/issue-1211.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1211.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1211.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1211.rs diff --git a/rustfmt-core/tests/target/issue-1214.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1214.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1214.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1214.rs diff --git a/rustfmt-core/tests/target/issue-1216.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1216.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1216.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1216.rs diff --git a/rustfmt-core/tests/target/issue-1239.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1239.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1239.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1239.rs diff --git a/rustfmt-core/tests/target/issue-1247.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1247.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1247.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1247.rs diff --git a/rustfmt-core/tests/target/issue-1255.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1255.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1255.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1255.rs diff --git a/rustfmt-core/tests/target/issue-1278.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1278.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1278.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1278.rs diff --git a/rustfmt-core/tests/target/issue-1350.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1350.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1350.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1350.rs diff --git a/rustfmt-core/tests/target/issue-1366.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1366.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1366.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1366.rs diff --git a/rustfmt-core/tests/target/issue-1397.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1397.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1397.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1397.rs diff --git a/rustfmt-core/tests/target/issue-1468.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1468.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1468.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1468.rs diff --git a/rustfmt-core/tests/target/issue-1598.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1598.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1598.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1598.rs diff --git a/rustfmt-core/tests/target/issue-1624.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1624.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1624.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1624.rs diff --git a/rustfmt-core/tests/target/issue-1681.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1681.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1681.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1681.rs diff --git a/rustfmt-core/tests/target/issue-1693.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1693.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1693.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1693.rs diff --git a/rustfmt-core/tests/target/issue-1703.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1703.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1703.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1703.rs diff --git a/rustfmt-core/tests/target/issue-1800.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1800.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1800.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1800.rs diff --git a/rustfmt-core/tests/target/issue-1802.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1802.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1802.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1802.rs diff --git a/rustfmt-core/tests/target/issue-1824.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1824.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1824.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1824.rs diff --git a/rustfmt-core/tests/target/issue-1914.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-1914.rs similarity index 100% rename from rustfmt-core/tests/target/issue-1914.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-1914.rs diff --git a/rustfmt-core/tests/target/issue-2025.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2025.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2025.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2025.rs diff --git a/rustfmt-core/tests/target/issue-2103.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2103.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2103.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2103.rs diff --git a/rustfmt-core/tests/target/issue-2111.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2111.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2111.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2111.rs diff --git a/rustfmt-core/tests/target/issue-2123.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2123.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2123.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2123.rs diff --git a/rustfmt-core/tests/target/issue-2164.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2164.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2164.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2164.rs diff --git a/rustfmt-core/tests/target/issue-2179/two.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2179/two.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2179/two.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2179/two.rs diff --git a/rustfmt-core/tests/target/issue-2197.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2197.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2197.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2197.rs diff --git a/rustfmt-core/tests/target/issue-2256.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2256.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2256.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2256.rs diff --git a/rustfmt-core/tests/target/issue-2324.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2324.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2324.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2324.rs diff --git a/rustfmt-core/tests/target/issue-2329.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2329.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2329.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2329.rs diff --git a/rustfmt-core/tests/target/issue-2342.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2342.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2342.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2342.rs diff --git a/rustfmt-core/tests/target/issue-2346.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2346.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2346.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2346.rs diff --git a/rustfmt-core/tests/target/issue-2401.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2401.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2401.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2401.rs diff --git a/rustfmt-core/tests/target/issue-2445.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2445.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2445.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2445.rs diff --git a/rustfmt-core/tests/target/issue-2446.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2446.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2446.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2446.rs diff --git a/rustfmt-core/tests/target/issue-2479.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2479.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2479.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2479.rs diff --git a/rustfmt-core/tests/target/issue-2482/a.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2482/a.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2482/a.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2482/a.rs diff --git a/rustfmt-core/tests/target/issue-2482/b.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2482/b.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2482/b.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2482/b.rs diff --git a/rustfmt-core/tests/target/issue-2482/c.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2482/c.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2482/c.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2482/c.rs diff --git a/rustfmt-core/tests/target/issue-2496.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2496.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2496.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2496.rs diff --git a/rustfmt-core/tests/target/issue-2520.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2520.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2520.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2520.rs diff --git a/rustfmt-core/tests/target/issue-2523.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2523.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2523.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2523.rs diff --git a/rustfmt-core/tests/target/issue-2526.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2526.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2526.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2526.rs diff --git a/rustfmt-core/tests/target/issue-2551.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2551.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2551.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2551.rs diff --git a/rustfmt-core/tests/target/issue-2554.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2554.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2554.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2554.rs diff --git a/rustfmt-core/tests/target/issue-2582.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2582.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2582.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2582.rs diff --git a/rustfmt-core/tests/target/issue-2641.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2641.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2641.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2641.rs diff --git a/rustfmt-core/tests/target/issue-2644.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2644.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2644.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2644.rs diff --git a/rustfmt-core/tests/target/issue-2673-nonmodrs-mods/foo.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2673-nonmodrs-mods/foo.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2673-nonmodrs-mods/foo.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2673-nonmodrs-mods/foo.rs diff --git a/rustfmt-core/tests/target/issue-2673-nonmodrs-mods/foo/bar.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2673-nonmodrs-mods/foo/bar.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2673-nonmodrs-mods/foo/bar.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2673-nonmodrs-mods/foo/bar.rs diff --git a/rustfmt-core/tests/target/issue-2673-nonmodrs-mods/lib.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2673-nonmodrs-mods/lib.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2673-nonmodrs-mods/lib.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2673-nonmodrs-mods/lib.rs diff --git a/rustfmt-core/tests/target/issue-2728.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2728.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2728.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2728.rs diff --git a/rustfmt-core/tests/target/issue-2759.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2759.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2759.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2759.rs diff --git a/rustfmt-core/tests/target/issue-2761.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2761.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2761.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2761.rs diff --git a/rustfmt-core/tests/target/issue-2794.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2794.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2794.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2794.rs diff --git a/rustfmt-core/tests/target/issue-2810.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2810.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2810.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2810.rs diff --git a/rustfmt-core/tests/target/issue-2835.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2835.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2835.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2835.rs diff --git a/rustfmt-core/tests/target/issue-2863.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2863.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2863.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2863.rs diff --git a/rustfmt-core/tests/target/issue-2869.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2869.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2869.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2869.rs diff --git a/rustfmt-core/tests/target/issue-2896.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2896.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2896.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2896.rs diff --git a/rustfmt-core/tests/target/issue-2916.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2916.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2916.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2916.rs diff --git a/rustfmt-core/tests/target/issue-2917/minimal.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2917/minimal.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2917/minimal.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2917/minimal.rs diff --git a/rustfmt-core/tests/target/issue-2917/packed_simd.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2917/packed_simd.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2917/packed_simd.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2917/packed_simd.rs diff --git a/rustfmt-core/tests/target/issue-2922.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2922.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2922.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2922.rs diff --git a/rustfmt-core/tests/target/issue-2927-2.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2927-2.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2927-2.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2927-2.rs diff --git a/rustfmt-core/tests/target/issue-2927.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2927.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2927.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2927.rs diff --git a/rustfmt-core/tests/target/issue-2930.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2930.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2930.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2930.rs diff --git a/rustfmt-core/tests/target/issue-2936.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2936.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2936.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2936.rs diff --git a/rustfmt-core/tests/target/issue-2941.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2941.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2941.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2941.rs diff --git a/rustfmt-core/tests/target/issue-2955.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2955.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2955.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2955.rs diff --git a/rustfmt-core/tests/target/issue-2973.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2973.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2973.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2973.rs diff --git a/rustfmt-core/tests/target/issue-2976.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2976.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2976.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2976.rs diff --git a/rustfmt-core/tests/target/issue-2977/block.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2977/block.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2977/block.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2977/block.rs diff --git a/rustfmt-core/tests/target/issue-2977/impl.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2977/impl.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2977/impl.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2977/impl.rs diff --git a/rustfmt-core/tests/target/issue-2977/item.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2977/item.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2977/item.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2977/item.rs diff --git a/rustfmt-core/tests/target/issue-2977/trait.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2977/trait.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2977/trait.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2977/trait.rs diff --git a/rustfmt-core/tests/target/issue-2985.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2985.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2985.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2985.rs diff --git a/rustfmt-core/tests/target/issue-2995.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-2995.rs similarity index 100% rename from rustfmt-core/tests/target/issue-2995.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-2995.rs diff --git a/rustfmt-core/tests/target/issue-3029.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3029.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3029.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3029.rs diff --git a/rustfmt-core/tests/target/issue-3032.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3032.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3032.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3032.rs diff --git a/rustfmt-core/tests/target/issue-3038.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3038.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3038.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3038.rs diff --git a/rustfmt-core/tests/target/issue-3043.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3043.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3043.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3043.rs diff --git a/rustfmt-core/tests/target/issue-3049.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3049.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3049.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3049.rs diff --git a/rustfmt-core/tests/target/issue-3055/backtick.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3055/backtick.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3055/backtick.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3055/backtick.rs diff --git a/rustfmt-core/tests/target/issue-3055/empty-code-block.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3055/empty-code-block.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3055/empty-code-block.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3055/empty-code-block.rs diff --git a/rustfmt-core/tests/target/issue-3055/original.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3055/original.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3055/original.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3055/original.rs diff --git a/rustfmt-core/tests/target/issue-3059.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3059.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3059.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3059.rs diff --git a/rustfmt-core/tests/target/issue-3066.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3066.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3066.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3066.rs diff --git a/rustfmt-core/tests/target/issue-3105.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3105.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3105.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3105.rs diff --git a/rustfmt-core/tests/target/issue-3118.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3118.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3118.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3118.rs diff --git a/rustfmt-core/tests/target/issue-3124.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3124.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3124.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3124.rs diff --git a/rustfmt-core/tests/target/issue-3131.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3131.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3131.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3131.rs diff --git a/rustfmt-core/tests/target/issue-3132.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3132.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3132.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3132.rs diff --git a/rustfmt-core/tests/target/issue-3153.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3153.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3153.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3153.rs diff --git a/rustfmt-core/tests/target/issue-3170.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3170.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3170.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3170.rs diff --git a/rustfmt-core/tests/target/issue-3182.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3182.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3182.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3182.rs diff --git a/rustfmt-core/tests/target/issue-3184.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3184.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3184.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3184.rs diff --git a/rustfmt-core/tests/target/issue-3194.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3194.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3194.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3194.rs diff --git a/rustfmt-core/tests/target/issue-3198.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3198.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3198.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3198.rs diff --git a/rustfmt-core/tests/target/issue-3213/version_two.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3213/version_two.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3213/version_two.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3213/version_two.rs diff --git a/rustfmt-core/tests/target/issue-3217.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3217.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3217.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3217.rs diff --git a/rustfmt-core/tests/target/issue-3224.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3224.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3224.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3224.rs diff --git a/rustfmt-core/tests/target/issue-3227/two.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3227/two.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3227/two.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3227/two.rs diff --git a/rustfmt-core/tests/target/issue-3234.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3234.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3234.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3234.rs diff --git a/rustfmt-core/tests/target/issue-3241.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3241.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3241.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3241.rs diff --git a/rustfmt-core/tests/target/issue-3253/bar.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3253/bar.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3253/bar.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3253/bar.rs diff --git a/rustfmt-core/tests/target/issue-3253/foo.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3253/foo.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3253/foo.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3253/foo.rs diff --git a/rustfmt-core/tests/target/issue-3253/lib.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3253/lib.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3253/lib.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3253/lib.rs diff --git a/rustfmt-core/tests/target/issue-3253/paths/bar_foo.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3253/paths/bar_foo.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3253/paths/bar_foo.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3253/paths/bar_foo.rs diff --git a/rustfmt-core/tests/target/issue-3253/paths/excluded.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3253/paths/excluded.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3253/paths/excluded.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3253/paths/excluded.rs diff --git a/rustfmt-core/tests/target/issue-3253/paths/foo_bar.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3253/paths/foo_bar.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3253/paths/foo_bar.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3253/paths/foo_bar.rs diff --git a/rustfmt-core/tests/target/issue-3265.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3265.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3265.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3265.rs diff --git a/rustfmt-core/tests/target/issue-3270/two.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3270/two.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3270/two.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3270/two.rs diff --git a/rustfmt-core/tests/target/issue-3270/wrap.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3270/wrap.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3270/wrap.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3270/wrap.rs diff --git a/rustfmt-core/tests/target/issue-3272/v2.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3272/v2.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3272/v2.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3272/v2.rs diff --git a/rustfmt-core/tests/target/issue-3278/version_two.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3278/version_two.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3278/version_two.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3278/version_two.rs diff --git a/rustfmt-core/tests/target/issue-3295/two.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3295/two.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3295/two.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3295/two.rs diff --git a/rustfmt-core/tests/target/issue-3302.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3302.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3302.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3302.rs diff --git a/rustfmt-core/tests/target/issue-3304.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3304.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3304.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3304.rs diff --git a/rustfmt-core/tests/target/issue-3314.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3314.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3314.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3314.rs diff --git a/rustfmt-core/tests/target/issue-3343.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3343.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3343.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3343.rs diff --git a/rustfmt-core/tests/target/issue-3423.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3423.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3423.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3423.rs diff --git a/rustfmt-core/tests/target/issue-3434/lib.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3434/lib.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3434/lib.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3434/lib.rs diff --git a/rustfmt-core/tests/target/issue-3434/no_entry.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3434/no_entry.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3434/no_entry.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3434/no_entry.rs diff --git a/rustfmt-core/tests/target/issue-3434/not_skip_macro.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3434/not_skip_macro.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3434/not_skip_macro.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3434/not_skip_macro.rs diff --git a/rustfmt-core/tests/target/issue-3442.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3442.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3442.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3442.rs diff --git a/rustfmt-core/tests/target/issue-3465.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3465.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3465.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3465.rs diff --git a/rustfmt-core/tests/target/issue-3494/crlf.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3494/crlf.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3494/crlf.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3494/crlf.rs diff --git a/rustfmt-core/tests/target/issue-3494/lf.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3494/lf.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3494/lf.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3494/lf.rs diff --git a/rustfmt-core/tests/target/issue-3499.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3499.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3499.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3499.rs diff --git a/rustfmt-core/tests/target/issue-3508.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3508.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3508.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3508.rs diff --git a/rustfmt-core/tests/target/issue-3515.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3515.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3515.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3515.rs diff --git a/rustfmt-core/tests/target/issue-3532.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3532.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3532.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3532.rs diff --git a/rustfmt-core/tests/target/issue-3539.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3539.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3539.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3539.rs diff --git a/rustfmt-core/tests/target/issue-3554.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3554.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3554.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3554.rs diff --git a/rustfmt-core/tests/target/issue-3567.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3567.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3567.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3567.rs diff --git a/rustfmt-core/tests/target/issue-3568.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3568.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3568.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3568.rs diff --git a/rustfmt-core/tests/target/issue-3585/extern_crate.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3585/extern_crate.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3585/extern_crate.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3585/extern_crate.rs diff --git a/rustfmt-core/tests/target/issue-3585/reorder_imports_disabled.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3585/reorder_imports_disabled.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3585/reorder_imports_disabled.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3585/reorder_imports_disabled.rs diff --git a/rustfmt-core/tests/target/issue-3585/reorder_imports_enabled.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3585/reorder_imports_enabled.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3585/reorder_imports_enabled.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3585/reorder_imports_enabled.rs diff --git a/rustfmt-core/tests/target/issue-3585/use.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3585/use.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3585/use.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3585/use.rs diff --git a/rustfmt-core/tests/target/issue-3592.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3592.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3592.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3592.rs diff --git a/rustfmt-core/tests/target/issue-3595.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3595.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3595.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3595.rs diff --git a/rustfmt-core/tests/target/issue-3601.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3601.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3601.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3601.rs diff --git a/rustfmt-core/tests/target/issue-3614/version_two.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3614/version_two.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3614/version_two.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3614/version_two.rs diff --git a/rustfmt-core/tests/target/issue-3636.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3636.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3636.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3636.rs diff --git a/rustfmt-core/tests/target/issue-3639.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3639.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3639.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3639.rs diff --git a/rustfmt-core/tests/target/issue-3645.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3645.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3645.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3645.rs diff --git a/rustfmt-core/tests/target/issue-3651.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3651.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3651.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3651.rs diff --git a/rustfmt-core/tests/target/issue-3665/lib.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3665/lib.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3665/lib.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3665/lib.rs diff --git a/rustfmt-core/tests/target/issue-3665/not_skip_attribute.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3665/not_skip_attribute.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3665/not_skip_attribute.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3665/not_skip_attribute.rs diff --git a/rustfmt-core/tests/target/issue-3665/sub_mod.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3665/sub_mod.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3665/sub_mod.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3665/sub_mod.rs diff --git a/rustfmt-core/tests/target/issue-3672.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3672.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3672.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3672.rs diff --git a/rustfmt-core/tests/target/issue-3675.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3675.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3675.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3675.rs diff --git a/rustfmt-core/tests/target/issue-3701/two.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3701/two.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3701/two.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3701/two.rs diff --git a/rustfmt-core/tests/target/issue-3709.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3709.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3709.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3709.rs diff --git a/rustfmt-core/tests/target/issue-3711.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3711.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3711.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3711.rs diff --git a/rustfmt-core/tests/target/issue-3717.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3717.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3717.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3717.rs diff --git a/rustfmt-core/tests/target/issue-3718.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3718.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3718.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3718.rs diff --git a/rustfmt-core/tests/target/issue-3740.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3740.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3740.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3740.rs diff --git a/rustfmt-core/tests/target/issue-3741.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3741.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3741.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3741.rs diff --git a/rustfmt-core/tests/target/issue-3750.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3750.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3750.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3750.rs diff --git a/rustfmt-core/tests/target/issue-3751.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3751.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3751.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3751.rs diff --git a/rustfmt-core/tests/target/issue-3759.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3759.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3759.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3759.rs diff --git a/rustfmt-core/tests/target/issue-3779/ice.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3779/ice.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3779/ice.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3779/ice.rs diff --git a/rustfmt-core/tests/target/issue-3779/lib.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3779/lib.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3779/lib.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3779/lib.rs diff --git a/rustfmt-core/tests/target/issue-3786.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3786.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3786.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3786.rs diff --git a/rustfmt-core/tests/target/issue-3787.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3787.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3787.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3787.rs diff --git a/rustfmt-core/tests/target/issue-3815.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3815.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3815.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3815.rs diff --git a/rustfmt-core/tests/target/issue-3840/version-two_hard-tabs.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3840/version-two_hard-tabs.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3840/version-two_hard-tabs.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3840/version-two_hard-tabs.rs diff --git a/rustfmt-core/tests/target/issue-3840/version-two_soft-tabs.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3840/version-two_soft-tabs.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3840/version-two_soft-tabs.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3840/version-two_soft-tabs.rs diff --git a/rustfmt-core/tests/target/issue-3845.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3845.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3845.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3845.rs diff --git a/rustfmt-core/tests/target/issue-3851.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3851.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3851.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3851.rs diff --git a/rustfmt-core/tests/target/issue-3882.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3882.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3882.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3882.rs diff --git a/rustfmt-core/tests/target/issue-3904/two.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3904/two.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3904/two.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3904/two.rs diff --git a/rustfmt-core/tests/target/issue-3908.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3908.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3908.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3908.rs diff --git a/rustfmt-core/tests/target/issue-3923.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3923.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3923.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3923.rs diff --git a/rustfmt-core/tests/target/issue-3929.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3929.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3929.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3929.rs diff --git a/rustfmt-core/tests/target/issue-3933/imp-a.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3933/imp-a.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3933/imp-a.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3933/imp-a.rs diff --git a/rustfmt-core/tests/target/issue-3933/imp-b.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3933/imp-b.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3933/imp-b.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3933/imp-b.rs diff --git a/rustfmt-core/tests/target/issue-3933/lib.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3933/lib.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3933/lib.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3933/lib.rs diff --git a/rustfmt-core/tests/target/issue-3933/utils.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3933/utils.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3933/utils.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3933/utils.rs diff --git a/rustfmt-core/tests/target/issue-3934.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3934.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3934.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3934.rs diff --git a/rustfmt-core/tests/target/issue-3956/graphics.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3956/graphics.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3956/graphics.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3956/graphics.rs diff --git a/rustfmt-core/tests/target/issue-3956/graphics_emu.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3956/graphics_emu.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3956/graphics_emu.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3956/graphics_emu.rs diff --git a/rustfmt-core/tests/target/issue-3956/lib.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3956/lib.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3956/lib.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3956/lib.rs diff --git a/rustfmt-core/tests/target/issue-3974.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3974.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3974.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3974.rs diff --git a/rustfmt-core/tests/target/issue-3992.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-3992.rs similarity index 100% rename from rustfmt-core/tests/target/issue-3992.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-3992.rs diff --git a/rustfmt-core/tests/target/issue-447.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-447.rs similarity index 100% rename from rustfmt-core/tests/target/issue-447.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-447.rs diff --git a/rustfmt-core/tests/target/issue-510.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-510.rs similarity index 100% rename from rustfmt-core/tests/target/issue-510.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-510.rs diff --git a/rustfmt-core/tests/target/issue-539.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-539.rs similarity index 100% rename from rustfmt-core/tests/target/issue-539.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-539.rs diff --git a/rustfmt-core/tests/target/issue-64.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-64.rs similarity index 100% rename from rustfmt-core/tests/target/issue-64.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-64.rs diff --git a/rustfmt-core/tests/target/issue-683.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-683.rs similarity index 100% rename from rustfmt-core/tests/target/issue-683.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-683.rs diff --git a/rustfmt-core/tests/target/issue-691.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-691.rs similarity index 100% rename from rustfmt-core/tests/target/issue-691.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-691.rs diff --git a/rustfmt-core/tests/target/issue-770.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-770.rs similarity index 100% rename from rustfmt-core/tests/target/issue-770.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-770.rs diff --git a/rustfmt-core/tests/target/issue-811.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-811.rs similarity index 100% rename from rustfmt-core/tests/target/issue-811.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-811.rs diff --git a/rustfmt-core/tests/target/issue-831.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-831.rs similarity index 100% rename from rustfmt-core/tests/target/issue-831.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-831.rs diff --git a/rustfmt-core/tests/target/issue-850.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-850.rs similarity index 100% rename from rustfmt-core/tests/target/issue-850.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-850.rs diff --git a/rustfmt-core/tests/target/issue-855.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-855.rs similarity index 100% rename from rustfmt-core/tests/target/issue-855.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-855.rs diff --git a/rustfmt-core/tests/target/issue-913.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-913.rs similarity index 100% rename from rustfmt-core/tests/target/issue-913.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-913.rs diff --git a/rustfmt-core/tests/target/issue-945.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-945.rs similarity index 100% rename from rustfmt-core/tests/target/issue-945.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-945.rs diff --git a/rustfmt-core/tests/target/issue-977.rs b/rustfmt-lib/rustfmt-core/tests/target/issue-977.rs similarity index 100% rename from rustfmt-core/tests/target/issue-977.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue-977.rs diff --git a/rustfmt-core/tests/target/issue_3839.rs b/rustfmt-lib/rustfmt-core/tests/target/issue_3839.rs similarity index 100% rename from rustfmt-core/tests/target/issue_3839.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue_3839.rs diff --git a/rustfmt-core/tests/target/issue_3844.rs b/rustfmt-lib/rustfmt-core/tests/target/issue_3844.rs similarity index 100% rename from rustfmt-core/tests/target/issue_3844.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue_3844.rs diff --git a/rustfmt-core/tests/target/issue_3853.rs b/rustfmt-lib/rustfmt-core/tests/target/issue_3853.rs similarity index 100% rename from rustfmt-core/tests/target/issue_3853.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue_3853.rs diff --git a/rustfmt-core/tests/target/issue_3854.rs b/rustfmt-lib/rustfmt-core/tests/target/issue_3854.rs similarity index 100% rename from rustfmt-core/tests/target/issue_3854.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue_3854.rs diff --git a/rustfmt-core/tests/target/issue_3868.rs b/rustfmt-lib/rustfmt-core/tests/target/issue_3868.rs similarity index 100% rename from rustfmt-core/tests/target/issue_3868.rs rename to rustfmt-lib/rustfmt-core/tests/target/issue_3868.rs diff --git a/rustfmt-core/tests/target/item-brace-style-always-next-line.rs b/rustfmt-lib/rustfmt-core/tests/target/item-brace-style-always-next-line.rs similarity index 100% rename from rustfmt-core/tests/target/item-brace-style-always-next-line.rs rename to rustfmt-lib/rustfmt-core/tests/target/item-brace-style-always-next-line.rs diff --git a/rustfmt-core/tests/target/item-brace-style-prefer-same-line.rs b/rustfmt-lib/rustfmt-core/tests/target/item-brace-style-prefer-same-line.rs similarity index 100% rename from rustfmt-core/tests/target/item-brace-style-prefer-same-line.rs rename to rustfmt-lib/rustfmt-core/tests/target/item-brace-style-prefer-same-line.rs diff --git a/rustfmt-core/tests/target/item-brace-style-same-line-where.rs b/rustfmt-lib/rustfmt-core/tests/target/item-brace-style-same-line-where.rs similarity index 100% rename from rustfmt-core/tests/target/item-brace-style-same-line-where.rs rename to rustfmt-lib/rustfmt-core/tests/target/item-brace-style-same-line-where.rs diff --git a/rustfmt-core/tests/target/itemized-blocks/no_wrap.rs b/rustfmt-lib/rustfmt-core/tests/target/itemized-blocks/no_wrap.rs similarity index 100% rename from rustfmt-core/tests/target/itemized-blocks/no_wrap.rs rename to rustfmt-lib/rustfmt-core/tests/target/itemized-blocks/no_wrap.rs diff --git a/rustfmt-core/tests/target/itemized-blocks/rewrite_fail.rs b/rustfmt-lib/rustfmt-core/tests/target/itemized-blocks/rewrite_fail.rs similarity index 100% rename from rustfmt-core/tests/target/itemized-blocks/rewrite_fail.rs rename to rustfmt-lib/rustfmt-core/tests/target/itemized-blocks/rewrite_fail.rs diff --git a/rustfmt-core/tests/target/itemized-blocks/urls.rs b/rustfmt-lib/rustfmt-core/tests/target/itemized-blocks/urls.rs similarity index 100% rename from rustfmt-core/tests/target/itemized-blocks/urls.rs rename to rustfmt-lib/rustfmt-core/tests/target/itemized-blocks/urls.rs diff --git a/rustfmt-core/tests/target/itemized-blocks/wrap.rs b/rustfmt-lib/rustfmt-core/tests/target/itemized-blocks/wrap.rs similarity index 100% rename from rustfmt-core/tests/target/itemized-blocks/wrap.rs rename to rustfmt-lib/rustfmt-core/tests/target/itemized-blocks/wrap.rs diff --git a/rustfmt-core/tests/target/label_break.rs b/rustfmt-lib/rustfmt-core/tests/target/label_break.rs similarity index 100% rename from rustfmt-core/tests/target/label_break.rs rename to rustfmt-lib/rustfmt-core/tests/target/label_break.rs diff --git a/rustfmt-core/tests/target/large-block.rs b/rustfmt-lib/rustfmt-core/tests/target/large-block.rs similarity index 100% rename from rustfmt-core/tests/target/large-block.rs rename to rustfmt-lib/rustfmt-core/tests/target/large-block.rs diff --git a/rustfmt-core/tests/target/large_vec.rs b/rustfmt-lib/rustfmt-core/tests/target/large_vec.rs similarity index 100% rename from rustfmt-core/tests/target/large_vec.rs rename to rustfmt-lib/rustfmt-core/tests/target/large_vec.rs diff --git a/rustfmt-core/tests/target/lazy_static.rs b/rustfmt-lib/rustfmt-core/tests/target/lazy_static.rs similarity index 100% rename from rustfmt-core/tests/target/lazy_static.rs rename to rustfmt-lib/rustfmt-core/tests/target/lazy_static.rs diff --git a/rustfmt-core/tests/target/license-templates/empty_license_path.rs b/rustfmt-lib/rustfmt-core/tests/target/license-templates/empty_license_path.rs similarity index 100% rename from rustfmt-core/tests/target/license-templates/empty_license_path.rs rename to rustfmt-lib/rustfmt-core/tests/target/license-templates/empty_license_path.rs diff --git a/rustfmt-core/tests/target/license-templates/license.rs b/rustfmt-lib/rustfmt-core/tests/target/license-templates/license.rs similarity index 100% rename from rustfmt-core/tests/target/license-templates/license.rs rename to rustfmt-lib/rustfmt-core/tests/target/license-templates/license.rs diff --git a/rustfmt-core/tests/target/long-fn-1/version_two.rs b/rustfmt-lib/rustfmt-core/tests/target/long-fn-1/version_two.rs similarity index 100% rename from rustfmt-core/tests/target/long-fn-1/version_two.rs rename to rustfmt-lib/rustfmt-core/tests/target/long-fn-1/version_two.rs diff --git a/rustfmt-core/tests/target/long-match-arms-brace-newline.rs b/rustfmt-lib/rustfmt-core/tests/target/long-match-arms-brace-newline.rs similarity index 100% rename from rustfmt-core/tests/target/long-match-arms-brace-newline.rs rename to rustfmt-lib/rustfmt-core/tests/target/long-match-arms-brace-newline.rs diff --git a/rustfmt-core/tests/target/long-use-statement-issue-3154.rs b/rustfmt-lib/rustfmt-core/tests/target/long-use-statement-issue-3154.rs similarity index 100% rename from rustfmt-core/tests/target/long-use-statement-issue-3154.rs rename to rustfmt-lib/rustfmt-core/tests/target/long-use-statement-issue-3154.rs diff --git a/rustfmt-core/tests/target/long_field_access.rs b/rustfmt-lib/rustfmt-core/tests/target/long_field_access.rs similarity index 100% rename from rustfmt-core/tests/target/long_field_access.rs rename to rustfmt-lib/rustfmt-core/tests/target/long_field_access.rs diff --git a/rustfmt-core/tests/target/loop.rs b/rustfmt-lib/rustfmt-core/tests/target/loop.rs similarity index 100% rename from rustfmt-core/tests/target/loop.rs rename to rustfmt-lib/rustfmt-core/tests/target/loop.rs diff --git a/rustfmt-core/tests/target/macro_not_expr.rs b/rustfmt-lib/rustfmt-core/tests/target/macro_not_expr.rs similarity index 100% rename from rustfmt-core/tests/target/macro_not_expr.rs rename to rustfmt-lib/rustfmt-core/tests/target/macro_not_expr.rs diff --git a/rustfmt-core/tests/target/macro_rules.rs b/rustfmt-lib/rustfmt-core/tests/target/macro_rules.rs similarity index 100% rename from rustfmt-core/tests/target/macro_rules.rs rename to rustfmt-lib/rustfmt-core/tests/target/macro_rules.rs diff --git a/rustfmt-core/tests/target/macros.rs b/rustfmt-lib/rustfmt-core/tests/target/macros.rs similarity index 100% rename from rustfmt-core/tests/target/macros.rs rename to rustfmt-lib/rustfmt-core/tests/target/macros.rs diff --git a/rustfmt-core/tests/target/markdown-comment-with-options.rs b/rustfmt-lib/rustfmt-core/tests/target/markdown-comment-with-options.rs similarity index 100% rename from rustfmt-core/tests/target/markdown-comment-with-options.rs rename to rustfmt-lib/rustfmt-core/tests/target/markdown-comment-with-options.rs diff --git a/rustfmt-core/tests/target/markdown-comment.rs b/rustfmt-lib/rustfmt-core/tests/target/markdown-comment.rs similarity index 100% rename from rustfmt-core/tests/target/markdown-comment.rs rename to rustfmt-lib/rustfmt-core/tests/target/markdown-comment.rs diff --git a/rustfmt-core/tests/target/match-block-trailing-comma.rs b/rustfmt-lib/rustfmt-core/tests/target/match-block-trailing-comma.rs similarity index 100% rename from rustfmt-core/tests/target/match-block-trailing-comma.rs rename to rustfmt-lib/rustfmt-core/tests/target/match-block-trailing-comma.rs diff --git a/rustfmt-core/tests/target/match-flattening.rs b/rustfmt-lib/rustfmt-core/tests/target/match-flattening.rs similarity index 100% rename from rustfmt-core/tests/target/match-flattening.rs rename to rustfmt-lib/rustfmt-core/tests/target/match-flattening.rs diff --git a/rustfmt-core/tests/target/match-nowrap-trailing-comma.rs b/rustfmt-lib/rustfmt-core/tests/target/match-nowrap-trailing-comma.rs similarity index 100% rename from rustfmt-core/tests/target/match-nowrap-trailing-comma.rs rename to rustfmt-lib/rustfmt-core/tests/target/match-nowrap-trailing-comma.rs diff --git a/rustfmt-core/tests/target/match-nowrap.rs b/rustfmt-lib/rustfmt-core/tests/target/match-nowrap.rs similarity index 100% rename from rustfmt-core/tests/target/match-nowrap.rs rename to rustfmt-lib/rustfmt-core/tests/target/match-nowrap.rs diff --git a/rustfmt-core/tests/target/match.rs b/rustfmt-lib/rustfmt-core/tests/target/match.rs similarity index 100% rename from rustfmt-core/tests/target/match.rs rename to rustfmt-lib/rustfmt-core/tests/target/match.rs diff --git a/rustfmt-core/tests/target/match_overflow_expr.rs b/rustfmt-lib/rustfmt-core/tests/target/match_overflow_expr.rs similarity index 100% rename from rustfmt-core/tests/target/match_overflow_expr.rs rename to rustfmt-lib/rustfmt-core/tests/target/match_overflow_expr.rs diff --git a/rustfmt-core/tests/target/max-line-length-in-chars.rs b/rustfmt-lib/rustfmt-core/tests/target/max-line-length-in-chars.rs similarity index 100% rename from rustfmt-core/tests/target/max-line-length-in-chars.rs rename to rustfmt-lib/rustfmt-core/tests/target/max-line-length-in-chars.rs diff --git a/rustfmt-core/tests/target/merge_imports.rs b/rustfmt-lib/rustfmt-core/tests/target/merge_imports.rs similarity index 100% rename from rustfmt-core/tests/target/merge_imports.rs rename to rustfmt-lib/rustfmt-core/tests/target/merge_imports.rs diff --git a/rustfmt-core/tests/target/mod-1.rs b/rustfmt-lib/rustfmt-core/tests/target/mod-1.rs similarity index 100% rename from rustfmt-core/tests/target/mod-1.rs rename to rustfmt-lib/rustfmt-core/tests/target/mod-1.rs diff --git a/rustfmt-core/tests/target/mod-2.rs b/rustfmt-lib/rustfmt-core/tests/target/mod-2.rs similarity index 100% rename from rustfmt-core/tests/target/mod-2.rs rename to rustfmt-lib/rustfmt-core/tests/target/mod-2.rs diff --git a/rustfmt-core/tests/target/mod_skip_child.rs b/rustfmt-lib/rustfmt-core/tests/target/mod_skip_child.rs similarity index 100% rename from rustfmt-core/tests/target/mod_skip_child.rs rename to rustfmt-lib/rustfmt-core/tests/target/mod_skip_child.rs diff --git a/rustfmt-core/tests/target/multi-file.rs b/rustfmt-lib/rustfmt-core/tests/target/multi-file.rs similarity index 100% rename from rustfmt-core/tests/target/multi-file.rs rename to rustfmt-lib/rustfmt-core/tests/target/multi-file.rs diff --git a/rustfmt-core/tests/target/multiline_string_in_macro_def.rs b/rustfmt-lib/rustfmt-core/tests/target/multiline_string_in_macro_def.rs similarity index 100% rename from rustfmt-core/tests/target/multiline_string_in_macro_def.rs rename to rustfmt-lib/rustfmt-core/tests/target/multiline_string_in_macro_def.rs diff --git a/rustfmt-core/tests/target/multiple.rs b/rustfmt-lib/rustfmt-core/tests/target/multiple.rs similarity index 100% rename from rustfmt-core/tests/target/multiple.rs rename to rustfmt-lib/rustfmt-core/tests/target/multiple.rs diff --git a/rustfmt-core/tests/target/nested-if-else.rs b/rustfmt-lib/rustfmt-core/tests/target/nested-if-else.rs similarity index 100% rename from rustfmt-core/tests/target/nested-if-else.rs rename to rustfmt-lib/rustfmt-core/tests/target/nested-if-else.rs diff --git a/rustfmt-core/tests/target/nested-visual-block.rs b/rustfmt-lib/rustfmt-core/tests/target/nested-visual-block.rs similarity index 100% rename from rustfmt-core/tests/target/nested-visual-block.rs rename to rustfmt-lib/rustfmt-core/tests/target/nested-visual-block.rs diff --git a/rustfmt-core/tests/target/nested_skipped/mod.rs b/rustfmt-lib/rustfmt-core/tests/target/nested_skipped/mod.rs similarity index 100% rename from rustfmt-core/tests/target/nested_skipped/mod.rs rename to rustfmt-lib/rustfmt-core/tests/target/nested_skipped/mod.rs diff --git a/rustfmt-core/tests/target/nestedmod/mod.rs b/rustfmt-lib/rustfmt-core/tests/target/nestedmod/mod.rs similarity index 100% rename from rustfmt-core/tests/target/nestedmod/mod.rs rename to rustfmt-lib/rustfmt-core/tests/target/nestedmod/mod.rs diff --git a/rustfmt-core/tests/target/nestedmod/mod2a.rs b/rustfmt-lib/rustfmt-core/tests/target/nestedmod/mod2a.rs similarity index 100% rename from rustfmt-core/tests/target/nestedmod/mod2a.rs rename to rustfmt-lib/rustfmt-core/tests/target/nestedmod/mod2a.rs diff --git a/rustfmt-core/tests/target/nestedmod/mod2b.rs b/rustfmt-lib/rustfmt-core/tests/target/nestedmod/mod2b.rs similarity index 100% rename from rustfmt-core/tests/target/nestedmod/mod2b.rs rename to rustfmt-lib/rustfmt-core/tests/target/nestedmod/mod2b.rs diff --git a/rustfmt-core/tests/target/nestedmod/mod2c.rs b/rustfmt-lib/rustfmt-core/tests/target/nestedmod/mod2c.rs similarity index 100% rename from rustfmt-core/tests/target/nestedmod/mod2c.rs rename to rustfmt-lib/rustfmt-core/tests/target/nestedmod/mod2c.rs diff --git a/rustfmt-core/tests/target/nestedmod/mymod1/mod3a.rs b/rustfmt-lib/rustfmt-core/tests/target/nestedmod/mymod1/mod3a.rs similarity index 100% rename from rustfmt-core/tests/target/nestedmod/mymod1/mod3a.rs rename to rustfmt-lib/rustfmt-core/tests/target/nestedmod/mymod1/mod3a.rs diff --git a/rustfmt-core/tests/target/nestedmod/submod2/a.rs b/rustfmt-lib/rustfmt-core/tests/target/nestedmod/submod2/a.rs similarity index 100% rename from rustfmt-core/tests/target/nestedmod/submod2/a.rs rename to rustfmt-lib/rustfmt-core/tests/target/nestedmod/submod2/a.rs diff --git a/rustfmt-core/tests/target/nestedmod/submod2/mod.rs b/rustfmt-lib/rustfmt-core/tests/target/nestedmod/submod2/mod.rs similarity index 100% rename from rustfmt-core/tests/target/nestedmod/submod2/mod.rs rename to rustfmt-lib/rustfmt-core/tests/target/nestedmod/submod2/mod.rs diff --git a/rustfmt-core/tests/target/no_arg_with_commnet.rs b/rustfmt-lib/rustfmt-core/tests/target/no_arg_with_commnet.rs similarity index 100% rename from rustfmt-core/tests/target/no_arg_with_commnet.rs rename to rustfmt-lib/rustfmt-core/tests/target/no_arg_with_commnet.rs diff --git a/rustfmt-core/tests/target/no_new_line_beginning.rs b/rustfmt-lib/rustfmt-core/tests/target/no_new_line_beginning.rs similarity index 100% rename from rustfmt-core/tests/target/no_new_line_beginning.rs rename to rustfmt-lib/rustfmt-core/tests/target/no_new_line_beginning.rs diff --git a/rustfmt-core/tests/target/normalize_doc_attributes_should_not_imply_format_doc_comments.rs b/rustfmt-lib/rustfmt-core/tests/target/normalize_doc_attributes_should_not_imply_format_doc_comments.rs similarity index 100% rename from rustfmt-core/tests/target/normalize_doc_attributes_should_not_imply_format_doc_comments.rs rename to rustfmt-lib/rustfmt-core/tests/target/normalize_doc_attributes_should_not_imply_format_doc_comments.rs diff --git a/rustfmt-core/tests/target/normalize_multiline_doc_attribute.rs b/rustfmt-lib/rustfmt-core/tests/target/normalize_multiline_doc_attribute.rs similarity index 100% rename from rustfmt-core/tests/target/normalize_multiline_doc_attribute.rs rename to rustfmt-lib/rustfmt-core/tests/target/normalize_multiline_doc_attribute.rs diff --git a/rustfmt-core/tests/target/obsolete_in_place.rs b/rustfmt-lib/rustfmt-core/tests/target/obsolete_in_place.rs similarity index 100% rename from rustfmt-core/tests/target/obsolete_in_place.rs rename to rustfmt-lib/rustfmt-core/tests/target/obsolete_in_place.rs diff --git a/rustfmt-core/tests/target/one_line_if_v2.rs b/rustfmt-lib/rustfmt-core/tests/target/one_line_if_v2.rs similarity index 100% rename from rustfmt-core/tests/target/one_line_if_v2.rs rename to rustfmt-lib/rustfmt-core/tests/target/one_line_if_v2.rs diff --git a/rustfmt-core/tests/target/other.rs b/rustfmt-lib/rustfmt-core/tests/target/other.rs similarity index 100% rename from rustfmt-core/tests/target/other.rs rename to rustfmt-lib/rustfmt-core/tests/target/other.rs diff --git a/rustfmt-core/tests/target/paren.rs b/rustfmt-lib/rustfmt-core/tests/target/paren.rs similarity index 100% rename from rustfmt-core/tests/target/paren.rs rename to rustfmt-lib/rustfmt-core/tests/target/paren.rs diff --git a/rustfmt-core/tests/target/path_clarity/foo.rs b/rustfmt-lib/rustfmt-core/tests/target/path_clarity/foo.rs similarity index 100% rename from rustfmt-core/tests/target/path_clarity/foo.rs rename to rustfmt-lib/rustfmt-core/tests/target/path_clarity/foo.rs diff --git a/rustfmt-core/tests/target/path_clarity/foo/bar.rs b/rustfmt-lib/rustfmt-core/tests/target/path_clarity/foo/bar.rs similarity index 100% rename from rustfmt-core/tests/target/path_clarity/foo/bar.rs rename to rustfmt-lib/rustfmt-core/tests/target/path_clarity/foo/bar.rs diff --git a/rustfmt-core/tests/target/paths.rs b/rustfmt-lib/rustfmt-core/tests/target/paths.rs similarity index 100% rename from rustfmt-core/tests/target/paths.rs rename to rustfmt-lib/rustfmt-core/tests/target/paths.rs diff --git a/rustfmt-core/tests/target/pattern-condense-wildcards.rs b/rustfmt-lib/rustfmt-core/tests/target/pattern-condense-wildcards.rs similarity index 100% rename from rustfmt-core/tests/target/pattern-condense-wildcards.rs rename to rustfmt-lib/rustfmt-core/tests/target/pattern-condense-wildcards.rs diff --git a/rustfmt-core/tests/target/pattern.rs b/rustfmt-lib/rustfmt-core/tests/target/pattern.rs similarity index 100% rename from rustfmt-core/tests/target/pattern.rs rename to rustfmt-lib/rustfmt-core/tests/target/pattern.rs diff --git a/rustfmt-core/tests/target/preserves_carriage_return_for_unix.rs b/rustfmt-lib/rustfmt-core/tests/target/preserves_carriage_return_for_unix.rs similarity index 100% rename from rustfmt-core/tests/target/preserves_carriage_return_for_unix.rs rename to rustfmt-lib/rustfmt-core/tests/target/preserves_carriage_return_for_unix.rs diff --git a/rustfmt-core/tests/target/preserves_carriage_return_for_windows.rs b/rustfmt-lib/rustfmt-core/tests/target/preserves_carriage_return_for_windows.rs similarity index 100% rename from rustfmt-core/tests/target/preserves_carriage_return_for_windows.rs rename to rustfmt-lib/rustfmt-core/tests/target/preserves_carriage_return_for_windows.rs diff --git a/rustfmt-core/tests/target/pub-restricted.rs b/rustfmt-lib/rustfmt-core/tests/target/pub-restricted.rs similarity index 100% rename from rustfmt-core/tests/target/pub-restricted.rs rename to rustfmt-lib/rustfmt-core/tests/target/pub-restricted.rs diff --git a/rustfmt-core/tests/target/raw_identifiers.rs b/rustfmt-lib/rustfmt-core/tests/target/raw_identifiers.rs similarity index 100% rename from rustfmt-core/tests/target/raw_identifiers.rs rename to rustfmt-lib/rustfmt-core/tests/target/raw_identifiers.rs diff --git a/rustfmt-core/tests/target/remove_blank_lines.rs b/rustfmt-lib/rustfmt-core/tests/target/remove_blank_lines.rs similarity index 100% rename from rustfmt-core/tests/target/remove_blank_lines.rs rename to rustfmt-lib/rustfmt-core/tests/target/remove_blank_lines.rs diff --git a/rustfmt-core/tests/target/reorder-impl-items.rs b/rustfmt-lib/rustfmt-core/tests/target/reorder-impl-items.rs similarity index 100% rename from rustfmt-core/tests/target/reorder-impl-items.rs rename to rustfmt-lib/rustfmt-core/tests/target/reorder-impl-items.rs diff --git a/rustfmt-core/tests/target/should_not_format_string_when_format_strings_is_not_set.rs b/rustfmt-lib/rustfmt-core/tests/target/should_not_format_string_when_format_strings_is_not_set.rs similarity index 100% rename from rustfmt-core/tests/target/should_not_format_string_when_format_strings_is_not_set.rs rename to rustfmt-lib/rustfmt-core/tests/target/should_not_format_string_when_format_strings_is_not_set.rs diff --git a/rustfmt-core/tests/target/single-line-if-else.rs b/rustfmt-lib/rustfmt-core/tests/target/single-line-if-else.rs similarity index 100% rename from rustfmt-core/tests/target/single-line-if-else.rs rename to rustfmt-lib/rustfmt-core/tests/target/single-line-if-else.rs diff --git a/rustfmt-core/tests/target/single-line-macro/v2.rs b/rustfmt-lib/rustfmt-core/tests/target/single-line-macro/v2.rs similarity index 100% rename from rustfmt-core/tests/target/single-line-macro/v2.rs rename to rustfmt-lib/rustfmt-core/tests/target/single-line-macro/v2.rs diff --git a/rustfmt-core/tests/target/skip.rs b/rustfmt-lib/rustfmt-core/tests/target/skip.rs similarity index 100% rename from rustfmt-core/tests/target/skip.rs rename to rustfmt-lib/rustfmt-core/tests/target/skip.rs diff --git a/rustfmt-core/tests/target/skip_mod.rs b/rustfmt-lib/rustfmt-core/tests/target/skip_mod.rs similarity index 100% rename from rustfmt-core/tests/target/skip_mod.rs rename to rustfmt-lib/rustfmt-core/tests/target/skip_mod.rs diff --git a/rustfmt-core/tests/target/soft-wrapping.rs b/rustfmt-lib/rustfmt-core/tests/target/soft-wrapping.rs similarity index 100% rename from rustfmt-core/tests/target/soft-wrapping.rs rename to rustfmt-lib/rustfmt-core/tests/target/soft-wrapping.rs diff --git a/rustfmt-core/tests/target/space-not-before-newline.rs b/rustfmt-lib/rustfmt-core/tests/target/space-not-before-newline.rs similarity index 100% rename from rustfmt-core/tests/target/space-not-before-newline.rs rename to rustfmt-lib/rustfmt-core/tests/target/space-not-before-newline.rs diff --git a/rustfmt-core/tests/target/spaces-around-ranges.rs b/rustfmt-lib/rustfmt-core/tests/target/spaces-around-ranges.rs similarity index 100% rename from rustfmt-core/tests/target/spaces-around-ranges.rs rename to rustfmt-lib/rustfmt-core/tests/target/spaces-around-ranges.rs diff --git a/rustfmt-core/tests/target/static.rs b/rustfmt-lib/rustfmt-core/tests/target/static.rs similarity index 100% rename from rustfmt-core/tests/target/static.rs rename to rustfmt-lib/rustfmt-core/tests/target/static.rs diff --git a/rustfmt-core/tests/target/string-lit-2.rs b/rustfmt-lib/rustfmt-core/tests/target/string-lit-2.rs similarity index 100% rename from rustfmt-core/tests/target/string-lit-2.rs rename to rustfmt-lib/rustfmt-core/tests/target/string-lit-2.rs diff --git a/rustfmt-core/tests/target/string-lit-custom.rs b/rustfmt-lib/rustfmt-core/tests/target/string-lit-custom.rs similarity index 100% rename from rustfmt-core/tests/target/string-lit-custom.rs rename to rustfmt-lib/rustfmt-core/tests/target/string-lit-custom.rs diff --git a/rustfmt-core/tests/target/string-lit.rs b/rustfmt-lib/rustfmt-core/tests/target/string-lit.rs similarity index 100% rename from rustfmt-core/tests/target/string-lit.rs rename to rustfmt-lib/rustfmt-core/tests/target/string-lit.rs diff --git a/rustfmt-core/tests/target/string_punctuation.rs b/rustfmt-lib/rustfmt-core/tests/target/string_punctuation.rs similarity index 100% rename from rustfmt-core/tests/target/string_punctuation.rs rename to rustfmt-lib/rustfmt-core/tests/target/string_punctuation.rs diff --git a/rustfmt-core/tests/target/struct-field-attributes.rs b/rustfmt-lib/rustfmt-core/tests/target/struct-field-attributes.rs similarity index 100% rename from rustfmt-core/tests/target/struct-field-attributes.rs rename to rustfmt-lib/rustfmt-core/tests/target/struct-field-attributes.rs diff --git a/rustfmt-core/tests/target/struct_lits.rs b/rustfmt-lib/rustfmt-core/tests/target/struct_lits.rs similarity index 100% rename from rustfmt-core/tests/target/struct_lits.rs rename to rustfmt-lib/rustfmt-core/tests/target/struct_lits.rs diff --git a/rustfmt-core/tests/target/struct_lits_multiline.rs b/rustfmt-lib/rustfmt-core/tests/target/struct_lits_multiline.rs similarity index 100% rename from rustfmt-core/tests/target/struct_lits_multiline.rs rename to rustfmt-lib/rustfmt-core/tests/target/struct_lits_multiline.rs diff --git a/rustfmt-core/tests/target/struct_lits_visual.rs b/rustfmt-lib/rustfmt-core/tests/target/struct_lits_visual.rs similarity index 100% rename from rustfmt-core/tests/target/struct_lits_visual.rs rename to rustfmt-lib/rustfmt-core/tests/target/struct_lits_visual.rs diff --git a/rustfmt-core/tests/target/struct_lits_visual_multiline.rs b/rustfmt-lib/rustfmt-core/tests/target/struct_lits_visual_multiline.rs similarity index 100% rename from rustfmt-core/tests/target/struct_lits_visual_multiline.rs rename to rustfmt-lib/rustfmt-core/tests/target/struct_lits_visual_multiline.rs diff --git a/rustfmt-core/tests/target/struct_tuple_visual.rs b/rustfmt-lib/rustfmt-core/tests/target/struct_tuple_visual.rs similarity index 100% rename from rustfmt-core/tests/target/struct_tuple_visual.rs rename to rustfmt-lib/rustfmt-core/tests/target/struct_tuple_visual.rs diff --git a/rustfmt-core/tests/target/structs.rs b/rustfmt-lib/rustfmt-core/tests/target/structs.rs similarity index 100% rename from rustfmt-core/tests/target/structs.rs rename to rustfmt-lib/rustfmt-core/tests/target/structs.rs diff --git a/rustfmt-core/tests/target/trailing-comma-never.rs b/rustfmt-lib/rustfmt-core/tests/target/trailing-comma-never.rs similarity index 100% rename from rustfmt-core/tests/target/trailing-comma-never.rs rename to rustfmt-lib/rustfmt-core/tests/target/trailing-comma-never.rs diff --git a/rustfmt-core/tests/target/trailing_commas.rs b/rustfmt-lib/rustfmt-core/tests/target/trailing_commas.rs similarity index 100% rename from rustfmt-core/tests/target/trailing_commas.rs rename to rustfmt-lib/rustfmt-core/tests/target/trailing_commas.rs diff --git a/rustfmt-core/tests/target/trailing_comments/hard_tabs.rs b/rustfmt-lib/rustfmt-core/tests/target/trailing_comments/hard_tabs.rs similarity index 100% rename from rustfmt-core/tests/target/trailing_comments/hard_tabs.rs rename to rustfmt-lib/rustfmt-core/tests/target/trailing_comments/hard_tabs.rs diff --git a/rustfmt-core/tests/target/trailing_comments/soft_tabs.rs b/rustfmt-lib/rustfmt-core/tests/target/trailing_comments/soft_tabs.rs similarity index 100% rename from rustfmt-core/tests/target/trailing_comments/soft_tabs.rs rename to rustfmt-lib/rustfmt-core/tests/target/trailing_comments/soft_tabs.rs diff --git a/rustfmt-core/tests/target/trait.rs b/rustfmt-lib/rustfmt-core/tests/target/trait.rs similarity index 100% rename from rustfmt-core/tests/target/trait.rs rename to rustfmt-lib/rustfmt-core/tests/target/trait.rs diff --git a/rustfmt-core/tests/target/trait_2015_edition.rs b/rustfmt-lib/rustfmt-core/tests/target/trait_2015_edition.rs similarity index 100% rename from rustfmt-core/tests/target/trait_2015_edition.rs rename to rustfmt-lib/rustfmt-core/tests/target/trait_2015_edition.rs diff --git a/rustfmt-core/tests/target/try-conversion.rs b/rustfmt-lib/rustfmt-core/tests/target/try-conversion.rs similarity index 100% rename from rustfmt-core/tests/target/try-conversion.rs rename to rustfmt-lib/rustfmt-core/tests/target/try-conversion.rs diff --git a/rustfmt-core/tests/target/tuple.rs b/rustfmt-lib/rustfmt-core/tests/target/tuple.rs similarity index 100% rename from rustfmt-core/tests/target/tuple.rs rename to rustfmt-lib/rustfmt-core/tests/target/tuple.rs diff --git a/rustfmt-core/tests/target/type-ascription.rs b/rustfmt-lib/rustfmt-core/tests/target/type-ascription.rs similarity index 100% rename from rustfmt-core/tests/target/type-ascription.rs rename to rustfmt-lib/rustfmt-core/tests/target/type-ascription.rs diff --git a/rustfmt-core/tests/target/type.rs b/rustfmt-lib/rustfmt-core/tests/target/type.rs similarity index 100% rename from rustfmt-core/tests/target/type.rs rename to rustfmt-lib/rustfmt-core/tests/target/type.rs diff --git a/rustfmt-core/tests/target/type_alias.rs b/rustfmt-lib/rustfmt-core/tests/target/type_alias.rs similarity index 100% rename from rustfmt-core/tests/target/type_alias.rs rename to rustfmt-lib/rustfmt-core/tests/target/type_alias.rs diff --git a/rustfmt-core/tests/target/unicode.rs b/rustfmt-lib/rustfmt-core/tests/target/unicode.rs similarity index 100% rename from rustfmt-core/tests/target/unicode.rs rename to rustfmt-lib/rustfmt-core/tests/target/unicode.rs diff --git a/rustfmt-core/tests/target/unindent_if_else_cond_comment.rs b/rustfmt-lib/rustfmt-core/tests/target/unindent_if_else_cond_comment.rs similarity index 100% rename from rustfmt-core/tests/target/unindent_if_else_cond_comment.rs rename to rustfmt-lib/rustfmt-core/tests/target/unindent_if_else_cond_comment.rs diff --git a/rustfmt-core/tests/target/unions.rs b/rustfmt-lib/rustfmt-core/tests/target/unions.rs similarity index 100% rename from rustfmt-core/tests/target/unions.rs rename to rustfmt-lib/rustfmt-core/tests/target/unions.rs diff --git a/rustfmt-core/tests/target/visibility.rs b/rustfmt-lib/rustfmt-core/tests/target/visibility.rs similarity index 100% rename from rustfmt-core/tests/target/visibility.rs rename to rustfmt-lib/rustfmt-core/tests/target/visibility.rs diff --git a/rustfmt-core/tests/target/visual-fn-type.rs b/rustfmt-lib/rustfmt-core/tests/target/visual-fn-type.rs similarity index 100% rename from rustfmt-core/tests/target/visual-fn-type.rs rename to rustfmt-lib/rustfmt-core/tests/target/visual-fn-type.rs diff --git a/rustfmt-core/tests/target/where-clause-rfc.rs b/rustfmt-lib/rustfmt-core/tests/target/where-clause-rfc.rs similarity index 100% rename from rustfmt-core/tests/target/where-clause-rfc.rs rename to rustfmt-lib/rustfmt-core/tests/target/where-clause-rfc.rs diff --git a/rustfmt-core/tests/target/where-clause.rs b/rustfmt-lib/rustfmt-core/tests/target/where-clause.rs similarity index 100% rename from rustfmt-core/tests/target/where-clause.rs rename to rustfmt-lib/rustfmt-core/tests/target/where-clause.rs diff --git a/rustfmt-core/tests/target/width-heuristics.rs b/rustfmt-lib/rustfmt-core/tests/target/width-heuristics.rs similarity index 100% rename from rustfmt-core/tests/target/width-heuristics.rs rename to rustfmt-lib/rustfmt-core/tests/target/width-heuristics.rs diff --git a/rustfmt-core/tests/target/wrap_comments_should_not_imply_format_doc_comments.rs b/rustfmt-lib/rustfmt-core/tests/target/wrap_comments_should_not_imply_format_doc_comments.rs similarity index 100% rename from rustfmt-core/tests/target/wrap_comments_should_not_imply_format_doc_comments.rs rename to rustfmt-lib/rustfmt-core/tests/target/wrap_comments_should_not_imply_format_doc_comments.rs diff --git a/rustfmt-core/tests/writemode/source/fn-single-line.rs b/rustfmt-lib/rustfmt-core/tests/writemode/source/fn-single-line.rs similarity index 100% rename from rustfmt-core/tests/writemode/source/fn-single-line.rs rename to rustfmt-lib/rustfmt-core/tests/writemode/source/fn-single-line.rs diff --git a/rustfmt-core/tests/writemode/source/json.rs b/rustfmt-lib/rustfmt-core/tests/writemode/source/json.rs similarity index 100% rename from rustfmt-core/tests/writemode/source/json.rs rename to rustfmt-lib/rustfmt-core/tests/writemode/source/json.rs diff --git a/rustfmt-core/tests/writemode/source/modified.rs b/rustfmt-lib/rustfmt-core/tests/writemode/source/modified.rs similarity index 100% rename from rustfmt-core/tests/writemode/source/modified.rs rename to rustfmt-lib/rustfmt-core/tests/writemode/source/modified.rs diff --git a/rustfmt-core/tests/writemode/source/stdin.rs b/rustfmt-lib/rustfmt-core/tests/writemode/source/stdin.rs similarity index 100% rename from rustfmt-core/tests/writemode/source/stdin.rs rename to rustfmt-lib/rustfmt-core/tests/writemode/source/stdin.rs diff --git a/rustfmt-core/tests/writemode/target/checkstyle.xml b/rustfmt-lib/rustfmt-core/tests/writemode/target/checkstyle.xml similarity index 100% rename from rustfmt-core/tests/writemode/target/checkstyle.xml rename to rustfmt-lib/rustfmt-core/tests/writemode/target/checkstyle.xml diff --git a/rustfmt-core/tests/writemode/target/modified.txt b/rustfmt-lib/rustfmt-core/tests/writemode/target/modified.txt similarity index 100% rename from rustfmt-core/tests/writemode/target/modified.txt rename to rustfmt-lib/rustfmt-core/tests/writemode/target/modified.txt diff --git a/rustfmt-core/tests/writemode/target/output.json b/rustfmt-lib/rustfmt-core/tests/writemode/target/output.json similarity index 100% rename from rustfmt-core/tests/writemode/target/output.json rename to rustfmt-lib/rustfmt-core/tests/writemode/target/output.json diff --git a/rustfmt-core/tests/writemode/target/stdin.json b/rustfmt-lib/rustfmt-core/tests/writemode/target/stdin.json similarity index 100% rename from rustfmt-core/tests/writemode/target/stdin.json rename to rustfmt-lib/rustfmt-core/tests/writemode/target/stdin.json diff --git a/rustfmt-core/tests/writemode/target/stdin.xml b/rustfmt-lib/rustfmt-core/tests/writemode/target/stdin.xml similarity index 100% rename from rustfmt-core/tests/writemode/target/stdin.xml rename to rustfmt-lib/rustfmt-core/tests/writemode/target/stdin.xml diff --git a/rustfmt-emitter/.gitignore b/rustfmt-lib/rustfmt-emitter/.gitignore similarity index 100% rename from rustfmt-emitter/.gitignore rename to rustfmt-lib/rustfmt-emitter/.gitignore diff --git a/rustfmt-emitter/Cargo.toml b/rustfmt-lib/rustfmt-emitter/Cargo.toml similarity index 100% rename from rustfmt-emitter/Cargo.toml rename to rustfmt-lib/rustfmt-emitter/Cargo.toml diff --git a/rustfmt-emitter/src/checkstyle.rs b/rustfmt-lib/rustfmt-emitter/src/checkstyle.rs similarity index 100% rename from rustfmt-emitter/src/checkstyle.rs rename to rustfmt-lib/rustfmt-emitter/src/checkstyle.rs diff --git a/rustfmt-emitter/src/checkstyle/xml.rs b/rustfmt-lib/rustfmt-emitter/src/checkstyle/xml.rs similarity index 100% rename from rustfmt-emitter/src/checkstyle/xml.rs rename to rustfmt-lib/rustfmt-emitter/src/checkstyle/xml.rs diff --git a/rustfmt-emitter/src/diff.rs b/rustfmt-lib/rustfmt-emitter/src/diff.rs similarity index 100% rename from rustfmt-emitter/src/diff.rs rename to rustfmt-lib/rustfmt-emitter/src/diff.rs diff --git a/rustfmt-emitter/src/files.rs b/rustfmt-lib/rustfmt-emitter/src/files.rs similarity index 100% rename from rustfmt-emitter/src/files.rs rename to rustfmt-lib/rustfmt-emitter/src/files.rs diff --git a/rustfmt-emitter/src/json.rs b/rustfmt-lib/rustfmt-emitter/src/json.rs similarity index 100% rename from rustfmt-emitter/src/json.rs rename to rustfmt-lib/rustfmt-emitter/src/json.rs diff --git a/rustfmt-emitter/src/lib.rs b/rustfmt-lib/rustfmt-emitter/src/lib.rs similarity index 100% rename from rustfmt-emitter/src/lib.rs rename to rustfmt-lib/rustfmt-emitter/src/lib.rs diff --git a/rustfmt-emitter/src/modified_lines.rs b/rustfmt-lib/rustfmt-emitter/src/modified_lines.rs similarity index 100% rename from rustfmt-emitter/src/modified_lines.rs rename to rustfmt-lib/rustfmt-emitter/src/modified_lines.rs diff --git a/rustfmt-emitter/src/rustfmt_diff.rs b/rustfmt-lib/rustfmt-emitter/src/rustfmt_diff.rs similarity index 100% rename from rustfmt-emitter/src/rustfmt_diff.rs rename to rustfmt-lib/rustfmt-emitter/src/rustfmt_diff.rs diff --git a/rustfmt-emitter/src/stdout.rs b/rustfmt-lib/rustfmt-emitter/src/stdout.rs similarity index 100% rename from rustfmt-emitter/src/stdout.rs rename to rustfmt-lib/rustfmt-emitter/src/stdout.rs From 507a704ffb1bc6ed9c2e3303ba661d7b29f0ce5a Mon Sep 17 00:00:00 2001 From: topecongiro Date: Sat, 4 Jan 2020 20:39:02 +0900 Subject: [PATCH 06/18] Add back generic-simd feature --- Cargo.lock | 12 ++++++++++++ Cargo.toml | 1 + rustfmt-lib/rustfmt-core/Cargo.toml | 3 +++ 3 files changed, 16 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 26b22c300de..6c44bab3c05 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -119,6 +119,9 @@ dependencies = [ name = "bytecount" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "packed_simd 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "byteorder" @@ -479,6 +482,14 @@ dependencies = [ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "packed_simd" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "parking_lot" version = "0.9.0" @@ -1219,6 +1230,7 @@ dependencies = [ "checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" "checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" "checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72" +"checksum packed_simd 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a85ea9fc0d4ac0deb6fe7911d38786b32fc11119afd9e9d38b84ff691ce64220" "checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" "checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" "checksum proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aeccfe4d5d8ea175d5f0e4a2ad0637e0f4121d63bd99d356fb1f39ab2e7c6097" diff --git a/Cargo.toml b/Cargo.toml index 9b30859d8dd..4f6914c5c73 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,6 +31,7 @@ path = "src/git-rustfmt/main.rs" default = ["cargo-fmt", "rustfmt-format-diff"] cargo-fmt = [] rustfmt-format-diff = [] +generic-simd = ["rustfmt_core/generic-simd"] [dependencies] ansi_term = "0.12" diff --git a/rustfmt-lib/rustfmt-core/Cargo.toml b/rustfmt-lib/rustfmt-core/Cargo.toml index 2b28f86a66c..02f6ab31fb8 100644 --- a/rustfmt-lib/rustfmt-core/Cargo.toml +++ b/rustfmt-lib/rustfmt-core/Cargo.toml @@ -6,6 +6,9 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[features] +generic-simd = ["bytecount/generic-simd"] + [dependencies] annotate-snippets = { version = "0.6", features = ["ansi_term"] } anyhow = "1.0" From 007e34a05dd93486915721ab4320ef4e775b621c Mon Sep 17 00:00:00 2001 From: topecongiro Date: Sat, 4 Jan 2020 20:45:11 +0900 Subject: [PATCH 07/18] Bump versions --- Cargo.lock | 14 +++++++------- rustfmt-lib/rustfmt-config/Cargo.toml | 4 ++-- .../rustfmt-config/config_proc_macro/Cargo.toml | 2 +- rustfmt-lib/rustfmt-core/Cargo.toml | 2 +- rustfmt-lib/rustfmt-emitter/Cargo.toml | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6c44bab3c05..ed9c2f9f9ab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -829,7 +829,7 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-workspace-hack 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustfmt_core 0.1.0", + "rustfmt_core 1.0.0", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "structopt 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -839,7 +839,7 @@ dependencies = [ [[package]] name = "rustfmt_config" -version = "0.1.0" +version = "1.0.0" dependencies = [ "ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -855,7 +855,7 @@ dependencies = [ [[package]] name = "rustfmt_core" -version = "0.1.0" +version = "1.0.0" dependencies = [ "annotate-snippets 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", @@ -869,8 +869,8 @@ dependencies = [ "rustc-ap-rustc_target 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-ap-syntax 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-ap-syntax_pos 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustfmt_config 0.1.0", - "rustfmt_emitter 0.1.0", + "rustfmt_config 1.0.0", + "rustfmt_emitter 1.0.0", "term 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -880,10 +880,10 @@ dependencies = [ [[package]] name = "rustfmt_emitter" -version = "0.1.0" +version = "1.0.0" dependencies = [ "diff 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "rustfmt_config 0.1.0", + "rustfmt_config 1.0.0", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "term 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/rustfmt-lib/rustfmt-config/Cargo.toml b/rustfmt-lib/rustfmt-config/Cargo.toml index 0ace8a2f565..3d1da0a4372 100644 --- a/rustfmt-lib/rustfmt-config/Cargo.toml +++ b/rustfmt-lib/rustfmt-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rustfmt_config" -version = "0.1.0" +version = "1.0.0" authors = ["topecongiro "] edition = "2018" @@ -11,7 +11,7 @@ ansi_term = "0.12" dirs = "2.0" itertools = "0.8" regex = "1.3" -rustfmt-config_proc_macro = { version = "0.2", path = "config_proc_macro" } +rustfmt-config_proc_macro = { version = "0.3", path = "config_proc_macro" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" thiserror = "1.0" diff --git a/rustfmt-lib/rustfmt-config/config_proc_macro/Cargo.toml b/rustfmt-lib/rustfmt-config/config_proc_macro/Cargo.toml index cc995571602..0222f568e1a 100644 --- a/rustfmt-lib/rustfmt-config/config_proc_macro/Cargo.toml +++ b/rustfmt-lib/rustfmt-config/config_proc_macro/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rustfmt-config_proc_macro" -version = "0.2.0" +version = "0.3.0" authors = ["topecongiro "] edition = "2018" description = "A collection of procedural macros for rustfmt" diff --git a/rustfmt-lib/rustfmt-core/Cargo.toml b/rustfmt-lib/rustfmt-core/Cargo.toml index 02f6ab31fb8..139c550e1a9 100644 --- a/rustfmt-lib/rustfmt-core/Cargo.toml +++ b/rustfmt-lib/rustfmt-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rustfmt_core" -version = "0.1.0" +version = "1.0.0" authors = ["topecongiro "] edition = "2018" diff --git a/rustfmt-lib/rustfmt-emitter/Cargo.toml b/rustfmt-lib/rustfmt-emitter/Cargo.toml index a16aa7a974b..ff7c793d04a 100644 --- a/rustfmt-lib/rustfmt-emitter/Cargo.toml +++ b/rustfmt-lib/rustfmt-emitter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rustfmt_emitter" -version = "0.1.0" +version = "1.0.0" authors = ["topecongiro "] edition = "2018" From 8889c946d9a46e8a3aa122b92963ce3dd584e22f Mon Sep 17 00:00:00 2001 From: topecongiro Date: Sat, 4 Jan 2020 20:48:22 +0900 Subject: [PATCH 08/18] Bump versions --- Cargo.lock | 4 ++-- rustfmt-lib/rustfmt-config/Cargo.toml | 2 +- rustfmt-lib/rustfmt-config/config_proc_macro/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ed9c2f9f9ab..ebd13a8c719 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -809,7 +809,7 @@ dependencies = [ [[package]] name = "rustfmt-config_proc_macro" -version = "0.2.0" +version = "0.4.0" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -846,7 +846,7 @@ dependencies = [ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-ap-syntax_pos 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustfmt-config_proc_macro 0.2.0", + "rustfmt-config_proc_macro 0.4.0", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/rustfmt-lib/rustfmt-config/Cargo.toml b/rustfmt-lib/rustfmt-config/Cargo.toml index 3d1da0a4372..999c47e8d35 100644 --- a/rustfmt-lib/rustfmt-config/Cargo.toml +++ b/rustfmt-lib/rustfmt-config/Cargo.toml @@ -11,7 +11,7 @@ ansi_term = "0.12" dirs = "2.0" itertools = "0.8" regex = "1.3" -rustfmt-config_proc_macro = { version = "0.3", path = "config_proc_macro" } +rustfmt-config_proc_macro = { version = "0.4", path = "config_proc_macro" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" thiserror = "1.0" diff --git a/rustfmt-lib/rustfmt-config/config_proc_macro/Cargo.toml b/rustfmt-lib/rustfmt-config/config_proc_macro/Cargo.toml index 0222f568e1a..2931cc45ce8 100644 --- a/rustfmt-lib/rustfmt-config/config_proc_macro/Cargo.toml +++ b/rustfmt-lib/rustfmt-config/config_proc_macro/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rustfmt-config_proc_macro" -version = "0.3.0" +version = "0.4.0" authors = ["topecongiro "] edition = "2018" description = "A collection of procedural macros for rustfmt" From 36a097b4171619c543cda27b11f96b10e06b8c53 Mon Sep 17 00:00:00 2001 From: topecongiro Date: Sat, 4 Jan 2020 23:24:48 +0900 Subject: [PATCH 09/18] Update Cargo.toml --- rustfmt-lib/rustfmt-config/Cargo.toml | 2 ++ rustfmt-lib/rustfmt-core/Cargo.toml | 2 ++ rustfmt-lib/rustfmt-emitter/Cargo.toml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/rustfmt-lib/rustfmt-config/Cargo.toml b/rustfmt-lib/rustfmt-config/Cargo.toml index 999c47e8d35..0b40482cee2 100644 --- a/rustfmt-lib/rustfmt-config/Cargo.toml +++ b/rustfmt-lib/rustfmt-config/Cargo.toml @@ -3,6 +3,8 @@ name = "rustfmt_config" version = "1.0.0" authors = ["topecongiro "] edition = "2018" +description = "Rustfmt configuration library" +license = "Apache-2.0/MIT" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/rustfmt-lib/rustfmt-core/Cargo.toml b/rustfmt-lib/rustfmt-core/Cargo.toml index 139c550e1a9..19faea5357f 100644 --- a/rustfmt-lib/rustfmt-core/Cargo.toml +++ b/rustfmt-lib/rustfmt-core/Cargo.toml @@ -3,6 +3,8 @@ name = "rustfmt_core" version = "1.0.0" authors = ["topecongiro "] edition = "2018" +description = "Rustfmt core library" +license = "Apache-2.0/MIT" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/rustfmt-lib/rustfmt-emitter/Cargo.toml b/rustfmt-lib/rustfmt-emitter/Cargo.toml index ff7c793d04a..a4426b1b0bd 100644 --- a/rustfmt-lib/rustfmt-emitter/Cargo.toml +++ b/rustfmt-lib/rustfmt-emitter/Cargo.toml @@ -3,6 +3,8 @@ name = "rustfmt_emitter" version = "1.0.0" authors = ["topecongiro "] edition = "2018" +description = "Rustfmt emitter library" +license = "Apache-2.0/MIT" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html From 7a51340ef152431ed773c8759cfb9538c93392df Mon Sep 17 00:00:00 2001 From: topecongiro Date: Sat, 4 Jan 2020 23:31:14 +0900 Subject: [PATCH 10/18] Rename rustfmt_config to rustfmt_configuration --- Cargo.lock | 6 +++--- rustfmt-lib/rustfmt-config/Cargo.toml | 2 +- rustfmt-lib/rustfmt-core/Cargo.toml | 2 +- rustfmt-lib/rustfmt-core/src/lib.rs | 2 +- rustfmt-lib/rustfmt-emitter/Cargo.toml | 2 +- rustfmt-lib/rustfmt-emitter/src/diff.rs | 2 +- rustfmt-lib/rustfmt-emitter/src/lib.rs | 2 +- rustfmt-lib/rustfmt-emitter/src/rustfmt_diff.rs | 2 +- rustfmt-lib/rustfmt-emitter/src/stdout.rs | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ebd13a8c719..8cde7e3224b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -838,7 +838,7 @@ dependencies = [ ] [[package]] -name = "rustfmt_config" +name = "rustfmt_configuration" version = "1.0.0" dependencies = [ "ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -869,7 +869,7 @@ dependencies = [ "rustc-ap-rustc_target 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-ap-syntax 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-ap-syntax_pos 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustfmt_config 1.0.0", + "rustfmt_configuration 1.0.0", "rustfmt_emitter 1.0.0", "term 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -883,7 +883,7 @@ name = "rustfmt_emitter" version = "1.0.0" dependencies = [ "diff 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "rustfmt_config 1.0.0", + "rustfmt_configuration 1.0.0", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "term 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/rustfmt-lib/rustfmt-config/Cargo.toml b/rustfmt-lib/rustfmt-config/Cargo.toml index 0b40482cee2..f24e98a255b 100644 --- a/rustfmt-lib/rustfmt-config/Cargo.toml +++ b/rustfmt-lib/rustfmt-config/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "rustfmt_config" +name = "rustfmt_configuration" version = "1.0.0" authors = ["topecongiro "] edition = "2018" diff --git a/rustfmt-lib/rustfmt-core/Cargo.toml b/rustfmt-lib/rustfmt-core/Cargo.toml index 19faea5357f..8c97945c32c 100644 --- a/rustfmt-lib/rustfmt-core/Cargo.toml +++ b/rustfmt-lib/rustfmt-core/Cargo.toml @@ -20,7 +20,7 @@ itertools = "0.8" lazy_static = "1.0.0" log = "0.4" regex = "1.0" -rustfmt_config = { path = "../rustfmt-config" } +rustfmt_configuration = { path = "../rustfmt-config" } rustfmt_emitter = { path = "../rustfmt-emitter" } term = "0.6" thiserror = "1.0" diff --git a/rustfmt-lib/rustfmt-core/src/lib.rs b/rustfmt-lib/rustfmt-core/src/lib.rs index 4e09ae40008..adbe23afbf0 100644 --- a/rustfmt-lib/rustfmt-core/src/lib.rs +++ b/rustfmt-lib/rustfmt-core/src/lib.rs @@ -15,7 +15,7 @@ use std::panic; use std::path::PathBuf; use std::rc::Rc; -use rustfmt_config as config; +use rustfmt_configuration as config; use syntax::ast; use thiserror::Error; diff --git a/rustfmt-lib/rustfmt-emitter/Cargo.toml b/rustfmt-lib/rustfmt-emitter/Cargo.toml index a4426b1b0bd..9962342e0ef 100644 --- a/rustfmt-lib/rustfmt-emitter/Cargo.toml +++ b/rustfmt-lib/rustfmt-emitter/Cargo.toml @@ -10,7 +10,7 @@ license = "Apache-2.0/MIT" [dependencies] diff = "0.1" -rustfmt_config = { path = "../rustfmt-config" } +rustfmt_configuration = { path = "../rustfmt-config" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" term = "0.6" \ No newline at end of file diff --git a/rustfmt-lib/rustfmt-emitter/src/diff.rs b/rustfmt-lib/rustfmt-emitter/src/diff.rs index 00a0bed1101..5f901db5c5e 100644 --- a/rustfmt-lib/rustfmt-emitter/src/diff.rs +++ b/rustfmt-lib/rustfmt-emitter/src/diff.rs @@ -1,4 +1,4 @@ -use rustfmt_config::Config; +use rustfmt_configuration::Config; use crate::rustfmt_diff::{make_diff, print_diff}; use super::*; diff --git a/rustfmt-lib/rustfmt-emitter/src/lib.rs b/rustfmt-lib/rustfmt-emitter/src/lib.rs index e62a994c294..b34d9e64a8f 100644 --- a/rustfmt-lib/rustfmt-emitter/src/lib.rs +++ b/rustfmt-lib/rustfmt-emitter/src/lib.rs @@ -8,7 +8,7 @@ pub use self::stdout::*; use std::io::{self, Write}; use std::path::Path; -use rustfmt_config::FileName; +use rustfmt_configuration::FileName; pub mod checkstyle; pub mod diff; diff --git a/rustfmt-lib/rustfmt-emitter/src/rustfmt_diff.rs b/rustfmt-lib/rustfmt-emitter/src/rustfmt_diff.rs index 84578154fe8..65782e66ac8 100644 --- a/rustfmt-lib/rustfmt-emitter/src/rustfmt_diff.rs +++ b/rustfmt-lib/rustfmt-emitter/src/rustfmt_diff.rs @@ -3,7 +3,7 @@ use std::fmt; use std::io; use std::io::Write; -use rustfmt_config::{Color, Config, Verbosity}; +use rustfmt_configuration::{Color, Config, Verbosity}; #[derive(Debug, PartialEq)] pub enum DiffLine { diff --git a/rustfmt-lib/rustfmt-emitter/src/stdout.rs b/rustfmt-lib/rustfmt-emitter/src/stdout.rs index 652542ef5ef..4792498f3a0 100644 --- a/rustfmt-lib/rustfmt-emitter/src/stdout.rs +++ b/rustfmt-lib/rustfmt-emitter/src/stdout.rs @@ -1,6 +1,6 @@ use std::io::Write; -use rustfmt_config::Verbosity; +use rustfmt_configuration::Verbosity; use super::*; From 9d08fe8f30cc7e9d1f87ed06034de28cf46e5e24 Mon Sep 17 00:00:00 2001 From: topecongiro Date: Sat, 4 Jan 2020 23:33:57 +0900 Subject: [PATCH 11/18] Update Cargo.toml --- rustfmt-lib/rustfmt-config/Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/rustfmt-lib/rustfmt-config/Cargo.toml b/rustfmt-lib/rustfmt-config/Cargo.toml index f24e98a255b..ebf9063a9cf 100644 --- a/rustfmt-lib/rustfmt-config/Cargo.toml +++ b/rustfmt-lib/rustfmt-config/Cargo.toml @@ -5,6 +5,7 @@ authors = ["topecongiro "] edition = "2018" description = "Rustfmt configuration library" license = "Apache-2.0/MIT" +repository = "https://github.com/rust-lang/rustfmt" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html From 672ac876a1777a886fa7319c48c2231de7c5f3fa Mon Sep 17 00:00:00 2001 From: topecongiro Date: Sat, 4 Jan 2020 23:34:56 +0900 Subject: [PATCH 12/18] Update Cargo.toml --- rustfmt-lib/rustfmt-emitter/Cargo.toml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rustfmt-lib/rustfmt-emitter/Cargo.toml b/rustfmt-lib/rustfmt-emitter/Cargo.toml index 9962342e0ef..75ffe123cd7 100644 --- a/rustfmt-lib/rustfmt-emitter/Cargo.toml +++ b/rustfmt-lib/rustfmt-emitter/Cargo.toml @@ -5,12 +5,13 @@ authors = ["topecongiro "] edition = "2018" description = "Rustfmt emitter library" license = "Apache-2.0/MIT" +repository = "https://github.com/rust-lang/rustfmt" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] diff = "0.1" -rustfmt_configuration = { path = "../rustfmt-config" } +rustfmt_configuration = { path = "../rustfmt-config", version = "1.0" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -term = "0.6" \ No newline at end of file +term = "0.6" From 8dc5baaa3efbab44b514536ad4f035af78e260f4 Mon Sep 17 00:00:00 2001 From: topecongiro Date: Sat, 4 Jan 2020 23:35:52 +0900 Subject: [PATCH 13/18] Update Cargo.toml --- rustfmt-lib/rustfmt-core/Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/rustfmt-lib/rustfmt-core/Cargo.toml b/rustfmt-lib/rustfmt-core/Cargo.toml index 8c97945c32c..4da9da1ba0d 100644 --- a/rustfmt-lib/rustfmt-core/Cargo.toml +++ b/rustfmt-lib/rustfmt-core/Cargo.toml @@ -5,6 +5,7 @@ authors = ["topecongiro "] edition = "2018" description = "Rustfmt core library" license = "Apache-2.0/MIT" +repository = "https://github.com/rust-lang/rustfmt" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html From f7492695bdb28f4058b0dce294976a8c01512892 Mon Sep 17 00:00:00 2001 From: topecongiro Date: Sat, 4 Jan 2020 23:36:40 +0900 Subject: [PATCH 14/18] Update Cargo.toml --- rustfmt-lib/rustfmt-core/Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rustfmt-lib/rustfmt-core/Cargo.toml b/rustfmt-lib/rustfmt-core/Cargo.toml index 4da9da1ba0d..f7d04443031 100644 --- a/rustfmt-lib/rustfmt-core/Cargo.toml +++ b/rustfmt-lib/rustfmt-core/Cargo.toml @@ -16,13 +16,13 @@ generic-simd = ["bytecount/generic-simd"] annotate-snippets = { version = "0.6", features = ["ansi_term"] } anyhow = "1.0" bytecount = "0.6" -ignore = { git = "https://github.com/topecongiro/ripgrep", branch = "update-crossbeam" } +ignore = { git = "https://github.com/topecongiro/ripgrep", branch = "update-crossbeam", version = "0.4" } itertools = "0.8" lazy_static = "1.0.0" log = "0.4" regex = "1.0" -rustfmt_configuration = { path = "../rustfmt-config" } -rustfmt_emitter = { path = "../rustfmt-emitter" } +rustfmt_configuration = { path = "../rustfmt-config", version = "1.0" } +rustfmt_emitter = { path = "../rustfmt-emitter", version = "1.0" } term = "0.6" thiserror = "1.0" unicode_categories = "0.1.1" From eac32dd46aa603594e93c25ca91086f5d8aec2c1 Mon Sep 17 00:00:00 2001 From: topecongiro Date: Sun, 5 Jan 2020 00:17:57 +0900 Subject: [PATCH 15/18] Use the pathced ignore crate --- rustfmt-lib/rustfmt-core/Cargo.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rustfmt-lib/rustfmt-core/Cargo.toml b/rustfmt-lib/rustfmt-core/Cargo.toml index f7d04443031..94e0a48a0a7 100644 --- a/rustfmt-lib/rustfmt-core/Cargo.toml +++ b/rustfmt-lib/rustfmt-core/Cargo.toml @@ -16,7 +16,6 @@ generic-simd = ["bytecount/generic-simd"] annotate-snippets = { version = "0.6", features = ["ansi_term"] } anyhow = "1.0" bytecount = "0.6" -ignore = { git = "https://github.com/topecongiro/ripgrep", branch = "update-crossbeam", version = "0.4" } itertools = "0.8" lazy_static = "1.0.0" log = "0.4" @@ -32,6 +31,10 @@ unicode-width = "0.1.5" [dev-dependencies] env_logger = "0.7" +[dependencies.ignore] +package = "rustfmt_ignore" +version = "0.4.10" + [dependencies.rustc_target] package = "rustc-ap-rustc_target" version = "610.0.0" From 2d324968b4ec6d962f40f943b350304918d71dee Mon Sep 17 00:00:00 2001 From: topecongiro Date: Sun, 5 Jan 2020 00:22:11 +0900 Subject: [PATCH 16/18] Rename libs --- Cargo.lock | 986 +++++++++--------- Cargo.toml | 6 +- {rustfmt-lib => rustfmt-core}/.gitignore | 0 {rustfmt-lib => rustfmt-core}/Cargo.toml | 2 +- .../rustfmt-config/.gitignore | 0 .../rustfmt-config/Cargo.toml | 0 .../config_proc_macro/.gitignore | 0 .../config_proc_macro/Cargo.toml | 0 .../config_proc_macro/src/attrs.rs | 0 .../config_proc_macro/src/config_type.rs | 0 .../config_proc_macro/src/item_enum.rs | 0 .../config_proc_macro/src/item_struct.rs | 0 .../config_proc_macro/src/lib.rs | 0 .../config_proc_macro/src/utils.rs | 0 .../config_proc_macro/tests/smoke.rs | 0 .../rustfmt-config/src/config_type.rs | 0 .../rustfmt-config/src/file_lines.rs | 0 .../rustfmt-config/src/lib.rs | 0 .../rustfmt-config/src/license.rs | 0 .../rustfmt-config/src/lists.rs | 0 .../rustfmt-config/src/options.rs | 0 .../tests/license-template/lt.txt | 0 .../rustfmt-emitter/.gitignore | 0 .../rustfmt-emitter/Cargo.toml | 0 .../rustfmt-emitter/src/checkstyle.rs | 0 .../rustfmt-emitter/src/checkstyle/xml.rs | 0 .../rustfmt-emitter/src/diff.rs | 0 .../rustfmt-emitter/src/files.rs | 0 .../rustfmt-emitter/src/json.rs | 0 .../rustfmt-emitter/src/lib.rs | 0 .../rustfmt-emitter/src/modified_lines.rs | 0 .../rustfmt-emitter/src/rustfmt_diff.rs | 0 .../rustfmt-emitter/src/stdout.rs | 0 .../rustfmt-lib}/.gitignore | 0 .../rustfmt-lib}/Cargo.toml | 4 +- .../rustfmt-lib}/src/attr.rs | 0 .../rustfmt-lib}/src/attr/doc_comment.rs | 0 .../rustfmt-lib}/src/chains.rs | 0 .../rustfmt-lib}/src/closures.rs | 0 .../rustfmt-lib}/src/comment.rs | 0 .../rustfmt-lib}/src/coverage.rs | 0 .../rustfmt-lib}/src/expr.rs | 0 .../src/format_report_formatter.rs | 0 .../rustfmt-lib}/src/formatting.rs | 0 .../src/formatting/newline_style.rs | 0 .../rustfmt-lib}/src/ignore_path.rs | 0 .../rustfmt-lib}/src/imports.rs | 0 .../rustfmt-lib}/src/issues.rs | 0 .../rustfmt-lib}/src/items.rs | 0 .../rustfmt-lib}/src/lib.rs | 0 .../rustfmt-lib}/src/lists.rs | 0 .../rustfmt-lib}/src/macros.rs | 0 .../rustfmt-lib}/src/matches.rs | 0 .../rustfmt-lib}/src/missed_spans.rs | 0 .../rustfmt-lib}/src/modules.rs | 0 .../rustfmt-lib}/src/modules/visitor.rs | 0 .../rustfmt-lib}/src/overflow.rs | 0 .../rustfmt-lib}/src/pairs.rs | 0 .../rustfmt-lib}/src/patterns.rs | 0 .../rustfmt-lib}/src/release_channel.rs | 0 .../rustfmt-lib}/src/reorder.rs | 0 .../rustfmt-lib}/src/rewrite.rs | 0 .../rustfmt-lib}/src/shape.rs | 0 .../rustfmt-lib}/src/skip.rs | 0 .../rustfmt-lib}/src/source_file.rs | 0 .../rustfmt-lib}/src/source_map.rs | 0 .../rustfmt-lib}/src/spanned.rs | 0 .../rustfmt-lib}/src/stmt.rs | 0 .../rustfmt-lib}/src/string.rs | 0 .../rustfmt-lib}/src/syntux.rs | 0 .../rustfmt-lib}/src/syntux/parser.rs | 0 .../rustfmt-lib}/src/syntux/session.rs | 0 .../src/test/configuration_snippet.rs | 0 .../rustfmt-lib}/src/test/mod.rs | 0 .../rustfmt-lib}/src/types.rs | 0 .../rustfmt-lib}/src/utils.rs | 0 .../rustfmt-lib}/src/vertical.rs | 0 .../rustfmt-lib}/src/visitor.rs | 0 .../rustfmt-lib}/tests/config/issue-1111.toml | 0 .../rustfmt-lib}/tests/config/issue-2641.toml | 0 .../rustfmt-lib}/tests/config/issue-3779.toml | 0 .../rustfmt-lib}/tests/config/issue-3802.toml | 0 .../rustfmt-lib}/tests/config/issue-3933.toml | 0 .../rustfmt-lib}/tests/config/issue-3956.toml | 0 .../tests/config/skip_children.toml | 0 .../rustfmt-lib}/tests/config/small_tabs.toml | 0 .../tests/coverage/source/comments.rs | 0 .../tests/coverage/target/comments.rs | 0 .../tests/license-template/lt.txt | 0 .../source/alignment_2633/block_style.rs | 0 .../source/alignment_2633/visual_style.rs | 0 .../tests/source/array_comment.rs | 0 .../rustfmt-lib}/tests/source/assignment.rs | 0 .../associated-types-bounds-wrapping.rs | 0 .../tests/source/associated_type_bounds.rs | 0 .../rustfmt-lib}/tests/source/async_block.rs | 0 .../rustfmt-lib}/tests/source/async_fn.rs | 0 .../rustfmt-lib}/tests/source/attrib.rs | 0 .../tests/source/big-impl-block.rs | 0 .../tests/source/big-impl-visual.rs | 0 .../rustfmt-lib}/tests/source/binary-expr.rs | 0 .../tests/source/break-and-continue.rs | 0 .../rustfmt-lib}/tests/source/catch.rs | 0 .../source/cfg_if/detect/arch/aarch64.rs | 0 .../tests/source/cfg_if/detect/arch/arm.rs | 0 .../tests/source/cfg_if/detect/arch/mips.rs | 0 .../tests/source/cfg_if/detect/arch/mips64.rs | 0 .../source/cfg_if/detect/arch/powerpc.rs | 0 .../source/cfg_if/detect/arch/powerpc64.rs | 0 .../tests/source/cfg_if/detect/arch/x86.rs | 0 .../tests/source/cfg_if/detect/bit.rs | 0 .../tests/source/cfg_if/detect/cache.rs | 0 .../source/cfg_if/detect/error_macros.rs | 0 .../tests/source/cfg_if/detect/mod.rs | 0 .../tests/source/cfg_if/detect/os/aarch64.rs | 0 .../cfg_if/detect/os/freebsd/aarch64.rs | 0 .../source/cfg_if/detect/os/freebsd/arm.rs | 0 .../source/cfg_if/detect/os/freebsd/auxvec.rs | 0 .../source/cfg_if/detect/os/freebsd/mod.rs | 0 .../cfg_if/detect/os/freebsd/powerpc.rs | 0 .../source/cfg_if/detect/os/linux/aarch64.rs | 0 .../source/cfg_if/detect/os/linux/arm.rs | 0 .../source/cfg_if/detect/os/linux/auxvec.rs | 0 .../source/cfg_if/detect/os/linux/cpuinfo.rs | 0 .../source/cfg_if/detect/os/linux/mips.rs | 0 .../source/cfg_if/detect/os/linux/mod.rs | 0 .../source/cfg_if/detect/os/linux/powerpc.rs | 0 .../tests/source/cfg_if/detect/os/other.rs | 0 .../tests/source/cfg_if/detect/os/x86.rs | 0 .../rustfmt-lib}/tests/source/cfg_if/lib.rs | 0 .../rustfmt-lib}/tests/source/cfg_if/mod.rs | 0 .../rustfmt-lib}/tests/source/cfg_mod/bar.rs | 0 .../source/cfg_mod/dir/dir1/dir2/wasm32.rs | 0 .../source/cfg_mod/dir/dir1/dir3/wasm32.rs | 0 .../rustfmt-lib}/tests/source/cfg_mod/foo.rs | 0 .../rustfmt-lib}/tests/source/cfg_mod/mod.rs | 0 .../tests/source/cfg_mod/other.rs | 0 .../tests/source/cfg_mod/wasm32.rs | 0 .../tests/source/chains-visual.rs | 0 .../rustfmt-lib}/tests/source/chains.rs | 0 .../tests/source/chains_with_comment.rs | 0 .../source/closure-block-inside-macro.rs | 0 .../tests/source/closure_block_style.rs | 0 .../source/closure_block_style_no_comma.rs | 0 .../tests/source/closure_visual_style.rs | 0 .../rustfmt-lib}/tests/source/comment.rs | 0 .../rustfmt-lib}/tests/source/comment2.rs | 0 .../rustfmt-lib}/tests/source/comment3.rs | 0 .../rustfmt-lib}/tests/source/comment4.rs | 0 .../rustfmt-lib}/tests/source/comment5.rs | 0 .../rustfmt-lib}/tests/source/comment6.rs | 0 .../tests/source/comment_crlf_newline.rs | 0 .../configs/blank_lines_lower_bound/1.rs | 0 .../brace_style/fn_always_next_line.rs | 0 .../brace_style/fn_prefer_same_line.rs | 0 .../configs/brace_style/fn_same_line_where.rs | 0 .../brace_style/item_always_next_line.rs | 0 .../brace_style/item_prefer_same_line.rs | 0 .../brace_style/item_same_line_where.rs | 0 .../source/configs/comment_width/above.rs | 0 .../source/configs/comment_width/below.rs | 0 .../source/configs/comment_width/ignore.rs | 0 .../condense_wildcard_suffixes/false.rs | 0 .../condense_wildcard_suffixes/true.rs | 0 .../control_brace_style/always_next_line.rs | 0 .../control_brace_style/always_same_line.rs | 0 .../control_brace_style/closing_next_line.rs | 0 .../configs/disable_all_formatting/false.rs | 0 .../configs/disable_all_formatting/true.rs | 0 .../configs/empty_item_single_line/false.rs | 0 .../configs/empty_item_single_line/true.rs | 0 .../enum_discrim_align_threshold/40.rs | 0 .../configs/error_on_line_overflow/false.rs | 0 .../configs/fn_args_layout/compressed.rs | 0 .../source/configs/fn_args_layout/tall.rs | 0 .../source/configs/fn_args_layout/vertical.rs | 0 .../source/configs/fn_single_line/false.rs | 0 .../source/configs/fn_single_line/true.rs | 0 .../configs/force_explicit_abi/false.rs | 0 .../source/configs/force_explicit_abi/true.rs | 0 .../configs/force_multiline_block/false.rs | 0 .../configs/force_multiline_block/true.rs | 0 .../configs/format_macro_bodies/false.rs | 0 .../configs/format_macro_bodies/true.rs | 0 .../configs/format_macro_matchers/false.rs | 0 .../configs/format_macro_matchers/true.rs | 0 .../source/configs/format_strings/false.rs | 0 .../source/configs/format_strings/true.rs | 0 .../tests/source/configs/hard_tabs/false.rs | 0 .../tests/source/configs/hard_tabs/true.rs | 0 .../configs/imports_layout/merge_mixed.rs | 0 .../source/configs/indent_style/block_args.rs | 0 .../configs/indent_style/block_array.rs | 0 .../source/configs/indent_style/block_call.rs | 0 .../configs/indent_style/block_chain.rs | 0 .../configs/indent_style/block_generic.rs | 0 .../configs/indent_style/block_struct_lit.rs | 0 .../block_trailing_comma_call/two.rs | 0 .../configs/indent_style/block_where_pred.rs | 0 .../source/configs/indent_style/default.rs | 0 .../source/configs/indent_style/rfc_where.rs | 0 .../configs/indent_style/visual_args.rs | 0 .../configs/indent_style/visual_array.rs | 0 .../configs/indent_style/visual_call.rs | 0 .../configs/indent_style/visual_chain.rs | 0 .../configs/indent_style/visual_generics.rs | 0 .../configs/indent_style/visual_struct_lit.rs | 0 .../indent_style/visual_trailing_comma.rs | 0 .../configs/indent_style/visual_where_pred.rs | 0 .../source/configs/match_arm_blocks/false.rs | 0 .../source/configs/match_arm_blocks/true.rs | 0 .../match_block_trailing_comma/false.rs | 0 .../match_block_trailing_comma/true.rs | 0 .../source/configs/merge_derives/true.rs | 0 .../configs/normalize_comments/false.rs | 0 .../source/configs/normalize_comments/true.rs | 0 .../configs/normalize_doc_attributes/false.rs | 0 .../configs/normalize_doc_attributes/true.rs | 0 .../source/configs/recursive/disabled/foo.rs | 0 .../source/configs/recursive/disabled/lib.rs | 0 .../source/configs/recursive/enabled/foo.rs | 0 .../source/configs/recursive/enabled/lib.rs | 0 .../remove_nested_parens.rs | 0 .../configs/reorder_impl_items/false.rs | 0 .../source/configs/reorder_impl_items/true.rs | 0 .../source/configs/reorder_imports/false.rs | 0 .../source/configs/reorder_imports/true.rs | 0 .../configs/reorder_modules/dolor/mod.rs | 0 .../source/configs/reorder_modules/false.rs | 0 .../configs/reorder_modules/ipsum/mod.rs | 0 .../configs/reorder_modules/lorem/mod.rs | 0 .../source/configs/reorder_modules/sit/mod.rs | 0 .../source/configs/reorder_modules/true.rs | 0 .../source/configs/skip_children/foo/mod.rs | 0 .../source/configs/skip_children/true.rs | 0 .../source/configs/space_before_colon/true.rs | 0 .../configs/spaces_around_ranges/false.rs | 0 .../configs/spaces_around_ranges/true.rs | 0 .../struct_field_align_threshold/20.rs | 0 .../configs/struct_lit_single_line/false.rs | 0 .../tests/source/configs/tab_spaces/2.rs | 0 .../tests/source/configs/tab_spaces/4.rs | 0 .../source/configs/trailing_comma/always.rs | 0 .../source/configs/trailing_comma/never.rs | 0 .../source/configs/trailing_comma/vertical.rs | 0 .../type_punctuation_density/compressed.rs | 0 .../configs/type_punctuation_density/wide.rs | 0 .../configs/use_field_init_shorthand/false.rs | 0 .../configs/use_field_init_shorthand/true.rs | 0 .../configs/use_small_heuristics/max.rs | 0 .../source/configs/use_try_shorthand/false.rs | 0 .../source/configs/use_try_shorthand/true.rs | 0 .../use_try_shorthand/true_2015_edition.rs | 0 .../source/configs/where_single_line/true.rs | 0 .../source/configs/wrap_comments/false.rs | 0 .../source/configs/wrap_comments/true.rs | 0 .../tests/source/const_generics.rs | 0 .../control-brace-style-always-next-line.rs | 0 .../control-brace-style-always-same-line.rs | 0 .../rustfmt-lib}/tests/source/doc-attrib.rs | 0 .../tests/source/doc-comment-with-example.rs | 0 .../rustfmt-lib}/tests/source/doc.rs | 0 .../rustfmt-lib}/tests/source/dyn_trait.rs | 0 .../else-if-brace-style-always-next-line.rs | 0 .../else-if-brace-style-always-same-line.rs | 0 .../else-if-brace-style-closing-next-line.rs | 0 .../rustfmt-lib}/tests/source/empty_file.rs | 0 .../rustfmt-lib}/tests/source/enum.rs | 0 .../tests/source/existential_type.rs | 0 .../rustfmt-lib}/tests/source/expr-block.rs | 0 .../tests/source/expr-overflow-delimited.rs | 0 .../rustfmt-lib}/tests/source/expr.rs | 0 .../rustfmt-lib}/tests/source/extern.rs | 0 .../tests/source/extern_not_explicit.rs | 0 .../rustfmt-lib}/tests/source/file-lines-1.rs | 0 .../rustfmt-lib}/tests/source/file-lines-2.rs | 0 .../rustfmt-lib}/tests/source/file-lines-3.rs | 0 .../rustfmt-lib}/tests/source/file-lines-4.rs | 0 .../rustfmt-lib}/tests/source/file-lines-5.rs | 0 .../rustfmt-lib}/tests/source/file-lines-6.rs | 0 .../rustfmt-lib}/tests/source/file-lines-7.rs | 0 .../rustfmt-lib}/tests/source/file-lines-8.rs | 0 .../tests/source/file-lines-item.rs | 0 .../rustfmt-lib}/tests/source/fn-custom-2.rs | 0 .../rustfmt-lib}/tests/source/fn-custom-3.rs | 0 .../rustfmt-lib}/tests/source/fn-custom-4.rs | 0 .../rustfmt-lib}/tests/source/fn-custom-6.rs | 0 .../rustfmt-lib}/tests/source/fn-custom-7.rs | 0 .../rustfmt-lib}/tests/source/fn-custom-8.rs | 0 .../rustfmt-lib}/tests/source/fn-custom.rs | 0 .../tests/source/fn-param-attributes.rs | 0 .../rustfmt-lib}/tests/source/fn-simple.rs | 0 .../source/fn-single-line/version_two.rs | 0 .../tests/source/fn_args_indent-block.rs | 0 .../tests/source/fn_args_layout-vertical.rs | 0 .../rustfmt-lib}/tests/source/hard-tabs.rs | 0 .../rustfmt-lib}/tests/source/hello.rs | 0 .../rustfmt-lib}/tests/source/hello2.rs | 0 .../tests/source/if_while_or_patterns.rs | 0 .../tests/source/immovable_generators.rs | 0 .../rustfmt-lib}/tests/source/impls.rs | 0 .../tests/source/imports-impl-only-use.rs | 0 .../source/imports-reorder-lines-and-items.rs | 0 .../tests/source/imports-reorder-lines.rs | 0 .../tests/source/imports-reorder.rs | 0 .../rustfmt-lib}/tests/source/imports.rs | 0 .../tests/source/imports_2015_edition.rs | 0 .../tests/source/imports_block_indent.rs | 0 .../tests/source/imports_raw_identifiers.rs | 0 .../invalid-rust-code-in-doc-comment.rs | 0 .../rustfmt-lib}/tests/source/issue-1021.rs | 0 .../rustfmt-lib}/tests/source/issue-1049.rs | 0 .../rustfmt-lib}/tests/source/issue-1111.rs | 0 .../rustfmt-lib}/tests/source/issue-1120.rs | 0 .../rustfmt-lib}/tests/source/issue-1124.rs | 0 .../rustfmt-lib}/tests/source/issue-1127.rs | 0 .../rustfmt-lib}/tests/source/issue-1158.rs | 0 .../rustfmt-lib}/tests/source/issue-1177.rs | 0 .../rustfmt-lib}/tests/source/issue-1192.rs | 0 .../rustfmt-lib}/tests/source/issue-1210/a.rs | 0 .../rustfmt-lib}/tests/source/issue-1210/b.rs | 0 .../rustfmt-lib}/tests/source/issue-1210/c.rs | 0 .../rustfmt-lib}/tests/source/issue-1210/d.rs | 0 .../rustfmt-lib}/tests/source/issue-1210/e.rs | 0 .../rustfmt-lib}/tests/source/issue-1211.rs | 0 .../rustfmt-lib}/tests/source/issue-1216.rs | 0 .../rustfmt-lib}/tests/source/issue-1239.rs | 0 .../rustfmt-lib}/tests/source/issue-1278.rs | 0 .../rustfmt-lib}/tests/source/issue-1350.rs | 0 .../rustfmt-lib}/tests/source/issue-1366.rs | 0 .../rustfmt-lib}/tests/source/issue-1468.rs | 0 .../rustfmt-lib}/tests/source/issue-1693.rs | 0 .../rustfmt-lib}/tests/source/issue-1800.rs | 0 .../rustfmt-lib}/tests/source/issue-1914.rs | 0 .../rustfmt-lib}/tests/source/issue-2025.rs | 0 .../rustfmt-lib}/tests/source/issue-2111.rs | 0 .../rustfmt-lib}/tests/source/issue-2164.rs | 0 .../tests/source/issue-2179/two.rs | 0 .../rustfmt-lib}/tests/source/issue-2256.rs | 0 .../rustfmt-lib}/tests/source/issue-2342.rs | 0 .../rustfmt-lib}/tests/source/issue-2445.rs | 0 .../rustfmt-lib}/tests/source/issue-2446.rs | 0 .../rustfmt-lib}/tests/source/issue-2479.rs | 0 .../rustfmt-lib}/tests/source/issue-2482/a.rs | 0 .../rustfmt-lib}/tests/source/issue-2482/b.rs | 0 .../rustfmt-lib}/tests/source/issue-2482/c.rs | 0 .../rustfmt-lib}/tests/source/issue-2496.rs | 0 .../rustfmt-lib}/tests/source/issue-2520.rs | 0 .../rustfmt-lib}/tests/source/issue-2523.rs | 0 .../rustfmt-lib}/tests/source/issue-2582.rs | 0 .../rustfmt-lib}/tests/source/issue-2641.rs | 0 .../rustfmt-lib}/tests/source/issue-2644.rs | 0 .../rustfmt-lib}/tests/source/issue-2728.rs | 0 .../rustfmt-lib}/tests/source/issue-2761.rs | 0 .../rustfmt-lib}/tests/source/issue-2794.rs | 0 .../rustfmt-lib}/tests/source/issue-2835.rs | 0 .../rustfmt-lib}/tests/source/issue-2863.rs | 0 .../rustfmt-lib}/tests/source/issue-2869.rs | 0 .../rustfmt-lib}/tests/source/issue-2896.rs | 0 .../tests/source/issue-2917/packed_simd.rs | 0 .../rustfmt-lib}/tests/source/issue-2922.rs | 0 .../rustfmt-lib}/tests/source/issue-2927-2.rs | 0 .../rustfmt-lib}/tests/source/issue-2927.rs | 0 .../rustfmt-lib}/tests/source/issue-2930.rs | 0 .../rustfmt-lib}/tests/source/issue-2936.rs | 0 .../rustfmt-lib}/tests/source/issue-2955.rs | 0 .../rustfmt-lib}/tests/source/issue-2973.rs | 0 .../tests/source/issue-2977/impl.rs | 0 .../tests/source/issue-2977/trait.rs | 0 .../rustfmt-lib}/tests/source/issue-2985.rs | 0 .../rustfmt-lib}/tests/source/issue-2995.rs | 0 .../rustfmt-lib}/tests/source/issue-3029.rs | 0 .../rustfmt-lib}/tests/source/issue-3038.rs | 0 .../rustfmt-lib}/tests/source/issue-3049.rs | 0 .../tests/source/issue-3055/original.rs | 0 .../rustfmt-lib}/tests/source/issue-3059.rs | 0 .../rustfmt-lib}/tests/source/issue-3066.rs | 0 .../rustfmt-lib}/tests/source/issue-3131.rs | 0 .../rustfmt-lib}/tests/source/issue-3153.rs | 0 .../rustfmt-lib}/tests/source/issue-3170.rs | 0 .../rustfmt-lib}/tests/source/issue-3194.rs | 0 .../rustfmt-lib}/tests/source/issue-3198.rs | 0 .../tests/source/issue-3213/version_two.rs | 0 .../rustfmt-lib}/tests/source/issue-3217.rs | 0 .../tests/source/issue-3227/two.rs | 0 .../rustfmt-lib}/tests/source/issue-3234.rs | 0 .../rustfmt-lib}/tests/source/issue-3241.rs | 0 .../tests/source/issue-3253/bar.rs | 0 .../tests/source/issue-3253/foo.rs | 0 .../tests/source/issue-3253/lib.rs | 0 .../tests/source/issue-3253/paths/bar_foo.rs | 0 .../tests/source/issue-3253/paths/excluded.rs | 0 .../tests/source/issue-3253/paths/foo_bar.rs | 0 .../rustfmt-lib}/tests/source/issue-3265.rs | 0 .../tests/source/issue-3270/two.rs | 0 .../tests/source/issue-3272/v2.rs | 0 .../tests/source/issue-3278/version_two.rs | 0 .../tests/source/issue-3295/two.rs | 0 .../rustfmt-lib}/tests/source/issue-3302.rs | 0 .../rustfmt-lib}/tests/source/issue-3343.rs | 0 .../rustfmt-lib}/tests/source/issue-3423.rs | 0 .../tests/source/issue-3434/lib.rs | 0 .../tests/source/issue-3434/no_entry.rs | 0 .../tests/source/issue-3434/not_skip_macro.rs | 0 .../rustfmt-lib}/tests/source/issue-3465.rs | 0 .../tests/source/issue-3494/crlf.rs | 0 .../tests/source/issue-3494/lf.rs | 0 .../rustfmt-lib}/tests/source/issue-3508.rs | 0 .../rustfmt-lib}/tests/source/issue-3515.rs | 0 .../rustfmt-lib}/tests/source/issue-3532.rs | 0 .../tests/source/issue-3585/extern_crate.rs | 0 .../issue-3585/reorder_imports_disabled.rs | 0 .../issue-3585/reorder_imports_enabled.rs | 0 .../tests/source/issue-3585/use.rs | 0 .../rustfmt-lib}/tests/source/issue-3636.rs | 0 .../rustfmt-lib}/tests/source/issue-3639.rs | 0 .../rustfmt-lib}/tests/source/issue-3651.rs | 0 .../tests/source/issue-3665/lib.rs | 0 .../source/issue-3665/not_skip_attribute.rs | 0 .../tests/source/issue-3665/sub_mod.rs | 0 .../rustfmt-lib}/tests/source/issue-3672.rs | 0 .../rustfmt-lib}/tests/source/issue-3675.rs | 0 .../tests/source/issue-3701/two.rs | 0 .../rustfmt-lib}/tests/source/issue-3709.rs | 0 .../rustfmt-lib}/tests/source/issue-3740.rs | 0 .../rustfmt-lib}/tests/source/issue-3750.rs | 0 .../rustfmt-lib}/tests/source/issue-3751.rs | 0 .../tests/source/issue-3779/ice.rs | 0 .../tests/source/issue-3779/lib.rs | 0 .../rustfmt-lib}/tests/source/issue-3786.rs | 0 .../rustfmt-lib}/tests/source/issue-3787.rs | 0 .../issue-3840/version-two_hard-tabs.rs | 0 .../issue-3840/version-two_soft-tabs.rs | 0 .../rustfmt-lib}/tests/source/issue-3851.rs | 0 .../tests/source/issue-3904/two.rs | 0 .../rustfmt-lib}/tests/source/issue-3908.rs | 0 .../rustfmt-lib}/tests/source/issue-3923.rs | 0 .../rustfmt-lib}/tests/source/issue-3929.rs | 0 .../tests/source/issue-3933/imp-a.rs | 0 .../tests/source/issue-3933/imp-b.rs | 0 .../tests/source/issue-3933/lib.rs | 0 .../tests/source/issue-3933/utils.rs | 0 .../rustfmt-lib}/tests/source/issue-447.rs | 0 .../rustfmt-lib}/tests/source/issue-510.rs | 0 .../rustfmt-lib}/tests/source/issue-539.rs | 0 .../rustfmt-lib}/tests/source/issue-683.rs | 0 .../rustfmt-lib}/tests/source/issue-811.rs | 0 .../rustfmt-lib}/tests/source/issue-850.rs | 0 .../rustfmt-lib}/tests/source/issue-855.rs | 0 .../rustfmt-lib}/tests/source/issue-913.rs | 0 .../rustfmt-lib}/tests/source/issue-945.rs | 0 .../rustfmt-lib}/tests/source/issue-977.rs | 0 .../rustfmt-lib}/tests/source/issue_3839.rs | 0 .../rustfmt-lib}/tests/source/issue_3844.rs | 0 .../rustfmt-lib}/tests/source/issue_3853.rs | 0 .../rustfmt-lib}/tests/source/issue_3868.rs | 0 .../item-brace-style-always-next-line.rs | 0 .../item-brace-style-prefer-same-line.rs | 0 .../item-brace-style-same-line-where.rs | 0 .../tests/source/itemized-blocks/no_wrap.rs | 0 .../source/itemized-blocks/rewrite_fail.rs | 0 .../tests/source/itemized-blocks/urls.rs | 0 .../tests/source/itemized-blocks/wrap.rs | 0 .../rustfmt-lib}/tests/source/label_break.rs | 0 .../rustfmt-lib}/tests/source/large-block.rs | 0 .../rustfmt-lib}/tests/source/large_vec.rs | 0 .../rustfmt-lib}/tests/source/lazy_static.rs | 0 .../license-templates/empty_license_path.rs | 0 .../tests/source/license-templates/license.rs | 0 .../tests/source/long-fn-1/version_two.rs | 0 .../source/long-match-arms-brace-newline.rs | 0 .../source/long-use-statement-issue-3154.rs | 0 .../tests/source/long_field_access.rs | 0 .../rustfmt-lib}/tests/source/loop.rs | 0 .../tests/source/macro_not_expr.rs | 0 .../rustfmt-lib}/tests/source/macro_rules.rs | 0 .../rustfmt-lib}/tests/source/macros.rs | 0 .../source/markdown-comment-with-options.rs | 0 .../tests/source/markdown-comment.rs | 0 .../source/match-block-trailing-comma.rs | 0 .../tests/source/match-flattening.rs | 0 .../source/match-nowrap-trailing-comma.rs | 0 .../rustfmt-lib}/tests/source/match-nowrap.rs | 0 .../rustfmt-lib}/tests/source/match.rs | 0 .../tests/source/match_overflow_expr.rs | 0 .../tests/source/max-line-length-in-chars.rs | 0 .../tests/source/merge_imports.rs | 0 .../rustfmt-lib}/tests/source/mod-1.rs | 0 .../rustfmt-lib}/tests/source/mod-2.rs | 0 .../tests/source/mod_skip_child.rs | 0 .../rustfmt-lib}/tests/source/multiple.rs | 0 .../tests/source/nested-if-else.rs | 0 .../tests/source/nested_skipped/mod.rs | 0 .../tests/source/nestedmod/mod.rs | 0 .../tests/source/nestedmod/mod2a.rs | 0 .../tests/source/nestedmod/mod2b.rs | 0 .../tests/source/nestedmod/mod2c.rs | 0 .../tests/source/nestedmod/mymod1/mod3a.rs | 0 .../tests/source/nestedmod/submod2/a.rs | 0 .../tests/source/nestedmod/submod2/mod.rs | 0 .../tests/source/no_arg_with_commnet.rs | 0 .../tests/source/no_new_line_beginning.rs | 0 ...es_should_not_imply_format_doc_comments.rs | 0 .../normalize_multiline_doc_attribute.rs | 0 .../tests/source/one_line_if_v2.rs | 0 .../rustfmt-lib}/tests/source/other.rs | 0 .../rustfmt-lib}/tests/source/paren.rs | 0 .../tests/source/path_clarity/foo.rs | 0 .../tests/source/path_clarity/foo/bar.rs | 0 .../rustfmt-lib}/tests/source/paths.rs | 0 .../source/pattern-condense-wildcards.rs | 0 .../rustfmt-lib}/tests/source/pattern.rs | 0 .../preserves_carriage_return_for_unix.rs | 0 .../preserves_carriage_return_for_windows.rs | 0 .../tests/source/pub-restricted.rs | 0 .../tests/source/remove_blank_lines.rs | 0 .../tests/source/reorder-impl-items.rs | 0 .../tests/source/single-line-if-else.rs | 0 .../tests/source/single-line-macro/v2.rs | 0 .../tests/source/soft-wrapping.rs | 0 .../tests/source/space-not-before-newline.rs | 0 .../tests/source/spaces-around-ranges.rs | 0 .../rustfmt-lib}/tests/source/static.rs | 0 .../rustfmt-lib}/tests/source/string-lit-2.rs | 0 .../rustfmt-lib}/tests/source/string-lit.rs | 0 .../tests/source/string_punctuation.rs | 0 .../tests/source/struct-field-attributes.rs | 0 .../rustfmt-lib}/tests/source/struct_lits.rs | 0 .../tests/source/struct_lits_multiline.rs | 0 .../tests/source/struct_lits_visual.rs | 0 .../source/struct_lits_visual_multiline.rs | 0 .../tests/source/struct_tuple_visual.rs | 0 .../rustfmt-lib}/tests/source/structs.rs | 0 .../tests/source/trailing-comma-never.rs | 0 .../tests/source/trailing_commas.rs | 0 .../source/trailing_comments/hard_tabs.rs | 0 .../source/trailing_comments/soft_tabs.rs | 0 .../rustfmt-lib}/tests/source/trait.rs | 0 .../tests/source/trait_2015_edition.rs | 0 .../tests/source/try-conversion.rs | 0 .../rustfmt-lib}/tests/source/tuple.rs | 0 .../tests/source/type-ascription.rs | 0 .../rustfmt-lib}/tests/source/type.rs | 0 .../rustfmt-lib}/tests/source/type_alias.rs | 0 .../rustfmt-lib}/tests/source/unicode.rs | 0 .../rustfmt-lib}/tests/source/unions.rs | 0 .../rustfmt-lib}/tests/source/visibility.rs | 0 .../tests/source/visual-fn-type.rs | 0 .../tests/source/where-clause-rfc.rs | 0 .../rustfmt-lib}/tests/source/where-clause.rs | 0 .../tests/source/width-heuristics.rs | 0 ...ts_should_not_imply_format_doc_comments.rs | 0 .../target/alignment_2633/block_style.rs | 0 .../alignment_2633/horizontal_tactic.rs | 0 .../target/alignment_2633/visual_style.rs | 0 .../tests/target/array_comment.rs | 0 .../rustfmt-lib}/tests/target/assignment.rs | 0 .../tests/target/associated-items.rs | 0 .../associated-types-bounds-wrapping.rs | 0 .../tests/target/associated_type_bounds.rs | 0 .../tests/target/associated_type_defaults.rs | 0 .../rustfmt-lib}/tests/target/async_block.rs | 0 .../tests/target/async_closure.rs | 0 .../rustfmt-lib}/tests/target/async_fn.rs | 0 .../tests/target/attrib-block-expr.rs | 0 .../tests/target/attrib-extern-crate.rs | 0 .../rustfmt-lib}/tests/target/attrib.rs | 0 .../tests/target/big-impl-block.rs | 0 .../tests/target/big-impl-visual.rs | 0 .../rustfmt-lib}/tests/target/binary-expr.rs | 0 .../tests/target/break-and-continue.rs | 0 .../rustfmt-lib}/tests/target/catch.rs | 0 .../target/cfg_if/detect/arch/aarch64.rs | 0 .../tests/target/cfg_if/detect/arch/arm.rs | 0 .../tests/target/cfg_if/detect/arch/mips.rs | 0 .../tests/target/cfg_if/detect/arch/mips64.rs | 0 .../target/cfg_if/detect/arch/powerpc.rs | 0 .../target/cfg_if/detect/arch/powerpc64.rs | 0 .../tests/target/cfg_if/detect/arch/x86.rs | 0 .../tests/target/cfg_if/detect/bit.rs | 0 .../tests/target/cfg_if/detect/cache.rs | 0 .../target/cfg_if/detect/error_macros.rs | 0 .../tests/target/cfg_if/detect/mod.rs | 0 .../tests/target/cfg_if/detect/os/aarch64.rs | 0 .../cfg_if/detect/os/freebsd/aarch64.rs | 0 .../target/cfg_if/detect/os/freebsd/arm.rs | 0 .../target/cfg_if/detect/os/freebsd/auxvec.rs | 0 .../target/cfg_if/detect/os/freebsd/mod.rs | 0 .../cfg_if/detect/os/freebsd/powerpc.rs | 0 .../target/cfg_if/detect/os/linux/aarch64.rs | 0 .../target/cfg_if/detect/os/linux/arm.rs | 0 .../target/cfg_if/detect/os/linux/auxvec.rs | 0 .../target/cfg_if/detect/os/linux/cpuinfo.rs | 0 .../target/cfg_if/detect/os/linux/mips.rs | 0 .../target/cfg_if/detect/os/linux/mod.rs | 0 .../target/cfg_if/detect/os/linux/powerpc.rs | 0 .../tests/target/cfg_if/detect/os/other.rs | 0 .../tests/target/cfg_if/detect/os/x86.rs | 0 .../rustfmt-lib}/tests/target/cfg_if/lib.rs | 0 .../rustfmt-lib}/tests/target/cfg_if/mod.rs | 0 .../rustfmt-lib}/tests/target/cfg_mod/bar.rs | 0 .../target/cfg_mod/dir/dir1/dir2/wasm32.rs | 0 .../target/cfg_mod/dir/dir1/dir3/wasm32.rs | 0 .../rustfmt-lib}/tests/target/cfg_mod/foo.rs | 0 .../rustfmt-lib}/tests/target/cfg_mod/mod.rs | 0 .../tests/target/cfg_mod/other.rs | 0 .../tests/target/cfg_mod/wasm32.rs | 0 .../tests/target/chains-visual.rs | 0 .../rustfmt-lib}/tests/target/chains.rs | 0 .../tests/target/chains_with_comment.rs | 0 .../target/closure-block-inside-macro.rs | 0 .../tests/target/closure_block_style.rs | 0 .../target/closure_block_style_no_comma.rs | 0 .../tests/target/closure_visual_style.rs | 0 .../tests/target/comment-inside-const.rs | 0 .../tests/target/comment-not-disappear.rs | 0 .../rustfmt-lib}/tests/target/comment.rs | 0 .../rustfmt-lib}/tests/target/comment2.rs | 0 .../rustfmt-lib}/tests/target/comment3.rs | 0 .../rustfmt-lib}/tests/target/comment4.rs | 0 .../rustfmt-lib}/tests/target/comment5.rs | 0 .../rustfmt-lib}/tests/target/comment6.rs | 0 .../tests/target/comment_crlf_newline.rs | 0 .../rustfmt-lib}/tests/target/comments-fn.rs | 0 .../configs/blank_lines_lower_bound/1.rs | 0 .../brace_style/fn_always_next_line.rs | 0 .../brace_style/fn_prefer_same_line.rs | 0 .../configs/brace_style/fn_same_line_where.rs | 0 .../brace_style/item_always_next_line.rs | 0 .../brace_style/item_prefer_same_line.rs | 0 .../brace_style/item_same_line_where.rs | 0 .../configs/combine_control_expr/false.rs | 0 .../configs/combine_control_expr/true.rs | 0 .../target/configs/comment_width/above.rs | 0 .../target/configs/comment_width/below.rs | 0 .../target/configs/comment_width/ignore.rs | 0 .../condense_wildcard_suffixes/false.rs | 0 .../condense_wildcard_suffixes/true.rs | 0 .../control_brace_style/always_next_line.rs | 0 .../control_brace_style/always_same_line.rs | 0 .../control_brace_style/closing_next_line.rs | 0 .../configs/disable_all_formatting/false.rs | 0 .../configs/disable_all_formatting/true.rs | 0 .../configs/empty_item_single_line/false.rs | 0 .../configs/empty_item_single_line/true.rs | 0 .../enum_discrim_align_threshold/40.rs | 0 .../configs/error_on_line_overflow/false.rs | 0 .../configs/error_on_unformatted/false.rs | 0 .../configs/fn_args_layout/compressed.rs | 0 .../target/configs/fn_args_layout/tall.rs | 0 .../target/configs/fn_args_layout/vertical.rs | 0 .../target/configs/fn_single_line/false.rs | 0 .../target/configs/fn_single_line/true.rs | 0 .../configs/force_explicit_abi/false.rs | 0 .../target/configs/force_explicit_abi/true.rs | 0 .../configs/force_multiline_block/false.rs | 0 .../configs/force_multiline_block/true.rs | 0 .../configs/format_macro_bodies/false.rs | 0 .../configs/format_macro_bodies/true.rs | 0 .../configs/format_macro_matchers/false.rs | 0 .../configs/format_macro_matchers/true.rs | 0 .../target/configs/format_strings/false.rs | 0 .../target/configs/format_strings/true.rs | 0 .../tests/target/configs/hard_tabs/false.rs | 0 .../tests/target/configs/hard_tabs/true.rs | 0 .../target/configs/imports_indent/block.rs | 0 .../imports_layout/horizontal_vertical.rs | 0 .../configs/imports_layout/merge_mixed.rs | 0 .../target/configs/imports_layout/mixed.rs | 0 .../target/configs/indent_style/block_args.rs | 0 .../configs/indent_style/block_array.rs | 0 .../target/configs/indent_style/block_call.rs | 0 .../configs/indent_style/block_chain.rs | 0 .../configs/indent_style/block_generic.rs | 0 .../configs/indent_style/block_struct_lit.rs | 0 .../indent_style/block_tab_spaces_call.rs | 0 .../block_trailing_comma_call/two.rs | 0 .../configs/indent_style/block_where_pred.rs | 0 .../target/configs/indent_style/default.rs | 0 .../configs/indent_style/rfc_control.rs | 0 .../target/configs/indent_style/rfc_where.rs | 0 .../configs/indent_style/visual_args.rs | 0 .../configs/indent_style/visual_array.rs | 0 .../configs/indent_style/visual_call.rs | 0 .../configs/indent_style/visual_chain.rs | 0 .../configs/indent_style/visual_generics.rs | 0 .../configs/indent_style/visual_struct_lit.rs | 0 .../indent_style/visual_trailing_comma.rs | 0 .../configs/indent_style/visual_where_pred.rs | 0 .../target/configs/match_arm_blocks/false.rs | 0 .../target/configs/match_arm_blocks/true.rs | 0 .../match_block_trailing_comma/false.rs | 0 .../match_block_trailing_comma/true.rs | 0 .../target/configs/merge_derives/true.rs | 0 .../configs/normalize_comments/false.rs | 0 .../target/configs/normalize_comments/true.rs | 0 .../configs/normalize_doc_attributes/false.rs | 0 .../configs/normalize_doc_attributes/true.rs | 0 .../target/configs/recursive/disabled/foo.rs | 0 .../target/configs/recursive/disabled/lib.rs | 0 .../target/configs/recursive/enabled/foo.rs | 0 .../target/configs/recursive/enabled/lib.rs | 0 .../remove_nested_parens.rs | 0 .../configs/reorder_impl_items/false.rs | 0 .../target/configs/reorder_impl_items/true.rs | 0 .../target/configs/reorder_imports/false.rs | 0 .../target/configs/reorder_imports/true.rs | 0 .../configs/reorder_modules/dolor/mod.rs | 0 .../target/configs/reorder_modules/false.rs | 0 .../configs/reorder_modules/ipsum/mod.rs | 0 .../configs/reorder_modules/lorem/mod.rs | 0 .../target/configs/reorder_modules/sit/mod.rs | 0 .../target/configs/reorder_modules/true.rs | 0 .../target/configs/skip_children/foo/mod.rs | 0 .../target/configs/skip_children/true.rs | 0 .../target/configs/space_before_colon/true.rs | 0 .../configs/spaces_around_ranges/false.rs | 0 .../configs/spaces_around_ranges/true.rs | 0 .../struct_field_align_threshold/20.rs | 0 .../configs/struct_lit_single_line/false.rs | 0 .../tests/target/configs/tab_spaces/2.rs | 0 .../tests/target/configs/tab_spaces/4.rs | 0 .../target/configs/trailing_comma/always.rs | 0 .../target/configs/trailing_comma/never.rs | 0 .../target/configs/trailing_comma/vertical.rs | 0 .../configs/trailing_semicolon/false.rs | 0 .../target/configs/trailing_semicolon/true.rs | 0 .../type_punctuation_density/compressed.rs | 0 .../configs/type_punctuation_density/wide.rs | 0 .../configs/use_field_init_shorthand/false.rs | 0 .../configs/use_field_init_shorthand/true.rs | 0 .../configs/use_small_heuristics/max.rs | 0 .../target/configs/use_try_shorthand/false.rs | 0 .../target/configs/use_try_shorthand/true.rs | 0 .../use_try_shorthand/true_2015_edition.rs | 0 .../target/configs/where_single_line/true.rs | 0 .../target/configs/wrap_comments/false.rs | 0 .../target/configs/wrap_comments/true.rs | 0 .../tests/target/const_generics.rs | 0 .../control-brace-style-always-next-line.rs | 0 .../control-brace-style-always-same-line.rs | 0 .../rustfmt-lib}/tests/target/doc-attrib.rs | 0 .../tests/target/doc-comment-with-example.rs | 0 .../rustfmt-lib}/tests/target/doc.rs | 0 .../rustfmt-lib}/tests/target/dyn_trait.rs | 0 .../else-if-brace-style-always-next-line.rs | 0 .../else-if-brace-style-always-same-line.rs | 0 .../else-if-brace-style-closing-next-line.rs | 0 ...mpty-tuple-no-conversion-to-unit-struct.rs | 0 .../rustfmt-lib}/tests/target/empty_file.rs | 0 .../rustfmt-lib}/tests/target/enum.rs | 0 .../tests/target/existential_type.rs | 0 .../rustfmt-lib}/tests/target/expr-block.rs | 0 .../tests/target/expr-overflow-delimited.rs | 0 .../rustfmt-lib}/tests/target/expr.rs | 0 .../rustfmt-lib}/tests/target/extern.rs | 0 .../tests/target/extern_not_explicit.rs | 0 .../rustfmt-lib}/tests/target/file-lines-1.rs | 0 .../rustfmt-lib}/tests/target/file-lines-2.rs | 0 .../rustfmt-lib}/tests/target/file-lines-3.rs | 0 .../rustfmt-lib}/tests/target/file-lines-4.rs | 0 .../rustfmt-lib}/tests/target/file-lines-5.rs | 0 .../rustfmt-lib}/tests/target/file-lines-6.rs | 0 .../rustfmt-lib}/tests/target/file-lines-7.rs | 0 .../rustfmt-lib}/tests/target/file-lines-8.rs | 0 .../tests/target/file-lines-item.rs | 0 .../target/fn-args-with-last-line-comment.rs | 0 .../rustfmt-lib}/tests/target/fn-custom-2.rs | 0 .../rustfmt-lib}/tests/target/fn-custom-3.rs | 0 .../rustfmt-lib}/tests/target/fn-custom-4.rs | 0 .../rustfmt-lib}/tests/target/fn-custom-6.rs | 0 .../rustfmt-lib}/tests/target/fn-custom-7.rs | 0 .../rustfmt-lib}/tests/target/fn-custom-8.rs | 0 .../rustfmt-lib}/tests/target/fn-custom.rs | 0 .../tests/target/fn-param-attributes.rs | 0 .../rustfmt-lib}/tests/target/fn-simple.rs | 0 .../target/fn-single-line/version_two.rs | 0 .../rustfmt-lib}/tests/target/fn-ty.rs | 0 .../rustfmt-lib}/tests/target/fn.rs | 0 .../tests/target/fn_args_indent-block.rs | 0 .../tests/target/fn_args_layout-vertical.rs | 0 .../rustfmt-lib}/tests/target/fn_once.rs | 0 .../tests/target/format_strings/issue-202.rs | 0 .../tests/target/format_strings/issue-2833.rs | 0 .../tests/target/format_strings/issue-3263.rs | 0 .../tests/target/format_strings/issue-687.rs | 0 .../tests/target/format_strings/issue564.rs | 0 .../rustfmt-lib}/tests/target/hard-tabs.rs | 0 .../rustfmt-lib}/tests/target/hello.rs | 0 .../tests/target/if_while_or_patterns.rs | 0 .../tests/target/immovable_generators.rs | 0 .../rustfmt-lib}/tests/target/impl.rs | 0 .../rustfmt-lib}/tests/target/impls.rs | 0 .../tests/target/import-fencepost-length.rs | 0 .../tests/target/imports-impl-only-use.rs | 0 .../target/imports-reorder-lines-and-items.rs | 0 .../tests/target/imports-reorder-lines.rs | 0 .../tests/target/imports-reorder.rs | 0 .../rustfmt-lib}/tests/target/imports.rs | 0 .../tests/target/imports_2015_edition.rs | 0 .../tests/target/imports_block_indent.rs | 0 .../tests/target/imports_raw_identifiers.rs | 0 .../tests/target/indented-impl.rs | 0 .../invalid-rust-code-in-doc-comment.rs | 0 .../rustfmt-lib}/tests/target/issue-1021.rs | 0 .../rustfmt-lib}/tests/target/issue-1049.rs | 0 .../rustfmt-lib}/tests/target/issue-1055.rs | 0 .../rustfmt-lib}/tests/target/issue-1096.rs | 0 .../rustfmt-lib}/tests/target/issue-1111.rs | 0 .../rustfmt-lib}/tests/target/issue-1113.rs | 0 .../rustfmt-lib}/tests/target/issue-1120.rs | 0 .../rustfmt-lib}/tests/target/issue-1124.rs | 0 .../rustfmt-lib}/tests/target/issue-1127.rs | 0 .../rustfmt-lib}/tests/target/issue-1158.rs | 0 .../rustfmt-lib}/tests/target/issue-1177.rs | 0 .../rustfmt-lib}/tests/target/issue-1192.rs | 0 .../rustfmt-lib}/tests/target/issue-1210/a.rs | 0 .../rustfmt-lib}/tests/target/issue-1210/b.rs | 0 .../rustfmt-lib}/tests/target/issue-1210/c.rs | 0 .../rustfmt-lib}/tests/target/issue-1210/d.rs | 0 .../rustfmt-lib}/tests/target/issue-1210/e.rs | 0 .../rustfmt-lib}/tests/target/issue-1211.rs | 0 .../rustfmt-lib}/tests/target/issue-1214.rs | 0 .../rustfmt-lib}/tests/target/issue-1216.rs | 0 .../rustfmt-lib}/tests/target/issue-1239.rs | 0 .../rustfmt-lib}/tests/target/issue-1247.rs | 0 .../rustfmt-lib}/tests/target/issue-1255.rs | 0 .../rustfmt-lib}/tests/target/issue-1278.rs | 0 .../rustfmt-lib}/tests/target/issue-1350.rs | 0 .../rustfmt-lib}/tests/target/issue-1366.rs | 0 .../rustfmt-lib}/tests/target/issue-1397.rs | 0 .../rustfmt-lib}/tests/target/issue-1468.rs | 0 .../rustfmt-lib}/tests/target/issue-1598.rs | 0 .../rustfmt-lib}/tests/target/issue-1624.rs | 0 .../rustfmt-lib}/tests/target/issue-1681.rs | 0 .../rustfmt-lib}/tests/target/issue-1693.rs | 0 .../rustfmt-lib}/tests/target/issue-1703.rs | 0 .../rustfmt-lib}/tests/target/issue-1800.rs | 0 .../rustfmt-lib}/tests/target/issue-1802.rs | 0 .../rustfmt-lib}/tests/target/issue-1824.rs | 0 .../rustfmt-lib}/tests/target/issue-1914.rs | 0 .../rustfmt-lib}/tests/target/issue-2025.rs | 0 .../rustfmt-lib}/tests/target/issue-2103.rs | 0 .../rustfmt-lib}/tests/target/issue-2111.rs | 0 .../rustfmt-lib}/tests/target/issue-2123.rs | 0 .../rustfmt-lib}/tests/target/issue-2164.rs | 0 .../tests/target/issue-2179/two.rs | 0 .../rustfmt-lib}/tests/target/issue-2197.rs | 0 .../rustfmt-lib}/tests/target/issue-2256.rs | 0 .../rustfmt-lib}/tests/target/issue-2324.rs | 0 .../rustfmt-lib}/tests/target/issue-2329.rs | 0 .../rustfmt-lib}/tests/target/issue-2342.rs | 0 .../rustfmt-lib}/tests/target/issue-2346.rs | 0 .../rustfmt-lib}/tests/target/issue-2401.rs | 0 .../rustfmt-lib}/tests/target/issue-2445.rs | 0 .../rustfmt-lib}/tests/target/issue-2446.rs | 0 .../rustfmt-lib}/tests/target/issue-2479.rs | 0 .../rustfmt-lib}/tests/target/issue-2482/a.rs | 0 .../rustfmt-lib}/tests/target/issue-2482/b.rs | 0 .../rustfmt-lib}/tests/target/issue-2482/c.rs | 0 .../rustfmt-lib}/tests/target/issue-2496.rs | 0 .../rustfmt-lib}/tests/target/issue-2520.rs | 0 .../rustfmt-lib}/tests/target/issue-2523.rs | 0 .../rustfmt-lib}/tests/target/issue-2526.rs | 0 .../rustfmt-lib}/tests/target/issue-2551.rs | 0 .../rustfmt-lib}/tests/target/issue-2554.rs | 0 .../rustfmt-lib}/tests/target/issue-2582.rs | 0 .../rustfmt-lib}/tests/target/issue-2641.rs | 0 .../rustfmt-lib}/tests/target/issue-2644.rs | 0 .../target/issue-2673-nonmodrs-mods/foo.rs | 0 .../issue-2673-nonmodrs-mods/foo/bar.rs | 0 .../target/issue-2673-nonmodrs-mods/lib.rs | 0 .../rustfmt-lib}/tests/target/issue-2728.rs | 0 .../rustfmt-lib}/tests/target/issue-2759.rs | 0 .../rustfmt-lib}/tests/target/issue-2761.rs | 0 .../rustfmt-lib}/tests/target/issue-2794.rs | 0 .../rustfmt-lib}/tests/target/issue-2810.rs | 0 .../rustfmt-lib}/tests/target/issue-2835.rs | 0 .../rustfmt-lib}/tests/target/issue-2863.rs | 0 .../rustfmt-lib}/tests/target/issue-2869.rs | 0 .../rustfmt-lib}/tests/target/issue-2896.rs | 0 .../rustfmt-lib}/tests/target/issue-2916.rs | 0 .../tests/target/issue-2917/minimal.rs | 0 .../tests/target/issue-2917/packed_simd.rs | 0 .../rustfmt-lib}/tests/target/issue-2922.rs | 0 .../rustfmt-lib}/tests/target/issue-2927-2.rs | 0 .../rustfmt-lib}/tests/target/issue-2927.rs | 0 .../rustfmt-lib}/tests/target/issue-2930.rs | 0 .../rustfmt-lib}/tests/target/issue-2936.rs | 0 .../rustfmt-lib}/tests/target/issue-2941.rs | 0 .../rustfmt-lib}/tests/target/issue-2955.rs | 0 .../rustfmt-lib}/tests/target/issue-2973.rs | 0 .../rustfmt-lib}/tests/target/issue-2976.rs | 0 .../tests/target/issue-2977/block.rs | 0 .../tests/target/issue-2977/impl.rs | 0 .../tests/target/issue-2977/item.rs | 0 .../tests/target/issue-2977/trait.rs | 0 .../rustfmt-lib}/tests/target/issue-2985.rs | 0 .../rustfmt-lib}/tests/target/issue-2995.rs | 0 .../rustfmt-lib}/tests/target/issue-3029.rs | 0 .../rustfmt-lib}/tests/target/issue-3032.rs | 0 .../rustfmt-lib}/tests/target/issue-3038.rs | 0 .../rustfmt-lib}/tests/target/issue-3043.rs | 0 .../rustfmt-lib}/tests/target/issue-3049.rs | 0 .../tests/target/issue-3055/backtick.rs | 0 .../target/issue-3055/empty-code-block.rs | 0 .../tests/target/issue-3055/original.rs | 0 .../rustfmt-lib}/tests/target/issue-3059.rs | 0 .../rustfmt-lib}/tests/target/issue-3066.rs | 0 .../rustfmt-lib}/tests/target/issue-3105.rs | 0 .../rustfmt-lib}/tests/target/issue-3118.rs | 0 .../rustfmt-lib}/tests/target/issue-3124.rs | 0 .../rustfmt-lib}/tests/target/issue-3131.rs | 0 .../rustfmt-lib}/tests/target/issue-3132.rs | 0 .../rustfmt-lib}/tests/target/issue-3153.rs | 0 .../rustfmt-lib}/tests/target/issue-3170.rs | 0 .../rustfmt-lib}/tests/target/issue-3182.rs | 0 .../rustfmt-lib}/tests/target/issue-3184.rs | 0 .../rustfmt-lib}/tests/target/issue-3194.rs | 0 .../rustfmt-lib}/tests/target/issue-3198.rs | 0 .../tests/target/issue-3213/version_two.rs | 0 .../rustfmt-lib}/tests/target/issue-3217.rs | 0 .../rustfmt-lib}/tests/target/issue-3224.rs | 0 .../tests/target/issue-3227/two.rs | 0 .../rustfmt-lib}/tests/target/issue-3234.rs | 0 .../rustfmt-lib}/tests/target/issue-3241.rs | 0 .../tests/target/issue-3253/bar.rs | 0 .../tests/target/issue-3253/foo.rs | 0 .../tests/target/issue-3253/lib.rs | 0 .../tests/target/issue-3253/paths/bar_foo.rs | 0 .../tests/target/issue-3253/paths/excluded.rs | 0 .../tests/target/issue-3253/paths/foo_bar.rs | 0 .../rustfmt-lib}/tests/target/issue-3265.rs | 0 .../tests/target/issue-3270/two.rs | 0 .../tests/target/issue-3270/wrap.rs | 0 .../tests/target/issue-3272/v2.rs | 0 .../tests/target/issue-3278/version_two.rs | 0 .../tests/target/issue-3295/two.rs | 0 .../rustfmt-lib}/tests/target/issue-3302.rs | 0 .../rustfmt-lib}/tests/target/issue-3304.rs | 0 .../rustfmt-lib}/tests/target/issue-3314.rs | 0 .../rustfmt-lib}/tests/target/issue-3343.rs | 0 .../rustfmt-lib}/tests/target/issue-3423.rs | 0 .../tests/target/issue-3434/lib.rs | 0 .../tests/target/issue-3434/no_entry.rs | 0 .../tests/target/issue-3434/not_skip_macro.rs | 0 .../rustfmt-lib}/tests/target/issue-3442.rs | 0 .../rustfmt-lib}/tests/target/issue-3465.rs | 0 .../tests/target/issue-3494/crlf.rs | 0 .../tests/target/issue-3494/lf.rs | 0 .../rustfmt-lib}/tests/target/issue-3499.rs | 0 .../rustfmt-lib}/tests/target/issue-3508.rs | 0 .../rustfmt-lib}/tests/target/issue-3515.rs | 0 .../rustfmt-lib}/tests/target/issue-3532.rs | 0 .../rustfmt-lib}/tests/target/issue-3539.rs | 0 .../rustfmt-lib}/tests/target/issue-3554.rs | 0 .../rustfmt-lib}/tests/target/issue-3567.rs | 0 .../rustfmt-lib}/tests/target/issue-3568.rs | 0 .../tests/target/issue-3585/extern_crate.rs | 0 .../issue-3585/reorder_imports_disabled.rs | 0 .../issue-3585/reorder_imports_enabled.rs | 0 .../tests/target/issue-3585/use.rs | 0 .../rustfmt-lib}/tests/target/issue-3592.rs | 0 .../rustfmt-lib}/tests/target/issue-3595.rs | 0 .../rustfmt-lib}/tests/target/issue-3601.rs | 0 .../tests/target/issue-3614/version_two.rs | 0 .../rustfmt-lib}/tests/target/issue-3636.rs | 0 .../rustfmt-lib}/tests/target/issue-3639.rs | 0 .../rustfmt-lib}/tests/target/issue-3645.rs | 0 .../rustfmt-lib}/tests/target/issue-3651.rs | 0 .../tests/target/issue-3665/lib.rs | 0 .../target/issue-3665/not_skip_attribute.rs | 0 .../tests/target/issue-3665/sub_mod.rs | 0 .../rustfmt-lib}/tests/target/issue-3672.rs | 0 .../rustfmt-lib}/tests/target/issue-3675.rs | 0 .../tests/target/issue-3701/two.rs | 0 .../rustfmt-lib}/tests/target/issue-3709.rs | 0 .../rustfmt-lib}/tests/target/issue-3711.rs | 0 .../rustfmt-lib}/tests/target/issue-3717.rs | 0 .../rustfmt-lib}/tests/target/issue-3718.rs | 0 .../rustfmt-lib}/tests/target/issue-3740.rs | 0 .../rustfmt-lib}/tests/target/issue-3741.rs | 0 .../rustfmt-lib}/tests/target/issue-3750.rs | 0 .../rustfmt-lib}/tests/target/issue-3751.rs | 0 .../rustfmt-lib}/tests/target/issue-3759.rs | 0 .../tests/target/issue-3779/ice.rs | 0 .../tests/target/issue-3779/lib.rs | 0 .../rustfmt-lib}/tests/target/issue-3786.rs | 0 .../rustfmt-lib}/tests/target/issue-3787.rs | 0 .../rustfmt-lib}/tests/target/issue-3815.rs | 0 .../issue-3840/version-two_hard-tabs.rs | 0 .../issue-3840/version-two_soft-tabs.rs | 0 .../rustfmt-lib}/tests/target/issue-3845.rs | 0 .../rustfmt-lib}/tests/target/issue-3851.rs | 0 .../rustfmt-lib}/tests/target/issue-3882.rs | 0 .../tests/target/issue-3904/two.rs | 0 .../rustfmt-lib}/tests/target/issue-3908.rs | 0 .../rustfmt-lib}/tests/target/issue-3923.rs | 0 .../rustfmt-lib}/tests/target/issue-3929.rs | 0 .../tests/target/issue-3933/imp-a.rs | 0 .../tests/target/issue-3933/imp-b.rs | 0 .../tests/target/issue-3933/lib.rs | 0 .../tests/target/issue-3933/utils.rs | 0 .../rustfmt-lib}/tests/target/issue-3934.rs | 0 .../tests/target/issue-3956/graphics.rs | 0 .../tests/target/issue-3956/graphics_emu.rs | 0 .../tests/target/issue-3956/lib.rs | 0 .../rustfmt-lib}/tests/target/issue-3974.rs | 0 .../rustfmt-lib}/tests/target/issue-3992.rs | 0 .../rustfmt-lib}/tests/target/issue-447.rs | 0 .../rustfmt-lib}/tests/target/issue-510.rs | 0 .../rustfmt-lib}/tests/target/issue-539.rs | 0 .../rustfmt-lib}/tests/target/issue-64.rs | 0 .../rustfmt-lib}/tests/target/issue-683.rs | 0 .../rustfmt-lib}/tests/target/issue-691.rs | 0 .../rustfmt-lib}/tests/target/issue-770.rs | 0 .../rustfmt-lib}/tests/target/issue-811.rs | 0 .../rustfmt-lib}/tests/target/issue-831.rs | 0 .../rustfmt-lib}/tests/target/issue-850.rs | 0 .../rustfmt-lib}/tests/target/issue-855.rs | 0 .../rustfmt-lib}/tests/target/issue-913.rs | 0 .../rustfmt-lib}/tests/target/issue-945.rs | 0 .../rustfmt-lib}/tests/target/issue-977.rs | 0 .../rustfmt-lib}/tests/target/issue_3839.rs | 0 .../rustfmt-lib}/tests/target/issue_3844.rs | 0 .../rustfmt-lib}/tests/target/issue_3853.rs | 0 .../rustfmt-lib}/tests/target/issue_3854.rs | 0 .../rustfmt-lib}/tests/target/issue_3868.rs | 0 .../item-brace-style-always-next-line.rs | 0 .../item-brace-style-prefer-same-line.rs | 0 .../item-brace-style-same-line-where.rs | 0 .../tests/target/itemized-blocks/no_wrap.rs | 0 .../target/itemized-blocks/rewrite_fail.rs | 0 .../tests/target/itemized-blocks/urls.rs | 0 .../tests/target/itemized-blocks/wrap.rs | 0 .../rustfmt-lib}/tests/target/label_break.rs | 0 .../rustfmt-lib}/tests/target/large-block.rs | 0 .../rustfmt-lib}/tests/target/large_vec.rs | 0 .../rustfmt-lib}/tests/target/lazy_static.rs | 0 .../license-templates/empty_license_path.rs | 0 .../tests/target/license-templates/license.rs | 0 .../tests/target/long-fn-1/version_two.rs | 0 .../target/long-match-arms-brace-newline.rs | 0 .../target/long-use-statement-issue-3154.rs | 0 .../tests/target/long_field_access.rs | 0 .../rustfmt-lib}/tests/target/loop.rs | 0 .../tests/target/macro_not_expr.rs | 0 .../rustfmt-lib}/tests/target/macro_rules.rs | 0 .../rustfmt-lib}/tests/target/macros.rs | 0 .../target/markdown-comment-with-options.rs | 0 .../tests/target/markdown-comment.rs | 0 .../target/match-block-trailing-comma.rs | 0 .../tests/target/match-flattening.rs | 0 .../target/match-nowrap-trailing-comma.rs | 0 .../rustfmt-lib}/tests/target/match-nowrap.rs | 0 .../rustfmt-lib}/tests/target/match.rs | 0 .../tests/target/match_overflow_expr.rs | 0 .../tests/target/max-line-length-in-chars.rs | 0 .../tests/target/merge_imports.rs | 0 .../rustfmt-lib}/tests/target/mod-1.rs | 0 .../rustfmt-lib}/tests/target/mod-2.rs | 0 .../tests/target/mod_skip_child.rs | 0 .../rustfmt-lib}/tests/target/multi-file.rs | 0 .../target/multiline_string_in_macro_def.rs | 0 .../rustfmt-lib}/tests/target/multiple.rs | 0 .../tests/target/nested-if-else.rs | 0 .../tests/target/nested-visual-block.rs | 0 .../tests/target/nested_skipped/mod.rs | 0 .../tests/target/nestedmod/mod.rs | 0 .../tests/target/nestedmod/mod2a.rs | 0 .../tests/target/nestedmod/mod2b.rs | 0 .../tests/target/nestedmod/mod2c.rs | 0 .../tests/target/nestedmod/mymod1/mod3a.rs | 0 .../tests/target/nestedmod/submod2/a.rs | 0 .../tests/target/nestedmod/submod2/mod.rs | 0 .../tests/target/no_arg_with_commnet.rs | 0 .../tests/target/no_new_line_beginning.rs | 0 ...es_should_not_imply_format_doc_comments.rs | 0 .../normalize_multiline_doc_attribute.rs | 0 .../tests/target/obsolete_in_place.rs | 0 .../tests/target/one_line_if_v2.rs | 0 .../rustfmt-lib}/tests/target/other.rs | 0 .../rustfmt-lib}/tests/target/paren.rs | 0 .../tests/target/path_clarity/foo.rs | 0 .../tests/target/path_clarity/foo/bar.rs | 0 .../rustfmt-lib}/tests/target/paths.rs | 0 .../target/pattern-condense-wildcards.rs | 0 .../rustfmt-lib}/tests/target/pattern.rs | 0 .../preserves_carriage_return_for_unix.rs | 0 .../preserves_carriage_return_for_windows.rs | 0 .../tests/target/pub-restricted.rs | 0 .../tests/target/raw_identifiers.rs | 0 .../tests/target/remove_blank_lines.rs | 0 .../tests/target/reorder-impl-items.rs | 0 ...t_string_when_format_strings_is_not_set.rs | 0 .../tests/target/single-line-if-else.rs | 0 .../tests/target/single-line-macro/v2.rs | 0 .../rustfmt-lib}/tests/target/skip.rs | 0 .../rustfmt-lib}/tests/target/skip_mod.rs | 0 .../tests/target/soft-wrapping.rs | 0 .../tests/target/space-not-before-newline.rs | 0 .../tests/target/spaces-around-ranges.rs | 0 .../rustfmt-lib}/tests/target/static.rs | 0 .../rustfmt-lib}/tests/target/string-lit-2.rs | 0 .../tests/target/string-lit-custom.rs | 0 .../rustfmt-lib}/tests/target/string-lit.rs | 0 .../tests/target/string_punctuation.rs | 0 .../tests/target/struct-field-attributes.rs | 0 .../rustfmt-lib}/tests/target/struct_lits.rs | 0 .../tests/target/struct_lits_multiline.rs | 0 .../tests/target/struct_lits_visual.rs | 0 .../target/struct_lits_visual_multiline.rs | 0 .../tests/target/struct_tuple_visual.rs | 0 .../rustfmt-lib}/tests/target/structs.rs | 0 .../tests/target/trailing-comma-never.rs | 0 .../tests/target/trailing_commas.rs | 0 .../target/trailing_comments/hard_tabs.rs | 0 .../target/trailing_comments/soft_tabs.rs | 0 .../rustfmt-lib}/tests/target/trait.rs | 0 .../tests/target/trait_2015_edition.rs | 0 .../tests/target/try-conversion.rs | 0 .../rustfmt-lib}/tests/target/tuple.rs | 0 .../tests/target/type-ascription.rs | 0 .../rustfmt-lib}/tests/target/type.rs | 0 .../rustfmt-lib}/tests/target/type_alias.rs | 0 .../rustfmt-lib}/tests/target/unicode.rs | 0 .../target/unindent_if_else_cond_comment.rs | 0 .../rustfmt-lib}/tests/target/unions.rs | 0 .../rustfmt-lib}/tests/target/visibility.rs | 0 .../tests/target/visual-fn-type.rs | 0 .../tests/target/where-clause-rfc.rs | 0 .../rustfmt-lib}/tests/target/where-clause.rs | 0 .../tests/target/width-heuristics.rs | 0 ...ts_should_not_imply_format_doc_comments.rs | 0 .../tests/writemode/source/fn-single-line.rs | 0 .../tests/writemode/source/json.rs | 0 .../tests/writemode/source/modified.rs | 0 .../tests/writemode/source/stdin.rs | 0 .../tests/writemode/target/checkstyle.xml | 0 .../tests/writemode/target/modified.txt | 0 .../tests/writemode/target/output.json | 0 .../tests/writemode/target/stdin.json | 0 .../tests/writemode/target/stdin.xml | 0 src/bin/main.rs | 2 +- src/git-rustfmt/main.rs | 4 +- 1145 files changed, 515 insertions(+), 489 deletions(-) rename {rustfmt-lib => rustfmt-core}/.gitignore (100%) rename {rustfmt-lib => rustfmt-core}/Cargo.toml (78%) rename {rustfmt-lib => rustfmt-core}/rustfmt-config/.gitignore (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-config/Cargo.toml (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-config/config_proc_macro/.gitignore (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-config/config_proc_macro/Cargo.toml (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-config/config_proc_macro/src/attrs.rs (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-config/config_proc_macro/src/config_type.rs (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-config/config_proc_macro/src/item_enum.rs (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-config/config_proc_macro/src/item_struct.rs (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-config/config_proc_macro/src/lib.rs (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-config/config_proc_macro/src/utils.rs (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-config/config_proc_macro/tests/smoke.rs (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-config/src/config_type.rs (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-config/src/file_lines.rs (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-config/src/lib.rs (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-config/src/license.rs (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-config/src/lists.rs (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-config/src/options.rs (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-config/tests/license-template/lt.txt (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-emitter/.gitignore (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-emitter/Cargo.toml (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-emitter/src/checkstyle.rs (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-emitter/src/checkstyle/xml.rs (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-emitter/src/diff.rs (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-emitter/src/files.rs (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-emitter/src/json.rs (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-emitter/src/lib.rs (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-emitter/src/modified_lines.rs (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-emitter/src/rustfmt_diff.rs (100%) rename {rustfmt-lib => rustfmt-core}/rustfmt-emitter/src/stdout.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/.gitignore (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/Cargo.toml (95%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/attr.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/attr/doc_comment.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/chains.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/closures.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/comment.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/coverage.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/expr.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/format_report_formatter.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/formatting.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/formatting/newline_style.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/ignore_path.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/imports.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/issues.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/items.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/lib.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/lists.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/macros.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/matches.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/missed_spans.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/modules.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/modules/visitor.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/overflow.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/pairs.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/patterns.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/release_channel.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/reorder.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/rewrite.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/shape.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/skip.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/source_file.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/source_map.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/spanned.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/stmt.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/string.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/syntux.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/syntux/parser.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/syntux/session.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/test/configuration_snippet.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/test/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/types.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/utils.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/vertical.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/src/visitor.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/config/issue-1111.toml (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/config/issue-2641.toml (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/config/issue-3779.toml (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/config/issue-3802.toml (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/config/issue-3933.toml (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/config/issue-3956.toml (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/config/skip_children.toml (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/config/small_tabs.toml (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/coverage/source/comments.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/coverage/target/comments.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/license-template/lt.txt (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/alignment_2633/block_style.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/alignment_2633/visual_style.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/array_comment.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/assignment.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/associated-types-bounds-wrapping.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/associated_type_bounds.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/async_block.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/async_fn.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/attrib.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/big-impl-block.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/big-impl-visual.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/binary-expr.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/break-and-continue.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/catch.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/detect/arch/aarch64.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/detect/arch/arm.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/detect/arch/mips.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/detect/arch/mips64.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/detect/arch/powerpc.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/detect/arch/powerpc64.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/detect/arch/x86.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/detect/bit.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/detect/cache.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/detect/error_macros.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/detect/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/detect/os/aarch64.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/detect/os/freebsd/aarch64.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/detect/os/freebsd/arm.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/detect/os/freebsd/auxvec.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/detect/os/freebsd/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/detect/os/freebsd/powerpc.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/detect/os/linux/aarch64.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/detect/os/linux/arm.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/detect/os/linux/auxvec.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/detect/os/linux/cpuinfo.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/detect/os/linux/mips.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/detect/os/linux/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/detect/os/linux/powerpc.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/detect/os/other.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/detect/os/x86.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/lib.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_if/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_mod/bar.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_mod/dir/dir1/dir2/wasm32.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_mod/dir/dir1/dir3/wasm32.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_mod/foo.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_mod/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_mod/other.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/cfg_mod/wasm32.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/chains-visual.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/chains.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/chains_with_comment.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/closure-block-inside-macro.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/closure_block_style.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/closure_block_style_no_comma.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/closure_visual_style.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/comment.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/comment2.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/comment3.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/comment4.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/comment5.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/comment6.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/comment_crlf_newline.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/blank_lines_lower_bound/1.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/brace_style/fn_always_next_line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/brace_style/fn_prefer_same_line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/brace_style/fn_same_line_where.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/brace_style/item_always_next_line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/brace_style/item_prefer_same_line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/brace_style/item_same_line_where.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/comment_width/above.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/comment_width/below.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/comment_width/ignore.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/condense_wildcard_suffixes/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/condense_wildcard_suffixes/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/control_brace_style/always_next_line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/control_brace_style/always_same_line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/control_brace_style/closing_next_line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/disable_all_formatting/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/disable_all_formatting/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/empty_item_single_line/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/empty_item_single_line/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/enum_discrim_align_threshold/40.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/error_on_line_overflow/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/fn_args_layout/compressed.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/fn_args_layout/tall.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/fn_args_layout/vertical.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/fn_single_line/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/fn_single_line/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/force_explicit_abi/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/force_explicit_abi/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/force_multiline_block/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/force_multiline_block/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/format_macro_bodies/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/format_macro_bodies/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/format_macro_matchers/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/format_macro_matchers/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/format_strings/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/format_strings/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/hard_tabs/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/hard_tabs/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/imports_layout/merge_mixed.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/indent_style/block_args.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/indent_style/block_array.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/indent_style/block_call.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/indent_style/block_chain.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/indent_style/block_generic.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/indent_style/block_struct_lit.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/indent_style/block_trailing_comma_call/two.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/indent_style/block_where_pred.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/indent_style/default.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/indent_style/rfc_where.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/indent_style/visual_args.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/indent_style/visual_array.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/indent_style/visual_call.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/indent_style/visual_chain.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/indent_style/visual_generics.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/indent_style/visual_struct_lit.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/indent_style/visual_trailing_comma.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/indent_style/visual_where_pred.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/match_arm_blocks/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/match_arm_blocks/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/match_block_trailing_comma/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/match_block_trailing_comma/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/merge_derives/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/normalize_comments/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/normalize_comments/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/normalize_doc_attributes/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/normalize_doc_attributes/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/recursive/disabled/foo.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/recursive/disabled/lib.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/recursive/enabled/foo.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/recursive/enabled/lib.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/remove_nested_parens/remove_nested_parens.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/reorder_impl_items/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/reorder_impl_items/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/reorder_imports/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/reorder_imports/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/reorder_modules/dolor/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/reorder_modules/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/reorder_modules/ipsum/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/reorder_modules/lorem/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/reorder_modules/sit/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/reorder_modules/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/skip_children/foo/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/skip_children/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/space_before_colon/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/spaces_around_ranges/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/spaces_around_ranges/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/struct_field_align_threshold/20.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/struct_lit_single_line/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/tab_spaces/2.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/tab_spaces/4.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/trailing_comma/always.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/trailing_comma/never.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/trailing_comma/vertical.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/type_punctuation_density/compressed.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/type_punctuation_density/wide.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/use_field_init_shorthand/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/use_field_init_shorthand/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/use_small_heuristics/max.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/use_try_shorthand/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/use_try_shorthand/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/use_try_shorthand/true_2015_edition.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/where_single_line/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/wrap_comments/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/configs/wrap_comments/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/const_generics.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/control-brace-style-always-next-line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/control-brace-style-always-same-line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/doc-attrib.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/doc-comment-with-example.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/doc.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/dyn_trait.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/else-if-brace-style-always-next-line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/else-if-brace-style-always-same-line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/else-if-brace-style-closing-next-line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/empty_file.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/enum.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/existential_type.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/expr-block.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/expr-overflow-delimited.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/expr.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/extern.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/extern_not_explicit.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/file-lines-1.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/file-lines-2.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/file-lines-3.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/file-lines-4.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/file-lines-5.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/file-lines-6.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/file-lines-7.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/file-lines-8.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/file-lines-item.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/fn-custom-2.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/fn-custom-3.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/fn-custom-4.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/fn-custom-6.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/fn-custom-7.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/fn-custom-8.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/fn-custom.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/fn-param-attributes.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/fn-simple.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/fn-single-line/version_two.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/fn_args_indent-block.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/fn_args_layout-vertical.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/hard-tabs.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/hello.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/hello2.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/if_while_or_patterns.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/immovable_generators.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/impls.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/imports-impl-only-use.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/imports-reorder-lines-and-items.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/imports-reorder-lines.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/imports-reorder.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/imports.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/imports_2015_edition.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/imports_block_indent.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/imports_raw_identifiers.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/invalid-rust-code-in-doc-comment.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-1021.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-1049.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-1111.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-1120.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-1124.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-1127.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-1158.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-1177.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-1192.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-1210/a.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-1210/b.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-1210/c.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-1210/d.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-1210/e.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-1211.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-1216.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-1239.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-1278.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-1350.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-1366.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-1468.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-1693.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-1800.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-1914.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2025.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2111.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2164.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2179/two.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2256.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2342.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2445.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2446.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2479.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2482/a.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2482/b.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2482/c.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2496.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2520.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2523.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2582.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2641.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2644.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2728.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2761.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2794.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2835.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2863.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2869.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2896.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2917/packed_simd.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2922.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2927-2.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2927.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2930.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2936.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2955.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2973.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2977/impl.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2977/trait.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2985.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-2995.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3029.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3038.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3049.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3055/original.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3059.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3066.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3131.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3153.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3170.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3194.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3198.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3213/version_two.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3217.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3227/two.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3234.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3241.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3253/bar.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3253/foo.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3253/lib.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3253/paths/bar_foo.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3253/paths/excluded.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3253/paths/foo_bar.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3265.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3270/two.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3272/v2.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3278/version_two.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3295/two.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3302.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3343.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3423.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3434/lib.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3434/no_entry.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3434/not_skip_macro.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3465.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3494/crlf.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3494/lf.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3508.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3515.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3532.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3585/extern_crate.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3585/reorder_imports_disabled.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3585/reorder_imports_enabled.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3585/use.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3636.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3639.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3651.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3665/lib.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3665/not_skip_attribute.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3665/sub_mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3672.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3675.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3701/two.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3709.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3740.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3750.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3751.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3779/ice.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3779/lib.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3786.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3787.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3840/version-two_hard-tabs.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3840/version-two_soft-tabs.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3851.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3904/two.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3908.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3923.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3929.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3933/imp-a.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3933/imp-b.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3933/lib.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-3933/utils.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-447.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-510.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-539.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-683.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-811.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-850.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-855.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-913.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-945.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue-977.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue_3839.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue_3844.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue_3853.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/issue_3868.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/item-brace-style-always-next-line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/item-brace-style-prefer-same-line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/item-brace-style-same-line-where.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/itemized-blocks/no_wrap.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/itemized-blocks/rewrite_fail.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/itemized-blocks/urls.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/itemized-blocks/wrap.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/label_break.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/large-block.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/large_vec.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/lazy_static.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/license-templates/empty_license_path.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/license-templates/license.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/long-fn-1/version_two.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/long-match-arms-brace-newline.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/long-use-statement-issue-3154.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/long_field_access.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/loop.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/macro_not_expr.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/macro_rules.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/macros.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/markdown-comment-with-options.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/markdown-comment.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/match-block-trailing-comma.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/match-flattening.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/match-nowrap-trailing-comma.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/match-nowrap.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/match.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/match_overflow_expr.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/max-line-length-in-chars.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/merge_imports.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/mod-1.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/mod-2.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/mod_skip_child.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/multiple.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/nested-if-else.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/nested_skipped/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/nestedmod/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/nestedmod/mod2a.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/nestedmod/mod2b.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/nestedmod/mod2c.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/nestedmod/mymod1/mod3a.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/nestedmod/submod2/a.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/nestedmod/submod2/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/no_arg_with_commnet.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/no_new_line_beginning.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/normalize_doc_attributes_should_not_imply_format_doc_comments.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/normalize_multiline_doc_attribute.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/one_line_if_v2.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/other.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/paren.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/path_clarity/foo.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/path_clarity/foo/bar.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/paths.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/pattern-condense-wildcards.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/pattern.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/preserves_carriage_return_for_unix.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/preserves_carriage_return_for_windows.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/pub-restricted.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/remove_blank_lines.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/reorder-impl-items.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/single-line-if-else.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/single-line-macro/v2.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/soft-wrapping.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/space-not-before-newline.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/spaces-around-ranges.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/static.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/string-lit-2.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/string-lit.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/string_punctuation.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/struct-field-attributes.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/struct_lits.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/struct_lits_multiline.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/struct_lits_visual.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/struct_lits_visual_multiline.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/struct_tuple_visual.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/structs.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/trailing-comma-never.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/trailing_commas.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/trailing_comments/hard_tabs.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/trailing_comments/soft_tabs.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/trait.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/trait_2015_edition.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/try-conversion.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/tuple.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/type-ascription.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/type.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/type_alias.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/unicode.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/unions.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/visibility.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/visual-fn-type.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/where-clause-rfc.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/where-clause.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/width-heuristics.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/source/wrap_comments_should_not_imply_format_doc_comments.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/alignment_2633/block_style.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/alignment_2633/horizontal_tactic.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/alignment_2633/visual_style.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/array_comment.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/assignment.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/associated-items.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/associated-types-bounds-wrapping.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/associated_type_bounds.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/associated_type_defaults.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/async_block.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/async_closure.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/async_fn.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/attrib-block-expr.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/attrib-extern-crate.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/attrib.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/big-impl-block.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/big-impl-visual.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/binary-expr.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/break-and-continue.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/catch.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/detect/arch/aarch64.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/detect/arch/arm.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/detect/arch/mips.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/detect/arch/mips64.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/detect/arch/powerpc.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/detect/arch/powerpc64.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/detect/arch/x86.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/detect/bit.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/detect/cache.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/detect/error_macros.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/detect/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/detect/os/aarch64.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/detect/os/freebsd/aarch64.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/detect/os/freebsd/arm.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/detect/os/freebsd/auxvec.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/detect/os/freebsd/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/detect/os/freebsd/powerpc.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/detect/os/linux/aarch64.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/detect/os/linux/arm.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/detect/os/linux/auxvec.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/detect/os/linux/cpuinfo.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/detect/os/linux/mips.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/detect/os/linux/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/detect/os/linux/powerpc.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/detect/os/other.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/detect/os/x86.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/lib.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_if/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_mod/bar.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_mod/dir/dir1/dir2/wasm32.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_mod/dir/dir1/dir3/wasm32.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_mod/foo.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_mod/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_mod/other.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/cfg_mod/wasm32.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/chains-visual.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/chains.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/chains_with_comment.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/closure-block-inside-macro.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/closure_block_style.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/closure_block_style_no_comma.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/closure_visual_style.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/comment-inside-const.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/comment-not-disappear.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/comment.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/comment2.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/comment3.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/comment4.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/comment5.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/comment6.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/comment_crlf_newline.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/comments-fn.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/blank_lines_lower_bound/1.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/brace_style/fn_always_next_line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/brace_style/fn_prefer_same_line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/brace_style/fn_same_line_where.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/brace_style/item_always_next_line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/brace_style/item_prefer_same_line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/brace_style/item_same_line_where.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/combine_control_expr/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/combine_control_expr/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/comment_width/above.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/comment_width/below.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/comment_width/ignore.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/condense_wildcard_suffixes/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/condense_wildcard_suffixes/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/control_brace_style/always_next_line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/control_brace_style/always_same_line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/control_brace_style/closing_next_line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/disable_all_formatting/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/disable_all_formatting/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/empty_item_single_line/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/empty_item_single_line/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/enum_discrim_align_threshold/40.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/error_on_line_overflow/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/error_on_unformatted/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/fn_args_layout/compressed.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/fn_args_layout/tall.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/fn_args_layout/vertical.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/fn_single_line/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/fn_single_line/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/force_explicit_abi/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/force_explicit_abi/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/force_multiline_block/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/force_multiline_block/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/format_macro_bodies/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/format_macro_bodies/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/format_macro_matchers/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/format_macro_matchers/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/format_strings/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/format_strings/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/hard_tabs/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/hard_tabs/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/imports_indent/block.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/imports_layout/horizontal_vertical.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/imports_layout/merge_mixed.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/imports_layout/mixed.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/indent_style/block_args.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/indent_style/block_array.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/indent_style/block_call.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/indent_style/block_chain.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/indent_style/block_generic.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/indent_style/block_struct_lit.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/indent_style/block_tab_spaces_call.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/indent_style/block_trailing_comma_call/two.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/indent_style/block_where_pred.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/indent_style/default.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/indent_style/rfc_control.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/indent_style/rfc_where.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/indent_style/visual_args.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/indent_style/visual_array.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/indent_style/visual_call.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/indent_style/visual_chain.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/indent_style/visual_generics.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/indent_style/visual_struct_lit.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/indent_style/visual_trailing_comma.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/indent_style/visual_where_pred.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/match_arm_blocks/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/match_arm_blocks/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/match_block_trailing_comma/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/match_block_trailing_comma/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/merge_derives/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/normalize_comments/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/normalize_comments/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/normalize_doc_attributes/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/normalize_doc_attributes/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/recursive/disabled/foo.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/recursive/disabled/lib.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/recursive/enabled/foo.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/recursive/enabled/lib.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/remove_nested_parens/remove_nested_parens.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/reorder_impl_items/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/reorder_impl_items/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/reorder_imports/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/reorder_imports/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/reorder_modules/dolor/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/reorder_modules/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/reorder_modules/ipsum/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/reorder_modules/lorem/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/reorder_modules/sit/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/reorder_modules/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/skip_children/foo/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/skip_children/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/space_before_colon/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/spaces_around_ranges/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/spaces_around_ranges/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/struct_field_align_threshold/20.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/struct_lit_single_line/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/tab_spaces/2.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/tab_spaces/4.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/trailing_comma/always.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/trailing_comma/never.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/trailing_comma/vertical.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/trailing_semicolon/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/trailing_semicolon/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/type_punctuation_density/compressed.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/type_punctuation_density/wide.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/use_field_init_shorthand/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/use_field_init_shorthand/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/use_small_heuristics/max.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/use_try_shorthand/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/use_try_shorthand/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/use_try_shorthand/true_2015_edition.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/where_single_line/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/wrap_comments/false.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/configs/wrap_comments/true.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/const_generics.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/control-brace-style-always-next-line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/control-brace-style-always-same-line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/doc-attrib.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/doc-comment-with-example.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/doc.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/dyn_trait.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/else-if-brace-style-always-next-line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/else-if-brace-style-always-same-line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/else-if-brace-style-closing-next-line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/empty-tuple-no-conversion-to-unit-struct.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/empty_file.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/enum.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/existential_type.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/expr-block.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/expr-overflow-delimited.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/expr.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/extern.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/extern_not_explicit.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/file-lines-1.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/file-lines-2.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/file-lines-3.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/file-lines-4.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/file-lines-5.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/file-lines-6.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/file-lines-7.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/file-lines-8.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/file-lines-item.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/fn-args-with-last-line-comment.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/fn-custom-2.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/fn-custom-3.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/fn-custom-4.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/fn-custom-6.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/fn-custom-7.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/fn-custom-8.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/fn-custom.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/fn-param-attributes.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/fn-simple.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/fn-single-line/version_two.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/fn-ty.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/fn.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/fn_args_indent-block.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/fn_args_layout-vertical.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/fn_once.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/format_strings/issue-202.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/format_strings/issue-2833.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/format_strings/issue-3263.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/format_strings/issue-687.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/format_strings/issue564.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/hard-tabs.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/hello.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/if_while_or_patterns.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/immovable_generators.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/impl.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/impls.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/import-fencepost-length.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/imports-impl-only-use.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/imports-reorder-lines-and-items.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/imports-reorder-lines.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/imports-reorder.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/imports.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/imports_2015_edition.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/imports_block_indent.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/imports_raw_identifiers.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/indented-impl.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/invalid-rust-code-in-doc-comment.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1021.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1049.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1055.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1096.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1111.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1113.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1120.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1124.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1127.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1158.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1177.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1192.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1210/a.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1210/b.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1210/c.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1210/d.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1210/e.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1211.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1214.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1216.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1239.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1247.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1255.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1278.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1350.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1366.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1397.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1468.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1598.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1624.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1681.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1693.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1703.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1800.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1802.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1824.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-1914.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2025.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2103.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2111.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2123.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2164.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2179/two.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2197.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2256.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2324.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2329.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2342.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2346.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2401.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2445.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2446.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2479.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2482/a.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2482/b.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2482/c.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2496.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2520.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2523.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2526.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2551.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2554.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2582.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2641.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2644.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2673-nonmodrs-mods/foo.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2673-nonmodrs-mods/foo/bar.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2673-nonmodrs-mods/lib.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2728.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2759.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2761.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2794.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2810.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2835.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2863.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2869.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2896.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2916.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2917/minimal.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2917/packed_simd.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2922.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2927-2.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2927.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2930.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2936.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2941.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2955.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2973.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2976.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2977/block.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2977/impl.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2977/item.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2977/trait.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2985.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-2995.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3029.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3032.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3038.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3043.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3049.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3055/backtick.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3055/empty-code-block.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3055/original.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3059.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3066.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3105.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3118.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3124.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3131.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3132.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3153.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3170.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3182.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3184.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3194.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3198.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3213/version_two.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3217.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3224.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3227/two.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3234.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3241.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3253/bar.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3253/foo.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3253/lib.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3253/paths/bar_foo.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3253/paths/excluded.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3253/paths/foo_bar.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3265.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3270/two.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3270/wrap.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3272/v2.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3278/version_two.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3295/two.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3302.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3304.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3314.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3343.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3423.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3434/lib.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3434/no_entry.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3434/not_skip_macro.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3442.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3465.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3494/crlf.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3494/lf.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3499.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3508.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3515.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3532.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3539.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3554.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3567.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3568.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3585/extern_crate.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3585/reorder_imports_disabled.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3585/reorder_imports_enabled.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3585/use.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3592.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3595.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3601.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3614/version_two.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3636.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3639.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3645.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3651.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3665/lib.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3665/not_skip_attribute.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3665/sub_mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3672.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3675.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3701/two.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3709.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3711.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3717.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3718.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3740.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3741.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3750.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3751.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3759.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3779/ice.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3779/lib.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3786.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3787.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3815.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3840/version-two_hard-tabs.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3840/version-two_soft-tabs.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3845.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3851.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3882.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3904/two.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3908.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3923.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3929.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3933/imp-a.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3933/imp-b.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3933/lib.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3933/utils.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3934.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3956/graphics.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3956/graphics_emu.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3956/lib.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3974.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-3992.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-447.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-510.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-539.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-64.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-683.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-691.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-770.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-811.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-831.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-850.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-855.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-913.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-945.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue-977.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue_3839.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue_3844.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue_3853.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue_3854.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/issue_3868.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/item-brace-style-always-next-line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/item-brace-style-prefer-same-line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/item-brace-style-same-line-where.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/itemized-blocks/no_wrap.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/itemized-blocks/rewrite_fail.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/itemized-blocks/urls.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/itemized-blocks/wrap.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/label_break.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/large-block.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/large_vec.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/lazy_static.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/license-templates/empty_license_path.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/license-templates/license.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/long-fn-1/version_two.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/long-match-arms-brace-newline.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/long-use-statement-issue-3154.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/long_field_access.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/loop.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/macro_not_expr.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/macro_rules.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/macros.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/markdown-comment-with-options.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/markdown-comment.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/match-block-trailing-comma.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/match-flattening.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/match-nowrap-trailing-comma.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/match-nowrap.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/match.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/match_overflow_expr.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/max-line-length-in-chars.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/merge_imports.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/mod-1.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/mod-2.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/mod_skip_child.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/multi-file.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/multiline_string_in_macro_def.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/multiple.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/nested-if-else.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/nested-visual-block.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/nested_skipped/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/nestedmod/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/nestedmod/mod2a.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/nestedmod/mod2b.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/nestedmod/mod2c.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/nestedmod/mymod1/mod3a.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/nestedmod/submod2/a.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/nestedmod/submod2/mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/no_arg_with_commnet.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/no_new_line_beginning.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/normalize_doc_attributes_should_not_imply_format_doc_comments.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/normalize_multiline_doc_attribute.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/obsolete_in_place.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/one_line_if_v2.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/other.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/paren.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/path_clarity/foo.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/path_clarity/foo/bar.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/paths.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/pattern-condense-wildcards.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/pattern.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/preserves_carriage_return_for_unix.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/preserves_carriage_return_for_windows.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/pub-restricted.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/raw_identifiers.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/remove_blank_lines.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/reorder-impl-items.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/should_not_format_string_when_format_strings_is_not_set.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/single-line-if-else.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/single-line-macro/v2.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/skip.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/skip_mod.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/soft-wrapping.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/space-not-before-newline.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/spaces-around-ranges.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/static.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/string-lit-2.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/string-lit-custom.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/string-lit.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/string_punctuation.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/struct-field-attributes.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/struct_lits.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/struct_lits_multiline.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/struct_lits_visual.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/struct_lits_visual_multiline.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/struct_tuple_visual.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/structs.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/trailing-comma-never.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/trailing_commas.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/trailing_comments/hard_tabs.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/trailing_comments/soft_tabs.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/trait.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/trait_2015_edition.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/try-conversion.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/tuple.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/type-ascription.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/type.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/type_alias.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/unicode.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/unindent_if_else_cond_comment.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/unions.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/visibility.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/visual-fn-type.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/where-clause-rfc.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/where-clause.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/width-heuristics.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/target/wrap_comments_should_not_imply_format_doc_comments.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/writemode/source/fn-single-line.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/writemode/source/json.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/writemode/source/modified.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/writemode/source/stdin.rs (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/writemode/target/checkstyle.xml (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/writemode/target/modified.txt (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/writemode/target/output.json (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/writemode/target/stdin.json (100%) rename {rustfmt-lib/rustfmt-core => rustfmt-core/rustfmt-lib}/tests/writemode/target/stdin.xml (100%) diff --git a/Cargo.lock b/Cargo.lock index 8cde7e3224b..032d52f06a8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,1300 +4,1326 @@ name = "aho-corasick" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" dependencies = [ - "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr", ] [[package]] name = "annotate-snippets" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7021ce4924a3f25f802b2cccd1af585e39ea1a363a1aa2e72afe54b67a3a7a7" dependencies = [ - "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ansi_term 0.11.0", ] [[package]] name = "ansi_term" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" dependencies = [ - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8", ] [[package]] name = "ansi_term" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8", ] [[package]] name = "anyhow" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7825f6833612eb2414095684fcf6c635becf3ce97fe48cf6421321e93bfbd53c" [[package]] name = "arrayref" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" [[package]] name = "arrayvec" -version = "0.4.12" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -] +checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" [[package]] name = "atty" version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", + "winapi 0.3.8", ] [[package]] name = "autocfg" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" [[package]] name = "backtrace" version = "0.3.40" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" dependencies = [ - "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace-sys", + "cfg-if", + "libc", + "rustc-demangle", ] [[package]] name = "backtrace-sys" version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" dependencies = [ - "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "cc", + "libc", ] [[package]] name = "base64" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" dependencies = [ - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder", ] [[package]] name = "bitflags" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "blake2b_simd" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b83b7baab1e671718d78204225800d6b170e648188ac7dc992e9d6bddf87d0c0" dependencies = [ - "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "arrayref", + "arrayvec", + "constant_time_eq", ] [[package]] name = "bstr" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245" dependencies = [ - "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr", ] [[package]] name = "bytecount" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0017894339f586ccb943b01b9555de56770c11cda818e7e3d8bd93f4ed7f46e" dependencies = [ - "packed_simd 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "packed_simd", ] [[package]] name = "byteorder" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" [[package]] name = "cargo_metadata" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46e3374c604fb39d1a2f35ed5e4a4e30e60d01fab49446e08f1b3e9a90aef202" dependencies = [ - "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", + "semver", + "serde", + "serde_derive", + "serde_json", ] [[package]] name = "cc" -version = "1.0.46" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f52a465a666ca3d838ebbf08b241383421412fe7ebb463527bba275526d89f76" [[package]] name = "cfg-if" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] name = "clap" version = "2.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" dependencies = [ - "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ansi_term 0.11.0", + "atty", + "bitflags", + "strsim", + "textwrap", + "unicode-width", + "vec_map", ] [[package]] name = "cloudabi" version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags", ] [[package]] name = "constant_time_eq" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120" [[package]] name = "crossbeam-channel" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c" dependencies = [ - "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.7.0", ] [[package]] name = "crossbeam-deque" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca" dependencies = [ - "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-epoch", + "crossbeam-utils 0.7.0", ] [[package]] name = "crossbeam-epoch" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac" dependencies = [ - "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg", + "cfg-if", + "crossbeam-utils 0.7.0", + "lazy_static", + "memoffset", + "scopeguard", ] [[package]] name = "crossbeam-queue" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" dependencies = [ - "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.6.6", ] [[package]] name = "crossbeam-utils" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "lazy_static", ] [[package]] name = "crossbeam-utils" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" dependencies = [ - "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg", + "cfg-if", + "lazy_static", ] [[package]] name = "diff" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" [[package]] name = "dirs" version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "dirs-sys", ] [[package]] name = "dirs-sys" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "libc", + "redox_users", + "winapi 0.3.8", ] [[package]] name = "either" version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" [[package]] name = "ena" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8944dc8fa28ce4a38f778bd46bf7d923fe73eed5a439398507246c8e017e6f36" dependencies = [ - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "log", ] [[package]] name = "env_logger" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" dependencies = [ - "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "atty", + "humantime", + "log", + "regex", + "termcolor", ] [[package]] name = "failure" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" dependencies = [ - "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)", - "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace", + "failure_derive", ] [[package]] name = "failure_derive" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" dependencies = [ - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", + "quote", + "syn", + "synstructure", ] [[package]] name = "fnv" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" [[package]] name = "fuchsia-cprng" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" [[package]] name = "getopts" version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" dependencies = [ - "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-width", ] [[package]] name = "getrandom" version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "libc", + "wasi", ] [[package]] name = "globset" version = "0.4.4" -source = "git+https://github.com/topecongiro/ripgrep?branch=update-crossbeam#ecf89122fc3d1af5c9b20a6d44eb5e3998ed7c39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925aa2cac82d8834e2b2a4415b6f6879757fb5c0928fc445ae76461a12eed8f2" dependencies = [ - "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", - "bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "aho-corasick", + "bstr", + "fnv", + "log", + "regex", ] [[package]] name = "heck" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" dependencies = [ - "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-segmentation", ] [[package]] name = "hermit-abi" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", ] [[package]] name = "humantime" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" dependencies = [ - "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "ignore" -version = "0.4.10" -source = "git+https://github.com/topecongiro/ripgrep?branch=update-crossbeam#ecf89122fc3d1af5c9b20a6d44eb5e3998ed7c39" -dependencies = [ - "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "globset 0.4.4 (git+https://github.com/topecongiro/ripgrep?branch=update-crossbeam)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "quick-error", ] [[package]] name = "indexmap" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2" dependencies = [ - "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg", ] [[package]] name = "itertools" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" dependencies = [ - "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "either", ] [[package]] name = "itoa" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" [[package]] name = "jobserver" version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b1d42ef453b30b7387e113da1c83ab1605d90c5b4e0eb8e96d016ed3b8c160" dependencies = [ - "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom", + "libc", + "log", ] [[package]] name = "kernel32-sys" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" dependencies = [ - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8", + "winapi-build", ] [[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.65" +version = "0.2.66" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" [[package]] name = "lock_api" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b" dependencies = [ - "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "scopeguard", ] [[package]] name = "log" version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", ] [[package]] name = "maybe-uninit" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "memchr" version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" [[package]] name = "memoffset" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" dependencies = [ - "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc_version", ] -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "num_cpus" version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72" dependencies = [ - "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "hermit-abi", + "libc", ] [[package]] name = "packed_simd" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a85ea9fc0d4ac0deb6fe7911d38786b32fc11119afd9e9d38b84ff691ce64220" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", ] [[package]] name = "parking_lot" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" dependencies = [ - "lock_api 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "lock_api", + "parking_lot_core", + "rustc_version", ] [[package]] name = "parking_lot_core" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "cloudabi", + "libc", + "redox_syscall", + "rustc_version", + "smallvec", + "winapi 0.3.8", ] [[package]] name = "proc-macro-error" -version = "0.2.6" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53c98547ceaea14eeb26fcadf51dc70d01a2479a7839170eae133721105e4428" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "rustversion", + "syn", +] + +[[package]] +name = "proc-macro-error-attr" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2bf5d493cf5d3e296beccfd61794e445e830dfc8070a9c248ad3ee071392c6c" dependencies = [ - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", + "quote", + "rustversion", + "syn", + "syn-mid", ] [[package]] name = "proc-macro2" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0319972dcae462681daf4da1adeeaa066e3ebd29c69be96c6abb1259d2ee2bcc" dependencies = [ - "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid", ] [[package]] name = "quick-error" -version = "1.2.2" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" dependencies = [ - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", ] [[package]] name = "rand_core" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" dependencies = [ - "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.4.2", ] [[package]] name = "rand_core" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" [[package]] name = "rand_os" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" dependencies = [ - "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "cloudabi", + "fuchsia-cprng", + "libc", + "rand_core 0.4.2", + "rdrand", + "winapi 0.3.8", ] [[package]] name = "rdrand" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" dependencies = [ - "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1", ] [[package]] name = "redox_syscall" version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" [[package]] name = "redox_users" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d" dependencies = [ - "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", - "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "failure", + "rand_os", + "redox_syscall", + "rust-argon2", ] [[package]] name = "regex" version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" dependencies = [ - "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", - "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "aho-corasick", + "memchr", + "regex-syntax", + "thread_local", ] [[package]] name = "regex-syntax" version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" [[package]] name = "rust-argon2" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf" dependencies = [ - "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "blake2b_simd 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "base64", + "blake2b_simd", + "crossbeam-utils 0.6.6", ] [[package]] name = "rustc-ap-arena" version = "610.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7475f4c707269b56eb7144c53591e3cd6369a5aa1d66434829ea11df96d5e7e3" dependencies = [ - "rustc-ap-rustc_data_structures 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures", + "smallvec", ] [[package]] name = "rustc-ap-graphviz" version = "610.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e59a55520f140a70a3e0fad80a36e807caa85e9d7016167b91a5b521ea929be" [[package]] name = "rustc-ap-rustc_data_structures" version = "610.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6420857d5a088f680ec1ba736ffba4ee9c1964b0d397e6318f38d461f4f7d5cb" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", - "ena 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", - "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "jobserver 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-graphviz 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_index 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-serialize 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-rayon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-rayon-core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", - "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "crossbeam-utils 0.6.6", + "ena", + "indexmap", + "jobserver", + "lazy_static", + "log", + "parking_lot", + "rustc-ap-graphviz", + "rustc-ap-rustc_index", + "rustc-ap-serialize", + "rustc-hash", + "rustc-rayon", + "rustc-rayon-core", + "smallvec", + "stable_deref_trait", ] [[package]] name = "rustc-ap-rustc_errors" version = "610.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8abfca0960131262254a91d02ff4903526a261ede730d7a2c75b4234c867cdc0" dependencies = [ - "annotate-snippets 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-serialize 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-syntax_pos 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "annotate-snippets", + "atty", + "log", + "rustc-ap-rustc_data_structures", + "rustc-ap-serialize", + "rustc-ap-syntax_pos", + "term_size", + "termcolor", + "unicode-width", ] [[package]] name = "rustc-ap-rustc_index" version = "610.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a395509dcb90a92c1479c085639594624e06b4ab3fc7c1b795b46a61f2d4f65" dependencies = [ - "rustc-ap-serialize 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-serialize", + "smallvec", ] [[package]] name = "rustc-ap-rustc_lexer" version = "610.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64eac8a0e6efb8f55292aa24be0208c7c0538236c613e79952fd1fa3d54bcf8e" dependencies = [ - "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid", ] [[package]] name = "rustc-ap-rustc_macros" version = "610.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f99795e8be4877e9e05d59f201e1740c1cf673364655def5848606d9e25b75af" dependencies = [ - "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", + "itertools", + "proc-macro2", + "quote", + "syn", + "synstructure", ] [[package]] name = "rustc-ap-rustc_target" version = "610.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f22e21fdd8e1c0030f507158fa79b9f1e080e6241aba994d0f97c14a0a07a826" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_index 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-serialize 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-syntax_pos 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags", + "log", + "rustc-ap-rustc_data_structures", + "rustc-ap-rustc_index", + "rustc-ap-serialize", + "rustc-ap-syntax_pos", ] [[package]] name = "rustc-ap-serialize" version = "610.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb1cd6ef5135408d62559866e79986ca261f4c1333253d500e5e66fe66d1432e" dependencies = [ - "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", + "indexmap", + "smallvec", ] [[package]] name = "rustc-ap-syntax" version = "610.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61fc1c901d2cbd24cae95d7bc5a58aa7661ec3dc5320c78c32830a52a685c33c" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_errors 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_index 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_lexer 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_target 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-serialize 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-syntax_pos 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags", + "lazy_static", + "log", + "rustc-ap-rustc_data_structures", + "rustc-ap-rustc_errors", + "rustc-ap-rustc_index", + "rustc-ap-rustc_lexer", + "rustc-ap-rustc_target", + "rustc-ap-serialize", + "rustc-ap-syntax_pos", + "scoped-tls", + "smallvec", ] [[package]] name = "rustc-ap-syntax_pos" version = "610.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "230534f638255853bb9f13987537e00a818435a0cc54b68d97221b6822c8f1bc" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-arena 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_index 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_macros 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-serialize 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "rustc-ap-arena", + "rustc-ap-rustc_data_structures", + "rustc-ap-rustc_index", + "rustc-ap-rustc_macros", + "rustc-ap-serialize", + "scoped-tls", + "unicode-width", ] [[package]] name = "rustc-demangle" version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" [[package]] name = "rustc-hash" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8" dependencies = [ - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder", ] [[package]] name = "rustc-rayon" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f32767f90d938f1b7199a174ef249ae1924f6e5bbdb9d112fea141e016f25b3a" dependencies = [ - "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-rayon-core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-deque", + "either", + "rustc-rayon-core", ] [[package]] name = "rustc-rayon-core" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea2427831f0053ea3ea73559c8eabd893133a51b251d142bacee53c62a288cb3" dependencies = [ - "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-deque", + "crossbeam-queue", + "crossbeam-utils 0.6.6", + "lazy_static", + "num_cpus", ] [[package]] name = "rustc-workspace-hack" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc71d2faa173b74b232dedc235e3ee1696581bb132fc116fa3626d6151a1a8fb" [[package]] name = "rustc_version" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" dependencies = [ - "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "semver", ] [[package]] name = "rustfmt-config_proc_macro" version = "0.4.0" dependencies = [ - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "rustfmt-nightly" -version = "1.4.10" -dependencies = [ - "ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", - "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", - "cargo_metadata 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-workspace-hack 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustfmt_core 1.0.0", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", - "structopt 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "term 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "thiserror 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +version = "2.0.0-rc.1" +dependencies = [ + "ansi_term 0.12.1", + "anyhow", + "cargo_metadata", + "env_logger", + "getopts", + "lazy_static", + "log", + "regex", + "rustc-workspace-hack", + "rustfmt_lib", + "serde", + "serde_json", + "structopt", + "term", + "thiserror", ] [[package]] name = "rustfmt_configuration" version = "1.0.0" dependencies = [ - "ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", - "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-syntax_pos 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustfmt-config_proc_macro 0.4.0", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", - "thiserror 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "ansi_term 0.12.1", + "dirs", + "itertools", + "regex", + "rustc-ap-syntax_pos", + "rustfmt-config_proc_macro", + "serde", + "serde_json", + "thiserror", + "toml", ] [[package]] -name = "rustfmt_core" +name = "rustfmt_emitter" version = "1.0.0" dependencies = [ - "annotate-snippets 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", - "bytecount 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ignore 0.4.10 (git+https://github.com/topecongiro/ripgrep?branch=update-crossbeam)", - "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_target 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-syntax 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-syntax_pos 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustfmt_configuration 1.0.0", - "rustfmt_emitter 1.0.0", - "term 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "thiserror 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode_categories 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "diff", + "rustfmt_configuration", + "serde", + "serde_json", + "term", ] [[package]] -name = "rustfmt_emitter" +name = "rustfmt_ignore" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "857177e8ff2607b7fb1862782d9754e20661e0772f25c54ad1a160ce563d8863" +dependencies = [ + "crossbeam-channel", + "globset", + "lazy_static", + "log", + "memchr", + "regex", + "same-file", + "thread_local", + "walkdir", + "winapi-util", +] + +[[package]] +name = "rustfmt_lib" version = "1.0.0" dependencies = [ - "diff 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "rustfmt_configuration 1.0.0", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", - "term 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "annotate-snippets", + "anyhow", + "bytecount", + "itertools", + "lazy_static", + "log", + "regex", + "rustc-ap-rustc_data_structures", + "rustc-ap-rustc_target", + "rustc-ap-syntax", + "rustc-ap-syntax_pos", + "rustfmt_configuration", + "rustfmt_emitter", + "rustfmt_ignore", + "term", + "thiserror", + "unicode-segmentation", + "unicode-width", + "unicode_categories", +] + +[[package]] +name = "rustversion" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a0538bd897e17257b0128d2fd95c2ed6df939374073a36166051a79e2eb7986" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] [[package]] name = "ryu" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" [[package]] name = "same-file" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421" dependencies = [ - "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-util", ] [[package]] name = "scoped-tls" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" [[package]] name = "scopeguard" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" [[package]] name = "semver" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" dependencies = [ - "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "semver-parser", + "serde", ] [[package]] name = "semver-parser" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.101" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" dependencies = [ - "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.101" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" dependencies = [ - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "serde_json" -version = "1.0.41" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7" dependencies = [ - "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "itoa", + "ryu", + "serde", ] [[package]] name = "smallvec" version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" dependencies = [ - "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "maybe-uninit", ] [[package]] name = "stable_deref_trait" version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" [[package]] name = "strsim" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "structopt" -version = "0.3.3" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884ae79d6aad1e738f4a70dff314203fd498490a63ebc4d03ea83323c40b7b72" dependencies = [ - "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "structopt-derive 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "clap", + "structopt-derive", ] [[package]] name = "structopt-derive" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a97f829a34a0a9d5b353a881025a23b8c9fd09d46be6045df6b22920dbd7a93" dependencies = [ - "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "syn" -version = "1.0.5" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e4ff033220a41d1a57d8125eab57bf5263783dfdcc18688b1dacc6ce9651ef8" dependencies = [ - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "syn-mid" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fd3937748a7eccff61ba5b90af1a20dbf610858923a9192ea0ecb0cb77db1d0" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] [[package]] name = "synstructure" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" dependencies = [ - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", + "quote", + "syn", + "unicode-xid", ] [[package]] name = "term" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0863a3345e70f61d613eab32ee046ccd1bcc5f9105fe402c61fcd0c13eeb8b5" dependencies = [ - "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "dirs", + "winapi 0.3.8", ] [[package]] name = "term_size" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327" dependencies = [ - "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "kernel32-sys", + "libc", + "winapi 0.2.8", ] [[package]] name = "termcolor" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" dependencies = [ - "wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "wincolor", ] [[package]] name = "textwrap" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" dependencies = [ - "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-width", ] [[package]] name = "thiserror" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f357d1814b33bc2dc221243f8424104bfe72dbe911d5b71b3816a2dff1c977e" dependencies = [ - "thiserror-impl 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2e25d25307eb8436894f727aba8f65d07adf02e5b35a13cebed48bd282bfef" dependencies = [ - "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "thread_local" version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" dependencies = [ - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static", ] [[package]] name = "toml" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf" dependencies = [ - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", + "serde", ] [[package]] name = "unicode-segmentation" -version = "1.3.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" [[package]] name = "unicode-width" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" [[package]] name = "unicode-xid" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" [[package]] name = "unicode_categories" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" [[package]] name = "vec_map" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" [[package]] name = "walkdir" version = "2.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e" dependencies = [ - "same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "same-file", + "winapi 0.3.8", + "winapi-util", ] [[package]] name = "wasi" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" [[package]] name = "winapi" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" [[package]] name = "winapi" version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" dependencies = [ - "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", ] [[package]] name = "winapi-build" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" dependencies = [ - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8", ] [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "wincolor" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9" dependencies = [ - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[metadata] -"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" -"checksum annotate-snippets 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c7021ce4924a3f25f802b2cccd1af585e39ea1a363a1aa2e72afe54b67a3a7a7" -"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -"checksum ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -"checksum anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "9267dff192e68f3399525901e709a48c1d3982c9c072fa32f2127a0cb0babf14" -"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" -"checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" -"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" -"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" -"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" -"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" -"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" -"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -"checksum blake2b_simd 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)" = "5850aeee1552f495dd0250014cf64b82b7c8879a89d83b33bbdace2cc4f63182" -"checksum bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245" -"checksum bytecount 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b0017894339f586ccb943b01b9555de56770c11cda818e7e3d8bd93f4ed7f46e" -"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" -"checksum cargo_metadata 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "46e3374c604fb39d1a2f35ed5e4a4e30e60d01fab49446e08f1b3e9a90aef202" -"checksum cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)" = "0213d356d3c4ea2c18c40b037c3be23cd639825c18f25ee670ac7813beeef99c" -"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" -"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120" -"checksum crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c" -"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca" -"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac" -"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" -"checksum crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c" -"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" -"checksum diff 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" -"checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" -"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" -"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" -"checksum ena 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8944dc8fa28ce4a38f778bd46bf7d923fe73eed5a439398507246c8e017e6f36" -"checksum env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" -"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" -"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" -"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" -"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" -"checksum getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)" = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" -"checksum globset 0.4.4 (git+https://github.com/topecongiro/ripgrep?branch=update-crossbeam)" = "" -"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" -"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" -"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -"checksum ignore 0.4.10 (git+https://github.com/topecongiro/ripgrep?branch=update-crossbeam)" = "" -"checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2" -"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" -"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" -"checksum jobserver 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b1d42ef453b30b7387e113da1c83ab1605d90c5b4e0eb8e96d016ed3b8c160" -"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8" -"checksum lock_api 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e57b3997725d2b60dbec1297f6c2e2957cc383db1cebd6be812163f969c7d586" -"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" -"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" -"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" -"checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" -"checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72" -"checksum packed_simd 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a85ea9fc0d4ac0deb6fe7911d38786b32fc11119afd9e9d38b84ff691ce64220" -"checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" -"checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" -"checksum proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aeccfe4d5d8ea175d5f0e4a2ad0637e0f4121d63bd99d356fb1f39ab2e7c6097" -"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" -"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" -"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" -"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" -"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" -"checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d" -"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" -"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" -"checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf" -"checksum rustc-ap-arena 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7475f4c707269b56eb7144c53591e3cd6369a5aa1d66434829ea11df96d5e7e3" -"checksum rustc-ap-graphviz 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6e59a55520f140a70a3e0fad80a36e807caa85e9d7016167b91a5b521ea929be" -"checksum rustc-ap-rustc_data_structures 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6420857d5a088f680ec1ba736ffba4ee9c1964b0d397e6318f38d461f4f7d5cb" -"checksum rustc-ap-rustc_errors 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8abfca0960131262254a91d02ff4903526a261ede730d7a2c75b4234c867cdc0" -"checksum rustc-ap-rustc_index 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a395509dcb90a92c1479c085639594624e06b4ab3fc7c1b795b46a61f2d4f65" -"checksum rustc-ap-rustc_lexer 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "64eac8a0e6efb8f55292aa24be0208c7c0538236c613e79952fd1fa3d54bcf8e" -"checksum rustc-ap-rustc_macros 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f99795e8be4877e9e05d59f201e1740c1cf673364655def5848606d9e25b75af" -"checksum rustc-ap-rustc_target 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f22e21fdd8e1c0030f507158fa79b9f1e080e6241aba994d0f97c14a0a07a826" -"checksum rustc-ap-serialize 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1cd6ef5135408d62559866e79986ca261f4c1333253d500e5e66fe66d1432e" -"checksum rustc-ap-syntax 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "61fc1c901d2cbd24cae95d7bc5a58aa7661ec3dc5320c78c32830a52a685c33c" -"checksum rustc-ap-syntax_pos 610.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "230534f638255853bb9f13987537e00a818435a0cc54b68d97221b6822c8f1bc" -"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" -"checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8" -"checksum rustc-rayon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f32767f90d938f1b7199a174ef249ae1924f6e5bbdb9d112fea141e016f25b3a" -"checksum rustc-rayon-core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea2427831f0053ea3ea73559c8eabd893133a51b251d142bacee53c62a288cb3" -"checksum rustc-workspace-hack 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc71d2faa173b74b232dedc235e3ee1696581bb132fc116fa3626d6151a1a8fb" -"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" -"checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421" -"checksum scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" -"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" -"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -"checksum serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "9796c9b7ba2ffe7a9ce53c2287dfc48080f4b2b362fcc245a259b3a7201119dd" -"checksum serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "4b133a43a1ecd55d4086bd5b4dc6c1751c68b1bfbeba7a5040442022c7e7c02e" -"checksum serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "2f72eb2a68a7dc3f9a691bfda9305a1c017a6215e5a4545c258500d2099a37c2" -"checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" -"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" -"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -"checksum structopt 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d4f66a4c0ddf7aee4677995697366de0749b0139057342eccbb609b12d0affc" -"checksum structopt-derive 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8fe0c13e476b4e21ff7f5c4ace3818b6d7bdc16897c31c73862471bc1663acae" -"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf" -"checksum synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3f085a5855930c0441ca1288cf044ea4aecf4f43a91668abdb870b4ba546a203" -"checksum term 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c0863a3345e70f61d613eab32ee046ccd1bcc5f9105fe402c61fcd0c13eeb8b5" -"checksum term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327" -"checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" -"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -"checksum thiserror 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "cc6b305ec0e323c7b6cfff6098a22516e0063d0bb7c3d88660a890217dca099a" -"checksum thiserror-impl 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45ba8d810d9c48fc456b7ad54574e8bfb7c7918a57ad7a6e6a0985d7959e8597" -"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" -"checksum toml 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c7aabe75941d914b72bf3e5d3932ed92ce0664d49d8432305a8b547c37227724" -"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" -"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20" -"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" -"checksum unicode_categories 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" -"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" -"checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e" -"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" -"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" -"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" -"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" -"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" -"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -"checksum wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9" + "winapi 0.3.8", + "winapi-util", +] diff --git a/Cargo.toml b/Cargo.toml index 4f6914c5c73..28954953d97 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "rustfmt-nightly" -version = "1.4.10" +version = "2.0.0-rc.1" authors = ["Nicholas Cameron ", "The Rustfmt developers"] description = "Tool to find and fix Rust formatting issues" repository = "https://github.com/rust-lang/rustfmt" @@ -31,7 +31,7 @@ path = "src/git-rustfmt/main.rs" default = ["cargo-fmt", "rustfmt-format-diff"] cargo-fmt = [] rustfmt-format-diff = [] -generic-simd = ["rustfmt_core/generic-simd"] +generic-simd = ["rustfmt_lib/generic-simd"] [dependencies] ansi_term = "0.12" @@ -47,7 +47,7 @@ structopt = "0.3" term = "0.6" thiserror = "1.0" -rustfmt_core = { path = "rustfmt-lib/rustfmt-core" } +rustfmt_lib = { path = "rustfmt-core/rustfmt-lib", version = "1.0" } [dev-dependencies] lazy_static = "1.0" diff --git a/rustfmt-lib/.gitignore b/rustfmt-core/.gitignore similarity index 100% rename from rustfmt-lib/.gitignore rename to rustfmt-core/.gitignore diff --git a/rustfmt-lib/Cargo.toml b/rustfmt-core/Cargo.toml similarity index 78% rename from rustfmt-lib/Cargo.toml rename to rustfmt-core/Cargo.toml index 56672f89036..8cea2f5455d 100644 --- a/rustfmt-lib/Cargo.toml +++ b/rustfmt-core/Cargo.toml @@ -1,6 +1,6 @@ [workspace] members = [ "rustfmt-config", - "rustfmt-core", "rustfmt-emitter", + "rustfmt-lib", ] diff --git a/rustfmt-lib/rustfmt-config/.gitignore b/rustfmt-core/rustfmt-config/.gitignore similarity index 100% rename from rustfmt-lib/rustfmt-config/.gitignore rename to rustfmt-core/rustfmt-config/.gitignore diff --git a/rustfmt-lib/rustfmt-config/Cargo.toml b/rustfmt-core/rustfmt-config/Cargo.toml similarity index 100% rename from rustfmt-lib/rustfmt-config/Cargo.toml rename to rustfmt-core/rustfmt-config/Cargo.toml diff --git a/rustfmt-lib/rustfmt-config/config_proc_macro/.gitignore b/rustfmt-core/rustfmt-config/config_proc_macro/.gitignore similarity index 100% rename from rustfmt-lib/rustfmt-config/config_proc_macro/.gitignore rename to rustfmt-core/rustfmt-config/config_proc_macro/.gitignore diff --git a/rustfmt-lib/rustfmt-config/config_proc_macro/Cargo.toml b/rustfmt-core/rustfmt-config/config_proc_macro/Cargo.toml similarity index 100% rename from rustfmt-lib/rustfmt-config/config_proc_macro/Cargo.toml rename to rustfmt-core/rustfmt-config/config_proc_macro/Cargo.toml diff --git a/rustfmt-lib/rustfmt-config/config_proc_macro/src/attrs.rs b/rustfmt-core/rustfmt-config/config_proc_macro/src/attrs.rs similarity index 100% rename from rustfmt-lib/rustfmt-config/config_proc_macro/src/attrs.rs rename to rustfmt-core/rustfmt-config/config_proc_macro/src/attrs.rs diff --git a/rustfmt-lib/rustfmt-config/config_proc_macro/src/config_type.rs b/rustfmt-core/rustfmt-config/config_proc_macro/src/config_type.rs similarity index 100% rename from rustfmt-lib/rustfmt-config/config_proc_macro/src/config_type.rs rename to rustfmt-core/rustfmt-config/config_proc_macro/src/config_type.rs diff --git a/rustfmt-lib/rustfmt-config/config_proc_macro/src/item_enum.rs b/rustfmt-core/rustfmt-config/config_proc_macro/src/item_enum.rs similarity index 100% rename from rustfmt-lib/rustfmt-config/config_proc_macro/src/item_enum.rs rename to rustfmt-core/rustfmt-config/config_proc_macro/src/item_enum.rs diff --git a/rustfmt-lib/rustfmt-config/config_proc_macro/src/item_struct.rs b/rustfmt-core/rustfmt-config/config_proc_macro/src/item_struct.rs similarity index 100% rename from rustfmt-lib/rustfmt-config/config_proc_macro/src/item_struct.rs rename to rustfmt-core/rustfmt-config/config_proc_macro/src/item_struct.rs diff --git a/rustfmt-lib/rustfmt-config/config_proc_macro/src/lib.rs b/rustfmt-core/rustfmt-config/config_proc_macro/src/lib.rs similarity index 100% rename from rustfmt-lib/rustfmt-config/config_proc_macro/src/lib.rs rename to rustfmt-core/rustfmt-config/config_proc_macro/src/lib.rs diff --git a/rustfmt-lib/rustfmt-config/config_proc_macro/src/utils.rs b/rustfmt-core/rustfmt-config/config_proc_macro/src/utils.rs similarity index 100% rename from rustfmt-lib/rustfmt-config/config_proc_macro/src/utils.rs rename to rustfmt-core/rustfmt-config/config_proc_macro/src/utils.rs diff --git a/rustfmt-lib/rustfmt-config/config_proc_macro/tests/smoke.rs b/rustfmt-core/rustfmt-config/config_proc_macro/tests/smoke.rs similarity index 100% rename from rustfmt-lib/rustfmt-config/config_proc_macro/tests/smoke.rs rename to rustfmt-core/rustfmt-config/config_proc_macro/tests/smoke.rs diff --git a/rustfmt-lib/rustfmt-config/src/config_type.rs b/rustfmt-core/rustfmt-config/src/config_type.rs similarity index 100% rename from rustfmt-lib/rustfmt-config/src/config_type.rs rename to rustfmt-core/rustfmt-config/src/config_type.rs diff --git a/rustfmt-lib/rustfmt-config/src/file_lines.rs b/rustfmt-core/rustfmt-config/src/file_lines.rs similarity index 100% rename from rustfmt-lib/rustfmt-config/src/file_lines.rs rename to rustfmt-core/rustfmt-config/src/file_lines.rs diff --git a/rustfmt-lib/rustfmt-config/src/lib.rs b/rustfmt-core/rustfmt-config/src/lib.rs similarity index 100% rename from rustfmt-lib/rustfmt-config/src/lib.rs rename to rustfmt-core/rustfmt-config/src/lib.rs diff --git a/rustfmt-lib/rustfmt-config/src/license.rs b/rustfmt-core/rustfmt-config/src/license.rs similarity index 100% rename from rustfmt-lib/rustfmt-config/src/license.rs rename to rustfmt-core/rustfmt-config/src/license.rs diff --git a/rustfmt-lib/rustfmt-config/src/lists.rs b/rustfmt-core/rustfmt-config/src/lists.rs similarity index 100% rename from rustfmt-lib/rustfmt-config/src/lists.rs rename to rustfmt-core/rustfmt-config/src/lists.rs diff --git a/rustfmt-lib/rustfmt-config/src/options.rs b/rustfmt-core/rustfmt-config/src/options.rs similarity index 100% rename from rustfmt-lib/rustfmt-config/src/options.rs rename to rustfmt-core/rustfmt-config/src/options.rs diff --git a/rustfmt-lib/rustfmt-config/tests/license-template/lt.txt b/rustfmt-core/rustfmt-config/tests/license-template/lt.txt similarity index 100% rename from rustfmt-lib/rustfmt-config/tests/license-template/lt.txt rename to rustfmt-core/rustfmt-config/tests/license-template/lt.txt diff --git a/rustfmt-lib/rustfmt-emitter/.gitignore b/rustfmt-core/rustfmt-emitter/.gitignore similarity index 100% rename from rustfmt-lib/rustfmt-emitter/.gitignore rename to rustfmt-core/rustfmt-emitter/.gitignore diff --git a/rustfmt-lib/rustfmt-emitter/Cargo.toml b/rustfmt-core/rustfmt-emitter/Cargo.toml similarity index 100% rename from rustfmt-lib/rustfmt-emitter/Cargo.toml rename to rustfmt-core/rustfmt-emitter/Cargo.toml diff --git a/rustfmt-lib/rustfmt-emitter/src/checkstyle.rs b/rustfmt-core/rustfmt-emitter/src/checkstyle.rs similarity index 100% rename from rustfmt-lib/rustfmt-emitter/src/checkstyle.rs rename to rustfmt-core/rustfmt-emitter/src/checkstyle.rs diff --git a/rustfmt-lib/rustfmt-emitter/src/checkstyle/xml.rs b/rustfmt-core/rustfmt-emitter/src/checkstyle/xml.rs similarity index 100% rename from rustfmt-lib/rustfmt-emitter/src/checkstyle/xml.rs rename to rustfmt-core/rustfmt-emitter/src/checkstyle/xml.rs diff --git a/rustfmt-lib/rustfmt-emitter/src/diff.rs b/rustfmt-core/rustfmt-emitter/src/diff.rs similarity index 100% rename from rustfmt-lib/rustfmt-emitter/src/diff.rs rename to rustfmt-core/rustfmt-emitter/src/diff.rs diff --git a/rustfmt-lib/rustfmt-emitter/src/files.rs b/rustfmt-core/rustfmt-emitter/src/files.rs similarity index 100% rename from rustfmt-lib/rustfmt-emitter/src/files.rs rename to rustfmt-core/rustfmt-emitter/src/files.rs diff --git a/rustfmt-lib/rustfmt-emitter/src/json.rs b/rustfmt-core/rustfmt-emitter/src/json.rs similarity index 100% rename from rustfmt-lib/rustfmt-emitter/src/json.rs rename to rustfmt-core/rustfmt-emitter/src/json.rs diff --git a/rustfmt-lib/rustfmt-emitter/src/lib.rs b/rustfmt-core/rustfmt-emitter/src/lib.rs similarity index 100% rename from rustfmt-lib/rustfmt-emitter/src/lib.rs rename to rustfmt-core/rustfmt-emitter/src/lib.rs diff --git a/rustfmt-lib/rustfmt-emitter/src/modified_lines.rs b/rustfmt-core/rustfmt-emitter/src/modified_lines.rs similarity index 100% rename from rustfmt-lib/rustfmt-emitter/src/modified_lines.rs rename to rustfmt-core/rustfmt-emitter/src/modified_lines.rs diff --git a/rustfmt-lib/rustfmt-emitter/src/rustfmt_diff.rs b/rustfmt-core/rustfmt-emitter/src/rustfmt_diff.rs similarity index 100% rename from rustfmt-lib/rustfmt-emitter/src/rustfmt_diff.rs rename to rustfmt-core/rustfmt-emitter/src/rustfmt_diff.rs diff --git a/rustfmt-lib/rustfmt-emitter/src/stdout.rs b/rustfmt-core/rustfmt-emitter/src/stdout.rs similarity index 100% rename from rustfmt-lib/rustfmt-emitter/src/stdout.rs rename to rustfmt-core/rustfmt-emitter/src/stdout.rs diff --git a/rustfmt-lib/rustfmt-core/.gitignore b/rustfmt-core/rustfmt-lib/.gitignore similarity index 100% rename from rustfmt-lib/rustfmt-core/.gitignore rename to rustfmt-core/rustfmt-lib/.gitignore diff --git a/rustfmt-lib/rustfmt-core/Cargo.toml b/rustfmt-core/rustfmt-lib/Cargo.toml similarity index 95% rename from rustfmt-lib/rustfmt-core/Cargo.toml rename to rustfmt-core/rustfmt-lib/Cargo.toml index 94e0a48a0a7..76b4135d53f 100644 --- a/rustfmt-lib/rustfmt-core/Cargo.toml +++ b/rustfmt-core/rustfmt-lib/Cargo.toml @@ -1,9 +1,9 @@ [package] -name = "rustfmt_core" +name = "rustfmt_lib" version = "1.0.0" authors = ["topecongiro "] edition = "2018" -description = "Rustfmt core library" +description = "Rustfmt as a library" license = "Apache-2.0/MIT" repository = "https://github.com/rust-lang/rustfmt" diff --git a/rustfmt-lib/rustfmt-core/src/attr.rs b/rustfmt-core/rustfmt-lib/src/attr.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/attr.rs rename to rustfmt-core/rustfmt-lib/src/attr.rs diff --git a/rustfmt-lib/rustfmt-core/src/attr/doc_comment.rs b/rustfmt-core/rustfmt-lib/src/attr/doc_comment.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/attr/doc_comment.rs rename to rustfmt-core/rustfmt-lib/src/attr/doc_comment.rs diff --git a/rustfmt-lib/rustfmt-core/src/chains.rs b/rustfmt-core/rustfmt-lib/src/chains.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/chains.rs rename to rustfmt-core/rustfmt-lib/src/chains.rs diff --git a/rustfmt-lib/rustfmt-core/src/closures.rs b/rustfmt-core/rustfmt-lib/src/closures.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/closures.rs rename to rustfmt-core/rustfmt-lib/src/closures.rs diff --git a/rustfmt-lib/rustfmt-core/src/comment.rs b/rustfmt-core/rustfmt-lib/src/comment.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/comment.rs rename to rustfmt-core/rustfmt-lib/src/comment.rs diff --git a/rustfmt-lib/rustfmt-core/src/coverage.rs b/rustfmt-core/rustfmt-lib/src/coverage.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/coverage.rs rename to rustfmt-core/rustfmt-lib/src/coverage.rs diff --git a/rustfmt-lib/rustfmt-core/src/expr.rs b/rustfmt-core/rustfmt-lib/src/expr.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/expr.rs rename to rustfmt-core/rustfmt-lib/src/expr.rs diff --git a/rustfmt-lib/rustfmt-core/src/format_report_formatter.rs b/rustfmt-core/rustfmt-lib/src/format_report_formatter.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/format_report_formatter.rs rename to rustfmt-core/rustfmt-lib/src/format_report_formatter.rs diff --git a/rustfmt-lib/rustfmt-core/src/formatting.rs b/rustfmt-core/rustfmt-lib/src/formatting.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/formatting.rs rename to rustfmt-core/rustfmt-lib/src/formatting.rs diff --git a/rustfmt-lib/rustfmt-core/src/formatting/newline_style.rs b/rustfmt-core/rustfmt-lib/src/formatting/newline_style.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/formatting/newline_style.rs rename to rustfmt-core/rustfmt-lib/src/formatting/newline_style.rs diff --git a/rustfmt-lib/rustfmt-core/src/ignore_path.rs b/rustfmt-core/rustfmt-lib/src/ignore_path.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/ignore_path.rs rename to rustfmt-core/rustfmt-lib/src/ignore_path.rs diff --git a/rustfmt-lib/rustfmt-core/src/imports.rs b/rustfmt-core/rustfmt-lib/src/imports.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/imports.rs rename to rustfmt-core/rustfmt-lib/src/imports.rs diff --git a/rustfmt-lib/rustfmt-core/src/issues.rs b/rustfmt-core/rustfmt-lib/src/issues.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/issues.rs rename to rustfmt-core/rustfmt-lib/src/issues.rs diff --git a/rustfmt-lib/rustfmt-core/src/items.rs b/rustfmt-core/rustfmt-lib/src/items.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/items.rs rename to rustfmt-core/rustfmt-lib/src/items.rs diff --git a/rustfmt-lib/rustfmt-core/src/lib.rs b/rustfmt-core/rustfmt-lib/src/lib.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/lib.rs rename to rustfmt-core/rustfmt-lib/src/lib.rs diff --git a/rustfmt-lib/rustfmt-core/src/lists.rs b/rustfmt-core/rustfmt-lib/src/lists.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/lists.rs rename to rustfmt-core/rustfmt-lib/src/lists.rs diff --git a/rustfmt-lib/rustfmt-core/src/macros.rs b/rustfmt-core/rustfmt-lib/src/macros.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/macros.rs rename to rustfmt-core/rustfmt-lib/src/macros.rs diff --git a/rustfmt-lib/rustfmt-core/src/matches.rs b/rustfmt-core/rustfmt-lib/src/matches.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/matches.rs rename to rustfmt-core/rustfmt-lib/src/matches.rs diff --git a/rustfmt-lib/rustfmt-core/src/missed_spans.rs b/rustfmt-core/rustfmt-lib/src/missed_spans.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/missed_spans.rs rename to rustfmt-core/rustfmt-lib/src/missed_spans.rs diff --git a/rustfmt-lib/rustfmt-core/src/modules.rs b/rustfmt-core/rustfmt-lib/src/modules.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/modules.rs rename to rustfmt-core/rustfmt-lib/src/modules.rs diff --git a/rustfmt-lib/rustfmt-core/src/modules/visitor.rs b/rustfmt-core/rustfmt-lib/src/modules/visitor.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/modules/visitor.rs rename to rustfmt-core/rustfmt-lib/src/modules/visitor.rs diff --git a/rustfmt-lib/rustfmt-core/src/overflow.rs b/rustfmt-core/rustfmt-lib/src/overflow.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/overflow.rs rename to rustfmt-core/rustfmt-lib/src/overflow.rs diff --git a/rustfmt-lib/rustfmt-core/src/pairs.rs b/rustfmt-core/rustfmt-lib/src/pairs.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/pairs.rs rename to rustfmt-core/rustfmt-lib/src/pairs.rs diff --git a/rustfmt-lib/rustfmt-core/src/patterns.rs b/rustfmt-core/rustfmt-lib/src/patterns.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/patterns.rs rename to rustfmt-core/rustfmt-lib/src/patterns.rs diff --git a/rustfmt-lib/rustfmt-core/src/release_channel.rs b/rustfmt-core/rustfmt-lib/src/release_channel.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/release_channel.rs rename to rustfmt-core/rustfmt-lib/src/release_channel.rs diff --git a/rustfmt-lib/rustfmt-core/src/reorder.rs b/rustfmt-core/rustfmt-lib/src/reorder.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/reorder.rs rename to rustfmt-core/rustfmt-lib/src/reorder.rs diff --git a/rustfmt-lib/rustfmt-core/src/rewrite.rs b/rustfmt-core/rustfmt-lib/src/rewrite.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/rewrite.rs rename to rustfmt-core/rustfmt-lib/src/rewrite.rs diff --git a/rustfmt-lib/rustfmt-core/src/shape.rs b/rustfmt-core/rustfmt-lib/src/shape.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/shape.rs rename to rustfmt-core/rustfmt-lib/src/shape.rs diff --git a/rustfmt-lib/rustfmt-core/src/skip.rs b/rustfmt-core/rustfmt-lib/src/skip.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/skip.rs rename to rustfmt-core/rustfmt-lib/src/skip.rs diff --git a/rustfmt-lib/rustfmt-core/src/source_file.rs b/rustfmt-core/rustfmt-lib/src/source_file.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/source_file.rs rename to rustfmt-core/rustfmt-lib/src/source_file.rs diff --git a/rustfmt-lib/rustfmt-core/src/source_map.rs b/rustfmt-core/rustfmt-lib/src/source_map.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/source_map.rs rename to rustfmt-core/rustfmt-lib/src/source_map.rs diff --git a/rustfmt-lib/rustfmt-core/src/spanned.rs b/rustfmt-core/rustfmt-lib/src/spanned.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/spanned.rs rename to rustfmt-core/rustfmt-lib/src/spanned.rs diff --git a/rustfmt-lib/rustfmt-core/src/stmt.rs b/rustfmt-core/rustfmt-lib/src/stmt.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/stmt.rs rename to rustfmt-core/rustfmt-lib/src/stmt.rs diff --git a/rustfmt-lib/rustfmt-core/src/string.rs b/rustfmt-core/rustfmt-lib/src/string.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/string.rs rename to rustfmt-core/rustfmt-lib/src/string.rs diff --git a/rustfmt-lib/rustfmt-core/src/syntux.rs b/rustfmt-core/rustfmt-lib/src/syntux.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/syntux.rs rename to rustfmt-core/rustfmt-lib/src/syntux.rs diff --git a/rustfmt-lib/rustfmt-core/src/syntux/parser.rs b/rustfmt-core/rustfmt-lib/src/syntux/parser.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/syntux/parser.rs rename to rustfmt-core/rustfmt-lib/src/syntux/parser.rs diff --git a/rustfmt-lib/rustfmt-core/src/syntux/session.rs b/rustfmt-core/rustfmt-lib/src/syntux/session.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/syntux/session.rs rename to rustfmt-core/rustfmt-lib/src/syntux/session.rs diff --git a/rustfmt-lib/rustfmt-core/src/test/configuration_snippet.rs b/rustfmt-core/rustfmt-lib/src/test/configuration_snippet.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/test/configuration_snippet.rs rename to rustfmt-core/rustfmt-lib/src/test/configuration_snippet.rs diff --git a/rustfmt-lib/rustfmt-core/src/test/mod.rs b/rustfmt-core/rustfmt-lib/src/test/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/test/mod.rs rename to rustfmt-core/rustfmt-lib/src/test/mod.rs diff --git a/rustfmt-lib/rustfmt-core/src/types.rs b/rustfmt-core/rustfmt-lib/src/types.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/types.rs rename to rustfmt-core/rustfmt-lib/src/types.rs diff --git a/rustfmt-lib/rustfmt-core/src/utils.rs b/rustfmt-core/rustfmt-lib/src/utils.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/utils.rs rename to rustfmt-core/rustfmt-lib/src/utils.rs diff --git a/rustfmt-lib/rustfmt-core/src/vertical.rs b/rustfmt-core/rustfmt-lib/src/vertical.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/vertical.rs rename to rustfmt-core/rustfmt-lib/src/vertical.rs diff --git a/rustfmt-lib/rustfmt-core/src/visitor.rs b/rustfmt-core/rustfmt-lib/src/visitor.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/src/visitor.rs rename to rustfmt-core/rustfmt-lib/src/visitor.rs diff --git a/rustfmt-lib/rustfmt-core/tests/config/issue-1111.toml b/rustfmt-core/rustfmt-lib/tests/config/issue-1111.toml similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/config/issue-1111.toml rename to rustfmt-core/rustfmt-lib/tests/config/issue-1111.toml diff --git a/rustfmt-lib/rustfmt-core/tests/config/issue-2641.toml b/rustfmt-core/rustfmt-lib/tests/config/issue-2641.toml similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/config/issue-2641.toml rename to rustfmt-core/rustfmt-lib/tests/config/issue-2641.toml diff --git a/rustfmt-lib/rustfmt-core/tests/config/issue-3779.toml b/rustfmt-core/rustfmt-lib/tests/config/issue-3779.toml similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/config/issue-3779.toml rename to rustfmt-core/rustfmt-lib/tests/config/issue-3779.toml diff --git a/rustfmt-lib/rustfmt-core/tests/config/issue-3802.toml b/rustfmt-core/rustfmt-lib/tests/config/issue-3802.toml similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/config/issue-3802.toml rename to rustfmt-core/rustfmt-lib/tests/config/issue-3802.toml diff --git a/rustfmt-lib/rustfmt-core/tests/config/issue-3933.toml b/rustfmt-core/rustfmt-lib/tests/config/issue-3933.toml similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/config/issue-3933.toml rename to rustfmt-core/rustfmt-lib/tests/config/issue-3933.toml diff --git a/rustfmt-lib/rustfmt-core/tests/config/issue-3956.toml b/rustfmt-core/rustfmt-lib/tests/config/issue-3956.toml similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/config/issue-3956.toml rename to rustfmt-core/rustfmt-lib/tests/config/issue-3956.toml diff --git a/rustfmt-lib/rustfmt-core/tests/config/skip_children.toml b/rustfmt-core/rustfmt-lib/tests/config/skip_children.toml similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/config/skip_children.toml rename to rustfmt-core/rustfmt-lib/tests/config/skip_children.toml diff --git a/rustfmt-lib/rustfmt-core/tests/config/small_tabs.toml b/rustfmt-core/rustfmt-lib/tests/config/small_tabs.toml similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/config/small_tabs.toml rename to rustfmt-core/rustfmt-lib/tests/config/small_tabs.toml diff --git a/rustfmt-lib/rustfmt-core/tests/coverage/source/comments.rs b/rustfmt-core/rustfmt-lib/tests/coverage/source/comments.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/coverage/source/comments.rs rename to rustfmt-core/rustfmt-lib/tests/coverage/source/comments.rs diff --git a/rustfmt-lib/rustfmt-core/tests/coverage/target/comments.rs b/rustfmt-core/rustfmt-lib/tests/coverage/target/comments.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/coverage/target/comments.rs rename to rustfmt-core/rustfmt-lib/tests/coverage/target/comments.rs diff --git a/rustfmt-lib/rustfmt-core/tests/license-template/lt.txt b/rustfmt-core/rustfmt-lib/tests/license-template/lt.txt similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/license-template/lt.txt rename to rustfmt-core/rustfmt-lib/tests/license-template/lt.txt diff --git a/rustfmt-lib/rustfmt-core/tests/source/alignment_2633/block_style.rs b/rustfmt-core/rustfmt-lib/tests/source/alignment_2633/block_style.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/alignment_2633/block_style.rs rename to rustfmt-core/rustfmt-lib/tests/source/alignment_2633/block_style.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/alignment_2633/visual_style.rs b/rustfmt-core/rustfmt-lib/tests/source/alignment_2633/visual_style.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/alignment_2633/visual_style.rs rename to rustfmt-core/rustfmt-lib/tests/source/alignment_2633/visual_style.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/array_comment.rs b/rustfmt-core/rustfmt-lib/tests/source/array_comment.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/array_comment.rs rename to rustfmt-core/rustfmt-lib/tests/source/array_comment.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/assignment.rs b/rustfmt-core/rustfmt-lib/tests/source/assignment.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/assignment.rs rename to rustfmt-core/rustfmt-lib/tests/source/assignment.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/associated-types-bounds-wrapping.rs b/rustfmt-core/rustfmt-lib/tests/source/associated-types-bounds-wrapping.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/associated-types-bounds-wrapping.rs rename to rustfmt-core/rustfmt-lib/tests/source/associated-types-bounds-wrapping.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/associated_type_bounds.rs b/rustfmt-core/rustfmt-lib/tests/source/associated_type_bounds.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/associated_type_bounds.rs rename to rustfmt-core/rustfmt-lib/tests/source/associated_type_bounds.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/async_block.rs b/rustfmt-core/rustfmt-lib/tests/source/async_block.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/async_block.rs rename to rustfmt-core/rustfmt-lib/tests/source/async_block.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/async_fn.rs b/rustfmt-core/rustfmt-lib/tests/source/async_fn.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/async_fn.rs rename to rustfmt-core/rustfmt-lib/tests/source/async_fn.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/attrib.rs b/rustfmt-core/rustfmt-lib/tests/source/attrib.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/attrib.rs rename to rustfmt-core/rustfmt-lib/tests/source/attrib.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/big-impl-block.rs b/rustfmt-core/rustfmt-lib/tests/source/big-impl-block.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/big-impl-block.rs rename to rustfmt-core/rustfmt-lib/tests/source/big-impl-block.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/big-impl-visual.rs b/rustfmt-core/rustfmt-lib/tests/source/big-impl-visual.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/big-impl-visual.rs rename to rustfmt-core/rustfmt-lib/tests/source/big-impl-visual.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/binary-expr.rs b/rustfmt-core/rustfmt-lib/tests/source/binary-expr.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/binary-expr.rs rename to rustfmt-core/rustfmt-lib/tests/source/binary-expr.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/break-and-continue.rs b/rustfmt-core/rustfmt-lib/tests/source/break-and-continue.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/break-and-continue.rs rename to rustfmt-core/rustfmt-lib/tests/source/break-and-continue.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/catch.rs b/rustfmt-core/rustfmt-lib/tests/source/catch.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/catch.rs rename to rustfmt-core/rustfmt-lib/tests/source/catch.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/aarch64.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/arch/aarch64.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/aarch64.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/arch/aarch64.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/arm.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/arch/arm.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/arm.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/arch/arm.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/mips.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/arch/mips.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/mips.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/arch/mips.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/mips64.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/arch/mips64.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/mips64.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/arch/mips64.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/powerpc.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/arch/powerpc.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/powerpc.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/arch/powerpc.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/powerpc64.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/arch/powerpc64.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/powerpc64.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/arch/powerpc64.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/x86.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/arch/x86.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/arch/x86.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/arch/x86.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/bit.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/bit.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/bit.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/bit.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/cache.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/cache.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/cache.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/cache.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/error_macros.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/error_macros.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/error_macros.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/error_macros.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/mod.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/mod.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/aarch64.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/aarch64.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/aarch64.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/aarch64.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/aarch64.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/freebsd/aarch64.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/aarch64.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/freebsd/aarch64.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/arm.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/freebsd/arm.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/arm.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/freebsd/arm.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/auxvec.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/freebsd/auxvec.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/auxvec.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/freebsd/auxvec.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/mod.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/freebsd/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/mod.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/freebsd/mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/powerpc.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/freebsd/powerpc.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/freebsd/powerpc.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/freebsd/powerpc.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/aarch64.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/linux/aarch64.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/aarch64.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/linux/aarch64.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/arm.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/linux/arm.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/arm.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/linux/arm.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/auxvec.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/linux/auxvec.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/auxvec.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/linux/auxvec.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/cpuinfo.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/linux/cpuinfo.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/cpuinfo.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/linux/cpuinfo.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/mips.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/linux/mips.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/mips.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/linux/mips.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/mod.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/linux/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/mod.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/linux/mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/powerpc.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/linux/powerpc.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/linux/powerpc.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/linux/powerpc.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/other.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/other.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/other.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/other.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/x86.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/x86.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/detect/os/x86.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/detect/os/x86.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/lib.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/lib.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/lib.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/lib.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_if/mod.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_if/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_if/mod.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_if/mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_mod/bar.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_mod/bar.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_mod/bar.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_mod/bar.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_mod/dir/dir1/dir2/wasm32.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_mod/dir/dir1/dir2/wasm32.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_mod/dir/dir1/dir2/wasm32.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_mod/dir/dir1/dir2/wasm32.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_mod/dir/dir1/dir3/wasm32.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_mod/dir/dir1/dir3/wasm32.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_mod/dir/dir1/dir3/wasm32.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_mod/dir/dir1/dir3/wasm32.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_mod/foo.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_mod/foo.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_mod/foo.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_mod/foo.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_mod/mod.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_mod/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_mod/mod.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_mod/mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_mod/other.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_mod/other.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_mod/other.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_mod/other.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/cfg_mod/wasm32.rs b/rustfmt-core/rustfmt-lib/tests/source/cfg_mod/wasm32.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/cfg_mod/wasm32.rs rename to rustfmt-core/rustfmt-lib/tests/source/cfg_mod/wasm32.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/chains-visual.rs b/rustfmt-core/rustfmt-lib/tests/source/chains-visual.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/chains-visual.rs rename to rustfmt-core/rustfmt-lib/tests/source/chains-visual.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/chains.rs b/rustfmt-core/rustfmt-lib/tests/source/chains.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/chains.rs rename to rustfmt-core/rustfmt-lib/tests/source/chains.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/chains_with_comment.rs b/rustfmt-core/rustfmt-lib/tests/source/chains_with_comment.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/chains_with_comment.rs rename to rustfmt-core/rustfmt-lib/tests/source/chains_with_comment.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/closure-block-inside-macro.rs b/rustfmt-core/rustfmt-lib/tests/source/closure-block-inside-macro.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/closure-block-inside-macro.rs rename to rustfmt-core/rustfmt-lib/tests/source/closure-block-inside-macro.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/closure_block_style.rs b/rustfmt-core/rustfmt-lib/tests/source/closure_block_style.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/closure_block_style.rs rename to rustfmt-core/rustfmt-lib/tests/source/closure_block_style.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/closure_block_style_no_comma.rs b/rustfmt-core/rustfmt-lib/tests/source/closure_block_style_no_comma.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/closure_block_style_no_comma.rs rename to rustfmt-core/rustfmt-lib/tests/source/closure_block_style_no_comma.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/closure_visual_style.rs b/rustfmt-core/rustfmt-lib/tests/source/closure_visual_style.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/closure_visual_style.rs rename to rustfmt-core/rustfmt-lib/tests/source/closure_visual_style.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/comment.rs b/rustfmt-core/rustfmt-lib/tests/source/comment.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/comment.rs rename to rustfmt-core/rustfmt-lib/tests/source/comment.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/comment2.rs b/rustfmt-core/rustfmt-lib/tests/source/comment2.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/comment2.rs rename to rustfmt-core/rustfmt-lib/tests/source/comment2.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/comment3.rs b/rustfmt-core/rustfmt-lib/tests/source/comment3.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/comment3.rs rename to rustfmt-core/rustfmt-lib/tests/source/comment3.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/comment4.rs b/rustfmt-core/rustfmt-lib/tests/source/comment4.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/comment4.rs rename to rustfmt-core/rustfmt-lib/tests/source/comment4.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/comment5.rs b/rustfmt-core/rustfmt-lib/tests/source/comment5.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/comment5.rs rename to rustfmt-core/rustfmt-lib/tests/source/comment5.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/comment6.rs b/rustfmt-core/rustfmt-lib/tests/source/comment6.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/comment6.rs rename to rustfmt-core/rustfmt-lib/tests/source/comment6.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/comment_crlf_newline.rs b/rustfmt-core/rustfmt-lib/tests/source/comment_crlf_newline.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/comment_crlf_newline.rs rename to rustfmt-core/rustfmt-lib/tests/source/comment_crlf_newline.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/blank_lines_lower_bound/1.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/blank_lines_lower_bound/1.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/blank_lines_lower_bound/1.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/blank_lines_lower_bound/1.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/brace_style/fn_always_next_line.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/brace_style/fn_always_next_line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/brace_style/fn_always_next_line.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/brace_style/fn_always_next_line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/brace_style/fn_prefer_same_line.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/brace_style/fn_prefer_same_line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/brace_style/fn_prefer_same_line.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/brace_style/fn_prefer_same_line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/brace_style/fn_same_line_where.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/brace_style/fn_same_line_where.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/brace_style/fn_same_line_where.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/brace_style/fn_same_line_where.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/brace_style/item_always_next_line.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/brace_style/item_always_next_line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/brace_style/item_always_next_line.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/brace_style/item_always_next_line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/brace_style/item_prefer_same_line.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/brace_style/item_prefer_same_line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/brace_style/item_prefer_same_line.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/brace_style/item_prefer_same_line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/brace_style/item_same_line_where.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/brace_style/item_same_line_where.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/brace_style/item_same_line_where.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/brace_style/item_same_line_where.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/comment_width/above.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/comment_width/above.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/comment_width/above.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/comment_width/above.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/comment_width/below.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/comment_width/below.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/comment_width/below.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/comment_width/below.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/comment_width/ignore.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/comment_width/ignore.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/comment_width/ignore.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/comment_width/ignore.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/condense_wildcard_suffixes/false.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/condense_wildcard_suffixes/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/condense_wildcard_suffixes/false.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/condense_wildcard_suffixes/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/condense_wildcard_suffixes/true.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/condense_wildcard_suffixes/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/condense_wildcard_suffixes/true.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/condense_wildcard_suffixes/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/control_brace_style/always_next_line.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/control_brace_style/always_next_line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/control_brace_style/always_next_line.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/control_brace_style/always_next_line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/control_brace_style/always_same_line.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/control_brace_style/always_same_line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/control_brace_style/always_same_line.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/control_brace_style/always_same_line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/control_brace_style/closing_next_line.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/control_brace_style/closing_next_line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/control_brace_style/closing_next_line.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/control_brace_style/closing_next_line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/disable_all_formatting/false.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/disable_all_formatting/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/disable_all_formatting/false.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/disable_all_formatting/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/disable_all_formatting/true.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/disable_all_formatting/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/disable_all_formatting/true.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/disable_all_formatting/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/empty_item_single_line/false.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/empty_item_single_line/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/empty_item_single_line/false.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/empty_item_single_line/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/empty_item_single_line/true.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/empty_item_single_line/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/empty_item_single_line/true.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/empty_item_single_line/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/enum_discrim_align_threshold/40.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/enum_discrim_align_threshold/40.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/enum_discrim_align_threshold/40.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/enum_discrim_align_threshold/40.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/error_on_line_overflow/false.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/error_on_line_overflow/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/error_on_line_overflow/false.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/error_on_line_overflow/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/fn_args_layout/compressed.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/fn_args_layout/compressed.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/fn_args_layout/compressed.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/fn_args_layout/compressed.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/fn_args_layout/tall.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/fn_args_layout/tall.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/fn_args_layout/tall.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/fn_args_layout/tall.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/fn_args_layout/vertical.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/fn_args_layout/vertical.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/fn_args_layout/vertical.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/fn_args_layout/vertical.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/fn_single_line/false.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/fn_single_line/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/fn_single_line/false.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/fn_single_line/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/fn_single_line/true.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/fn_single_line/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/fn_single_line/true.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/fn_single_line/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/force_explicit_abi/false.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/force_explicit_abi/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/force_explicit_abi/false.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/force_explicit_abi/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/force_explicit_abi/true.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/force_explicit_abi/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/force_explicit_abi/true.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/force_explicit_abi/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/force_multiline_block/false.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/force_multiline_block/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/force_multiline_block/false.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/force_multiline_block/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/force_multiline_block/true.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/force_multiline_block/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/force_multiline_block/true.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/force_multiline_block/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/format_macro_bodies/false.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/format_macro_bodies/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/format_macro_bodies/false.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/format_macro_bodies/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/format_macro_bodies/true.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/format_macro_bodies/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/format_macro_bodies/true.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/format_macro_bodies/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/format_macro_matchers/false.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/format_macro_matchers/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/format_macro_matchers/false.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/format_macro_matchers/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/format_macro_matchers/true.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/format_macro_matchers/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/format_macro_matchers/true.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/format_macro_matchers/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/format_strings/false.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/format_strings/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/format_strings/false.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/format_strings/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/format_strings/true.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/format_strings/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/format_strings/true.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/format_strings/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/hard_tabs/false.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/hard_tabs/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/hard_tabs/false.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/hard_tabs/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/hard_tabs/true.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/hard_tabs/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/hard_tabs/true.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/hard_tabs/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/imports_layout/merge_mixed.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/imports_layout/merge_mixed.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/imports_layout/merge_mixed.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/imports_layout/merge_mixed.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_args.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/block_args.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_args.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/block_args.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_array.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/block_array.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_array.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/block_array.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_call.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/block_call.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_call.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/block_call.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_chain.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/block_chain.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_chain.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/block_chain.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_generic.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/block_generic.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_generic.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/block_generic.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_struct_lit.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/block_struct_lit.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_struct_lit.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/block_struct_lit.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_trailing_comma_call/two.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/block_trailing_comma_call/two.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_trailing_comma_call/two.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/block_trailing_comma_call/two.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_where_pred.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/block_where_pred.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/block_where_pred.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/block_where_pred.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/default.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/default.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/default.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/default.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/rfc_where.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/rfc_where.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/rfc_where.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/rfc_where.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_args.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/visual_args.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_args.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/visual_args.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_array.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/visual_array.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_array.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/visual_array.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_call.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/visual_call.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_call.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/visual_call.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_chain.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/visual_chain.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_chain.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/visual_chain.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_generics.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/visual_generics.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_generics.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/visual_generics.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_struct_lit.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/visual_struct_lit.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_struct_lit.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/visual_struct_lit.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_trailing_comma.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/visual_trailing_comma.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_trailing_comma.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/visual_trailing_comma.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_where_pred.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/visual_where_pred.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/indent_style/visual_where_pred.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/indent_style/visual_where_pred.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/match_arm_blocks/false.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/match_arm_blocks/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/match_arm_blocks/false.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/match_arm_blocks/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/match_arm_blocks/true.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/match_arm_blocks/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/match_arm_blocks/true.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/match_arm_blocks/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/match_block_trailing_comma/false.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/match_block_trailing_comma/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/match_block_trailing_comma/false.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/match_block_trailing_comma/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/match_block_trailing_comma/true.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/match_block_trailing_comma/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/match_block_trailing_comma/true.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/match_block_trailing_comma/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/merge_derives/true.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/merge_derives/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/merge_derives/true.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/merge_derives/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/normalize_comments/false.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/normalize_comments/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/normalize_comments/false.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/normalize_comments/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/normalize_comments/true.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/normalize_comments/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/normalize_comments/true.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/normalize_comments/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/normalize_doc_attributes/false.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/normalize_doc_attributes/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/normalize_doc_attributes/false.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/normalize_doc_attributes/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/normalize_doc_attributes/true.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/normalize_doc_attributes/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/normalize_doc_attributes/true.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/normalize_doc_attributes/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/recursive/disabled/foo.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/recursive/disabled/foo.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/recursive/disabled/foo.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/recursive/disabled/foo.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/recursive/disabled/lib.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/recursive/disabled/lib.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/recursive/disabled/lib.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/recursive/disabled/lib.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/recursive/enabled/foo.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/recursive/enabled/foo.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/recursive/enabled/foo.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/recursive/enabled/foo.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/recursive/enabled/lib.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/recursive/enabled/lib.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/recursive/enabled/lib.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/recursive/enabled/lib.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/remove_nested_parens/remove_nested_parens.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/remove_nested_parens/remove_nested_parens.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/remove_nested_parens/remove_nested_parens.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/remove_nested_parens/remove_nested_parens.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/reorder_impl_items/false.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/reorder_impl_items/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/reorder_impl_items/false.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/reorder_impl_items/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/reorder_impl_items/true.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/reorder_impl_items/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/reorder_impl_items/true.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/reorder_impl_items/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/reorder_imports/false.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/reorder_imports/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/reorder_imports/false.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/reorder_imports/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/reorder_imports/true.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/reorder_imports/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/reorder_imports/true.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/reorder_imports/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/reorder_modules/dolor/mod.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/reorder_modules/dolor/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/reorder_modules/dolor/mod.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/reorder_modules/dolor/mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/reorder_modules/false.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/reorder_modules/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/reorder_modules/false.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/reorder_modules/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/reorder_modules/ipsum/mod.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/reorder_modules/ipsum/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/reorder_modules/ipsum/mod.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/reorder_modules/ipsum/mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/reorder_modules/lorem/mod.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/reorder_modules/lorem/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/reorder_modules/lorem/mod.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/reorder_modules/lorem/mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/reorder_modules/sit/mod.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/reorder_modules/sit/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/reorder_modules/sit/mod.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/reorder_modules/sit/mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/reorder_modules/true.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/reorder_modules/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/reorder_modules/true.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/reorder_modules/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/skip_children/foo/mod.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/skip_children/foo/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/skip_children/foo/mod.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/skip_children/foo/mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/skip_children/true.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/skip_children/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/skip_children/true.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/skip_children/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/space_before_colon/true.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/space_before_colon/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/space_before_colon/true.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/space_before_colon/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/spaces_around_ranges/false.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/spaces_around_ranges/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/spaces_around_ranges/false.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/spaces_around_ranges/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/spaces_around_ranges/true.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/spaces_around_ranges/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/spaces_around_ranges/true.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/spaces_around_ranges/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/struct_field_align_threshold/20.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/struct_field_align_threshold/20.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/struct_field_align_threshold/20.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/struct_field_align_threshold/20.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/struct_lit_single_line/false.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/struct_lit_single_line/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/struct_lit_single_line/false.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/struct_lit_single_line/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/tab_spaces/2.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/tab_spaces/2.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/tab_spaces/2.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/tab_spaces/2.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/tab_spaces/4.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/tab_spaces/4.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/tab_spaces/4.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/tab_spaces/4.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/trailing_comma/always.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/trailing_comma/always.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/trailing_comma/always.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/trailing_comma/always.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/trailing_comma/never.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/trailing_comma/never.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/trailing_comma/never.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/trailing_comma/never.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/trailing_comma/vertical.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/trailing_comma/vertical.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/trailing_comma/vertical.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/trailing_comma/vertical.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/type_punctuation_density/compressed.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/type_punctuation_density/compressed.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/type_punctuation_density/compressed.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/type_punctuation_density/compressed.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/type_punctuation_density/wide.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/type_punctuation_density/wide.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/type_punctuation_density/wide.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/type_punctuation_density/wide.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/use_field_init_shorthand/false.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/use_field_init_shorthand/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/use_field_init_shorthand/false.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/use_field_init_shorthand/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/use_field_init_shorthand/true.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/use_field_init_shorthand/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/use_field_init_shorthand/true.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/use_field_init_shorthand/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/use_small_heuristics/max.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/use_small_heuristics/max.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/use_small_heuristics/max.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/use_small_heuristics/max.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/use_try_shorthand/false.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/use_try_shorthand/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/use_try_shorthand/false.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/use_try_shorthand/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/use_try_shorthand/true.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/use_try_shorthand/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/use_try_shorthand/true.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/use_try_shorthand/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/use_try_shorthand/true_2015_edition.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/use_try_shorthand/true_2015_edition.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/use_try_shorthand/true_2015_edition.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/use_try_shorthand/true_2015_edition.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/where_single_line/true.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/where_single_line/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/where_single_line/true.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/where_single_line/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/wrap_comments/false.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/wrap_comments/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/wrap_comments/false.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/wrap_comments/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/configs/wrap_comments/true.rs b/rustfmt-core/rustfmt-lib/tests/source/configs/wrap_comments/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/configs/wrap_comments/true.rs rename to rustfmt-core/rustfmt-lib/tests/source/configs/wrap_comments/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/const_generics.rs b/rustfmt-core/rustfmt-lib/tests/source/const_generics.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/const_generics.rs rename to rustfmt-core/rustfmt-lib/tests/source/const_generics.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/control-brace-style-always-next-line.rs b/rustfmt-core/rustfmt-lib/tests/source/control-brace-style-always-next-line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/control-brace-style-always-next-line.rs rename to rustfmt-core/rustfmt-lib/tests/source/control-brace-style-always-next-line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/control-brace-style-always-same-line.rs b/rustfmt-core/rustfmt-lib/tests/source/control-brace-style-always-same-line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/control-brace-style-always-same-line.rs rename to rustfmt-core/rustfmt-lib/tests/source/control-brace-style-always-same-line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/doc-attrib.rs b/rustfmt-core/rustfmt-lib/tests/source/doc-attrib.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/doc-attrib.rs rename to rustfmt-core/rustfmt-lib/tests/source/doc-attrib.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/doc-comment-with-example.rs b/rustfmt-core/rustfmt-lib/tests/source/doc-comment-with-example.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/doc-comment-with-example.rs rename to rustfmt-core/rustfmt-lib/tests/source/doc-comment-with-example.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/doc.rs b/rustfmt-core/rustfmt-lib/tests/source/doc.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/doc.rs rename to rustfmt-core/rustfmt-lib/tests/source/doc.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/dyn_trait.rs b/rustfmt-core/rustfmt-lib/tests/source/dyn_trait.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/dyn_trait.rs rename to rustfmt-core/rustfmt-lib/tests/source/dyn_trait.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/else-if-brace-style-always-next-line.rs b/rustfmt-core/rustfmt-lib/tests/source/else-if-brace-style-always-next-line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/else-if-brace-style-always-next-line.rs rename to rustfmt-core/rustfmt-lib/tests/source/else-if-brace-style-always-next-line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/else-if-brace-style-always-same-line.rs b/rustfmt-core/rustfmt-lib/tests/source/else-if-brace-style-always-same-line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/else-if-brace-style-always-same-line.rs rename to rustfmt-core/rustfmt-lib/tests/source/else-if-brace-style-always-same-line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/else-if-brace-style-closing-next-line.rs b/rustfmt-core/rustfmt-lib/tests/source/else-if-brace-style-closing-next-line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/else-if-brace-style-closing-next-line.rs rename to rustfmt-core/rustfmt-lib/tests/source/else-if-brace-style-closing-next-line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/empty_file.rs b/rustfmt-core/rustfmt-lib/tests/source/empty_file.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/empty_file.rs rename to rustfmt-core/rustfmt-lib/tests/source/empty_file.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/enum.rs b/rustfmt-core/rustfmt-lib/tests/source/enum.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/enum.rs rename to rustfmt-core/rustfmt-lib/tests/source/enum.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/existential_type.rs b/rustfmt-core/rustfmt-lib/tests/source/existential_type.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/existential_type.rs rename to rustfmt-core/rustfmt-lib/tests/source/existential_type.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/expr-block.rs b/rustfmt-core/rustfmt-lib/tests/source/expr-block.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/expr-block.rs rename to rustfmt-core/rustfmt-lib/tests/source/expr-block.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/expr-overflow-delimited.rs b/rustfmt-core/rustfmt-lib/tests/source/expr-overflow-delimited.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/expr-overflow-delimited.rs rename to rustfmt-core/rustfmt-lib/tests/source/expr-overflow-delimited.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/expr.rs b/rustfmt-core/rustfmt-lib/tests/source/expr.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/expr.rs rename to rustfmt-core/rustfmt-lib/tests/source/expr.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/extern.rs b/rustfmt-core/rustfmt-lib/tests/source/extern.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/extern.rs rename to rustfmt-core/rustfmt-lib/tests/source/extern.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/extern_not_explicit.rs b/rustfmt-core/rustfmt-lib/tests/source/extern_not_explicit.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/extern_not_explicit.rs rename to rustfmt-core/rustfmt-lib/tests/source/extern_not_explicit.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/file-lines-1.rs b/rustfmt-core/rustfmt-lib/tests/source/file-lines-1.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/file-lines-1.rs rename to rustfmt-core/rustfmt-lib/tests/source/file-lines-1.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/file-lines-2.rs b/rustfmt-core/rustfmt-lib/tests/source/file-lines-2.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/file-lines-2.rs rename to rustfmt-core/rustfmt-lib/tests/source/file-lines-2.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/file-lines-3.rs b/rustfmt-core/rustfmt-lib/tests/source/file-lines-3.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/file-lines-3.rs rename to rustfmt-core/rustfmt-lib/tests/source/file-lines-3.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/file-lines-4.rs b/rustfmt-core/rustfmt-lib/tests/source/file-lines-4.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/file-lines-4.rs rename to rustfmt-core/rustfmt-lib/tests/source/file-lines-4.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/file-lines-5.rs b/rustfmt-core/rustfmt-lib/tests/source/file-lines-5.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/file-lines-5.rs rename to rustfmt-core/rustfmt-lib/tests/source/file-lines-5.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/file-lines-6.rs b/rustfmt-core/rustfmt-lib/tests/source/file-lines-6.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/file-lines-6.rs rename to rustfmt-core/rustfmt-lib/tests/source/file-lines-6.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/file-lines-7.rs b/rustfmt-core/rustfmt-lib/tests/source/file-lines-7.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/file-lines-7.rs rename to rustfmt-core/rustfmt-lib/tests/source/file-lines-7.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/file-lines-8.rs b/rustfmt-core/rustfmt-lib/tests/source/file-lines-8.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/file-lines-8.rs rename to rustfmt-core/rustfmt-lib/tests/source/file-lines-8.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/file-lines-item.rs b/rustfmt-core/rustfmt-lib/tests/source/file-lines-item.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/file-lines-item.rs rename to rustfmt-core/rustfmt-lib/tests/source/file-lines-item.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/fn-custom-2.rs b/rustfmt-core/rustfmt-lib/tests/source/fn-custom-2.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/fn-custom-2.rs rename to rustfmt-core/rustfmt-lib/tests/source/fn-custom-2.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/fn-custom-3.rs b/rustfmt-core/rustfmt-lib/tests/source/fn-custom-3.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/fn-custom-3.rs rename to rustfmt-core/rustfmt-lib/tests/source/fn-custom-3.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/fn-custom-4.rs b/rustfmt-core/rustfmt-lib/tests/source/fn-custom-4.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/fn-custom-4.rs rename to rustfmt-core/rustfmt-lib/tests/source/fn-custom-4.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/fn-custom-6.rs b/rustfmt-core/rustfmt-lib/tests/source/fn-custom-6.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/fn-custom-6.rs rename to rustfmt-core/rustfmt-lib/tests/source/fn-custom-6.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/fn-custom-7.rs b/rustfmt-core/rustfmt-lib/tests/source/fn-custom-7.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/fn-custom-7.rs rename to rustfmt-core/rustfmt-lib/tests/source/fn-custom-7.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/fn-custom-8.rs b/rustfmt-core/rustfmt-lib/tests/source/fn-custom-8.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/fn-custom-8.rs rename to rustfmt-core/rustfmt-lib/tests/source/fn-custom-8.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/fn-custom.rs b/rustfmt-core/rustfmt-lib/tests/source/fn-custom.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/fn-custom.rs rename to rustfmt-core/rustfmt-lib/tests/source/fn-custom.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/fn-param-attributes.rs b/rustfmt-core/rustfmt-lib/tests/source/fn-param-attributes.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/fn-param-attributes.rs rename to rustfmt-core/rustfmt-lib/tests/source/fn-param-attributes.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/fn-simple.rs b/rustfmt-core/rustfmt-lib/tests/source/fn-simple.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/fn-simple.rs rename to rustfmt-core/rustfmt-lib/tests/source/fn-simple.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/fn-single-line/version_two.rs b/rustfmt-core/rustfmt-lib/tests/source/fn-single-line/version_two.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/fn-single-line/version_two.rs rename to rustfmt-core/rustfmt-lib/tests/source/fn-single-line/version_two.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/fn_args_indent-block.rs b/rustfmt-core/rustfmt-lib/tests/source/fn_args_indent-block.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/fn_args_indent-block.rs rename to rustfmt-core/rustfmt-lib/tests/source/fn_args_indent-block.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/fn_args_layout-vertical.rs b/rustfmt-core/rustfmt-lib/tests/source/fn_args_layout-vertical.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/fn_args_layout-vertical.rs rename to rustfmt-core/rustfmt-lib/tests/source/fn_args_layout-vertical.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/hard-tabs.rs b/rustfmt-core/rustfmt-lib/tests/source/hard-tabs.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/hard-tabs.rs rename to rustfmt-core/rustfmt-lib/tests/source/hard-tabs.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/hello.rs b/rustfmt-core/rustfmt-lib/tests/source/hello.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/hello.rs rename to rustfmt-core/rustfmt-lib/tests/source/hello.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/hello2.rs b/rustfmt-core/rustfmt-lib/tests/source/hello2.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/hello2.rs rename to rustfmt-core/rustfmt-lib/tests/source/hello2.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/if_while_or_patterns.rs b/rustfmt-core/rustfmt-lib/tests/source/if_while_or_patterns.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/if_while_or_patterns.rs rename to rustfmt-core/rustfmt-lib/tests/source/if_while_or_patterns.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/immovable_generators.rs b/rustfmt-core/rustfmt-lib/tests/source/immovable_generators.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/immovable_generators.rs rename to rustfmt-core/rustfmt-lib/tests/source/immovable_generators.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/impls.rs b/rustfmt-core/rustfmt-lib/tests/source/impls.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/impls.rs rename to rustfmt-core/rustfmt-lib/tests/source/impls.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/imports-impl-only-use.rs b/rustfmt-core/rustfmt-lib/tests/source/imports-impl-only-use.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/imports-impl-only-use.rs rename to rustfmt-core/rustfmt-lib/tests/source/imports-impl-only-use.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/imports-reorder-lines-and-items.rs b/rustfmt-core/rustfmt-lib/tests/source/imports-reorder-lines-and-items.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/imports-reorder-lines-and-items.rs rename to rustfmt-core/rustfmt-lib/tests/source/imports-reorder-lines-and-items.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/imports-reorder-lines.rs b/rustfmt-core/rustfmt-lib/tests/source/imports-reorder-lines.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/imports-reorder-lines.rs rename to rustfmt-core/rustfmt-lib/tests/source/imports-reorder-lines.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/imports-reorder.rs b/rustfmt-core/rustfmt-lib/tests/source/imports-reorder.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/imports-reorder.rs rename to rustfmt-core/rustfmt-lib/tests/source/imports-reorder.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/imports.rs b/rustfmt-core/rustfmt-lib/tests/source/imports.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/imports.rs rename to rustfmt-core/rustfmt-lib/tests/source/imports.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/imports_2015_edition.rs b/rustfmt-core/rustfmt-lib/tests/source/imports_2015_edition.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/imports_2015_edition.rs rename to rustfmt-core/rustfmt-lib/tests/source/imports_2015_edition.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/imports_block_indent.rs b/rustfmt-core/rustfmt-lib/tests/source/imports_block_indent.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/imports_block_indent.rs rename to rustfmt-core/rustfmt-lib/tests/source/imports_block_indent.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/imports_raw_identifiers.rs b/rustfmt-core/rustfmt-lib/tests/source/imports_raw_identifiers.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/imports_raw_identifiers.rs rename to rustfmt-core/rustfmt-lib/tests/source/imports_raw_identifiers.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/invalid-rust-code-in-doc-comment.rs b/rustfmt-core/rustfmt-lib/tests/source/invalid-rust-code-in-doc-comment.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/invalid-rust-code-in-doc-comment.rs rename to rustfmt-core/rustfmt-lib/tests/source/invalid-rust-code-in-doc-comment.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-1021.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-1021.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-1021.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-1021.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-1049.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-1049.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-1049.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-1049.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-1111.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-1111.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-1111.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-1111.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-1120.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-1120.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-1120.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-1120.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-1124.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-1124.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-1124.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-1124.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-1127.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-1127.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-1127.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-1127.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-1158.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-1158.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-1158.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-1158.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-1177.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-1177.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-1177.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-1177.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-1192.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-1192.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-1192.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-1192.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-1210/a.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-1210/a.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-1210/a.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-1210/a.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-1210/b.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-1210/b.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-1210/b.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-1210/b.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-1210/c.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-1210/c.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-1210/c.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-1210/c.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-1210/d.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-1210/d.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-1210/d.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-1210/d.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-1210/e.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-1210/e.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-1210/e.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-1210/e.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-1211.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-1211.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-1211.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-1211.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-1216.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-1216.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-1216.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-1216.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-1239.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-1239.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-1239.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-1239.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-1278.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-1278.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-1278.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-1278.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-1350.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-1350.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-1350.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-1350.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-1366.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-1366.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-1366.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-1366.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-1468.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-1468.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-1468.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-1468.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-1693.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-1693.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-1693.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-1693.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-1800.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-1800.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-1800.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-1800.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-1914.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-1914.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-1914.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-1914.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2025.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2025.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2025.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2025.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2111.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2111.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2111.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2111.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2164.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2164.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2164.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2164.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2179/two.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2179/two.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2179/two.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2179/two.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2256.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2256.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2256.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2256.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2342.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2342.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2342.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2342.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2445.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2445.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2445.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2445.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2446.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2446.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2446.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2446.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2479.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2479.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2479.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2479.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2482/a.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2482/a.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2482/a.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2482/a.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2482/b.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2482/b.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2482/b.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2482/b.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2482/c.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2482/c.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2482/c.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2482/c.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2496.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2496.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2496.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2496.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2520.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2520.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2520.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2520.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2523.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2523.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2523.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2523.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2582.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2582.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2582.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2582.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2641.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2641.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2641.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2641.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2644.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2644.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2644.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2644.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2728.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2728.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2728.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2728.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2761.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2761.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2761.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2761.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2794.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2794.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2794.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2794.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2835.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2835.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2835.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2835.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2863.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2863.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2863.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2863.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2869.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2869.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2869.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2869.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2896.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2896.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2896.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2896.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2917/packed_simd.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2917/packed_simd.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2917/packed_simd.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2917/packed_simd.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2922.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2922.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2922.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2922.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2927-2.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2927-2.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2927-2.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2927-2.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2927.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2927.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2927.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2927.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2930.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2930.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2930.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2930.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2936.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2936.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2936.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2936.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2955.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2955.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2955.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2955.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2973.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2973.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2973.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2973.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2977/impl.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2977/impl.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2977/impl.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2977/impl.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2977/trait.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2977/trait.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2977/trait.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2977/trait.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2985.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2985.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2985.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2985.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-2995.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-2995.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-2995.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-2995.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3029.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3029.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3029.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3029.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3038.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3038.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3038.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3038.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3049.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3049.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3049.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3049.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3055/original.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3055/original.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3055/original.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3055/original.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3059.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3059.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3059.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3059.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3066.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3066.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3066.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3066.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3131.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3131.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3131.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3131.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3153.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3153.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3153.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3153.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3170.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3170.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3170.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3170.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3194.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3194.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3194.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3194.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3198.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3198.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3198.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3198.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3213/version_two.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3213/version_two.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3213/version_two.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3213/version_two.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3217.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3217.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3217.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3217.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3227/two.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3227/two.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3227/two.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3227/two.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3234.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3234.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3234.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3234.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3241.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3241.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3241.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3241.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3253/bar.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3253/bar.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3253/bar.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3253/bar.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3253/foo.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3253/foo.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3253/foo.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3253/foo.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3253/lib.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3253/lib.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3253/lib.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3253/lib.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3253/paths/bar_foo.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3253/paths/bar_foo.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3253/paths/bar_foo.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3253/paths/bar_foo.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3253/paths/excluded.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3253/paths/excluded.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3253/paths/excluded.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3253/paths/excluded.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3253/paths/foo_bar.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3253/paths/foo_bar.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3253/paths/foo_bar.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3253/paths/foo_bar.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3265.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3265.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3265.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3265.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3270/two.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3270/two.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3270/two.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3270/two.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3272/v2.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3272/v2.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3272/v2.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3272/v2.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3278/version_two.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3278/version_two.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3278/version_two.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3278/version_two.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3295/two.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3295/two.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3295/two.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3295/two.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3302.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3302.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3302.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3302.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3343.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3343.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3343.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3343.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3423.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3423.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3423.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3423.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3434/lib.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3434/lib.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3434/lib.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3434/lib.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3434/no_entry.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3434/no_entry.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3434/no_entry.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3434/no_entry.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3434/not_skip_macro.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3434/not_skip_macro.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3434/not_skip_macro.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3434/not_skip_macro.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3465.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3465.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3465.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3465.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3494/crlf.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3494/crlf.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3494/crlf.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3494/crlf.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3494/lf.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3494/lf.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3494/lf.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3494/lf.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3508.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3508.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3508.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3508.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3515.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3515.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3515.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3515.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3532.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3532.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3532.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3532.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3585/extern_crate.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3585/extern_crate.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3585/extern_crate.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3585/extern_crate.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3585/reorder_imports_disabled.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3585/reorder_imports_disabled.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3585/reorder_imports_disabled.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3585/reorder_imports_disabled.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3585/reorder_imports_enabled.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3585/reorder_imports_enabled.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3585/reorder_imports_enabled.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3585/reorder_imports_enabled.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3585/use.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3585/use.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3585/use.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3585/use.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3636.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3636.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3636.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3636.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3639.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3639.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3639.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3639.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3651.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3651.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3651.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3651.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3665/lib.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3665/lib.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3665/lib.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3665/lib.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3665/not_skip_attribute.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3665/not_skip_attribute.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3665/not_skip_attribute.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3665/not_skip_attribute.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3665/sub_mod.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3665/sub_mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3665/sub_mod.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3665/sub_mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3672.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3672.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3672.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3672.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3675.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3675.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3675.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3675.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3701/two.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3701/two.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3701/two.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3701/two.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3709.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3709.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3709.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3709.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3740.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3740.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3740.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3740.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3750.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3750.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3750.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3750.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3751.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3751.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3751.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3751.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3779/ice.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3779/ice.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3779/ice.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3779/ice.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3779/lib.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3779/lib.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3779/lib.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3779/lib.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3786.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3786.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3786.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3786.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3787.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3787.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3787.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3787.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3840/version-two_hard-tabs.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3840/version-two_hard-tabs.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3840/version-two_hard-tabs.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3840/version-two_hard-tabs.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3840/version-two_soft-tabs.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3840/version-two_soft-tabs.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3840/version-two_soft-tabs.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3840/version-two_soft-tabs.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3851.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3851.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3851.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3851.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3904/two.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3904/two.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3904/two.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3904/two.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3908.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3908.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3908.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3908.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3923.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3923.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3923.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3923.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3929.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3929.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3929.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3929.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3933/imp-a.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3933/imp-a.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3933/imp-a.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3933/imp-a.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3933/imp-b.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3933/imp-b.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3933/imp-b.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3933/imp-b.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3933/lib.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3933/lib.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3933/lib.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3933/lib.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-3933/utils.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-3933/utils.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-3933/utils.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-3933/utils.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-447.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-447.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-447.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-447.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-510.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-510.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-510.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-510.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-539.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-539.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-539.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-539.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-683.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-683.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-683.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-683.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-811.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-811.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-811.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-811.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-850.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-850.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-850.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-850.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-855.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-855.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-855.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-855.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-913.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-913.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-913.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-913.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-945.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-945.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-945.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-945.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue-977.rs b/rustfmt-core/rustfmt-lib/tests/source/issue-977.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue-977.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue-977.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue_3839.rs b/rustfmt-core/rustfmt-lib/tests/source/issue_3839.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue_3839.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue_3839.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue_3844.rs b/rustfmt-core/rustfmt-lib/tests/source/issue_3844.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue_3844.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue_3844.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue_3853.rs b/rustfmt-core/rustfmt-lib/tests/source/issue_3853.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue_3853.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue_3853.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/issue_3868.rs b/rustfmt-core/rustfmt-lib/tests/source/issue_3868.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/issue_3868.rs rename to rustfmt-core/rustfmt-lib/tests/source/issue_3868.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/item-brace-style-always-next-line.rs b/rustfmt-core/rustfmt-lib/tests/source/item-brace-style-always-next-line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/item-brace-style-always-next-line.rs rename to rustfmt-core/rustfmt-lib/tests/source/item-brace-style-always-next-line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/item-brace-style-prefer-same-line.rs b/rustfmt-core/rustfmt-lib/tests/source/item-brace-style-prefer-same-line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/item-brace-style-prefer-same-line.rs rename to rustfmt-core/rustfmt-lib/tests/source/item-brace-style-prefer-same-line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/item-brace-style-same-line-where.rs b/rustfmt-core/rustfmt-lib/tests/source/item-brace-style-same-line-where.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/item-brace-style-same-line-where.rs rename to rustfmt-core/rustfmt-lib/tests/source/item-brace-style-same-line-where.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/itemized-blocks/no_wrap.rs b/rustfmt-core/rustfmt-lib/tests/source/itemized-blocks/no_wrap.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/itemized-blocks/no_wrap.rs rename to rustfmt-core/rustfmt-lib/tests/source/itemized-blocks/no_wrap.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/itemized-blocks/rewrite_fail.rs b/rustfmt-core/rustfmt-lib/tests/source/itemized-blocks/rewrite_fail.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/itemized-blocks/rewrite_fail.rs rename to rustfmt-core/rustfmt-lib/tests/source/itemized-blocks/rewrite_fail.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/itemized-blocks/urls.rs b/rustfmt-core/rustfmt-lib/tests/source/itemized-blocks/urls.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/itemized-blocks/urls.rs rename to rustfmt-core/rustfmt-lib/tests/source/itemized-blocks/urls.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/itemized-blocks/wrap.rs b/rustfmt-core/rustfmt-lib/tests/source/itemized-blocks/wrap.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/itemized-blocks/wrap.rs rename to rustfmt-core/rustfmt-lib/tests/source/itemized-blocks/wrap.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/label_break.rs b/rustfmt-core/rustfmt-lib/tests/source/label_break.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/label_break.rs rename to rustfmt-core/rustfmt-lib/tests/source/label_break.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/large-block.rs b/rustfmt-core/rustfmt-lib/tests/source/large-block.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/large-block.rs rename to rustfmt-core/rustfmt-lib/tests/source/large-block.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/large_vec.rs b/rustfmt-core/rustfmt-lib/tests/source/large_vec.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/large_vec.rs rename to rustfmt-core/rustfmt-lib/tests/source/large_vec.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/lazy_static.rs b/rustfmt-core/rustfmt-lib/tests/source/lazy_static.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/lazy_static.rs rename to rustfmt-core/rustfmt-lib/tests/source/lazy_static.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/license-templates/empty_license_path.rs b/rustfmt-core/rustfmt-lib/tests/source/license-templates/empty_license_path.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/license-templates/empty_license_path.rs rename to rustfmt-core/rustfmt-lib/tests/source/license-templates/empty_license_path.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/license-templates/license.rs b/rustfmt-core/rustfmt-lib/tests/source/license-templates/license.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/license-templates/license.rs rename to rustfmt-core/rustfmt-lib/tests/source/license-templates/license.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/long-fn-1/version_two.rs b/rustfmt-core/rustfmt-lib/tests/source/long-fn-1/version_two.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/long-fn-1/version_two.rs rename to rustfmt-core/rustfmt-lib/tests/source/long-fn-1/version_two.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/long-match-arms-brace-newline.rs b/rustfmt-core/rustfmt-lib/tests/source/long-match-arms-brace-newline.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/long-match-arms-brace-newline.rs rename to rustfmt-core/rustfmt-lib/tests/source/long-match-arms-brace-newline.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/long-use-statement-issue-3154.rs b/rustfmt-core/rustfmt-lib/tests/source/long-use-statement-issue-3154.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/long-use-statement-issue-3154.rs rename to rustfmt-core/rustfmt-lib/tests/source/long-use-statement-issue-3154.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/long_field_access.rs b/rustfmt-core/rustfmt-lib/tests/source/long_field_access.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/long_field_access.rs rename to rustfmt-core/rustfmt-lib/tests/source/long_field_access.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/loop.rs b/rustfmt-core/rustfmt-lib/tests/source/loop.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/loop.rs rename to rustfmt-core/rustfmt-lib/tests/source/loop.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/macro_not_expr.rs b/rustfmt-core/rustfmt-lib/tests/source/macro_not_expr.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/macro_not_expr.rs rename to rustfmt-core/rustfmt-lib/tests/source/macro_not_expr.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/macro_rules.rs b/rustfmt-core/rustfmt-lib/tests/source/macro_rules.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/macro_rules.rs rename to rustfmt-core/rustfmt-lib/tests/source/macro_rules.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/macros.rs b/rustfmt-core/rustfmt-lib/tests/source/macros.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/macros.rs rename to rustfmt-core/rustfmt-lib/tests/source/macros.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/markdown-comment-with-options.rs b/rustfmt-core/rustfmt-lib/tests/source/markdown-comment-with-options.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/markdown-comment-with-options.rs rename to rustfmt-core/rustfmt-lib/tests/source/markdown-comment-with-options.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/markdown-comment.rs b/rustfmt-core/rustfmt-lib/tests/source/markdown-comment.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/markdown-comment.rs rename to rustfmt-core/rustfmt-lib/tests/source/markdown-comment.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/match-block-trailing-comma.rs b/rustfmt-core/rustfmt-lib/tests/source/match-block-trailing-comma.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/match-block-trailing-comma.rs rename to rustfmt-core/rustfmt-lib/tests/source/match-block-trailing-comma.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/match-flattening.rs b/rustfmt-core/rustfmt-lib/tests/source/match-flattening.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/match-flattening.rs rename to rustfmt-core/rustfmt-lib/tests/source/match-flattening.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/match-nowrap-trailing-comma.rs b/rustfmt-core/rustfmt-lib/tests/source/match-nowrap-trailing-comma.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/match-nowrap-trailing-comma.rs rename to rustfmt-core/rustfmt-lib/tests/source/match-nowrap-trailing-comma.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/match-nowrap.rs b/rustfmt-core/rustfmt-lib/tests/source/match-nowrap.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/match-nowrap.rs rename to rustfmt-core/rustfmt-lib/tests/source/match-nowrap.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/match.rs b/rustfmt-core/rustfmt-lib/tests/source/match.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/match.rs rename to rustfmt-core/rustfmt-lib/tests/source/match.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/match_overflow_expr.rs b/rustfmt-core/rustfmt-lib/tests/source/match_overflow_expr.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/match_overflow_expr.rs rename to rustfmt-core/rustfmt-lib/tests/source/match_overflow_expr.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/max-line-length-in-chars.rs b/rustfmt-core/rustfmt-lib/tests/source/max-line-length-in-chars.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/max-line-length-in-chars.rs rename to rustfmt-core/rustfmt-lib/tests/source/max-line-length-in-chars.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/merge_imports.rs b/rustfmt-core/rustfmt-lib/tests/source/merge_imports.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/merge_imports.rs rename to rustfmt-core/rustfmt-lib/tests/source/merge_imports.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/mod-1.rs b/rustfmt-core/rustfmt-lib/tests/source/mod-1.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/mod-1.rs rename to rustfmt-core/rustfmt-lib/tests/source/mod-1.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/mod-2.rs b/rustfmt-core/rustfmt-lib/tests/source/mod-2.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/mod-2.rs rename to rustfmt-core/rustfmt-lib/tests/source/mod-2.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/mod_skip_child.rs b/rustfmt-core/rustfmt-lib/tests/source/mod_skip_child.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/mod_skip_child.rs rename to rustfmt-core/rustfmt-lib/tests/source/mod_skip_child.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/multiple.rs b/rustfmt-core/rustfmt-lib/tests/source/multiple.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/multiple.rs rename to rustfmt-core/rustfmt-lib/tests/source/multiple.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/nested-if-else.rs b/rustfmt-core/rustfmt-lib/tests/source/nested-if-else.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/nested-if-else.rs rename to rustfmt-core/rustfmt-lib/tests/source/nested-if-else.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/nested_skipped/mod.rs b/rustfmt-core/rustfmt-lib/tests/source/nested_skipped/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/nested_skipped/mod.rs rename to rustfmt-core/rustfmt-lib/tests/source/nested_skipped/mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/nestedmod/mod.rs b/rustfmt-core/rustfmt-lib/tests/source/nestedmod/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/nestedmod/mod.rs rename to rustfmt-core/rustfmt-lib/tests/source/nestedmod/mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/nestedmod/mod2a.rs b/rustfmt-core/rustfmt-lib/tests/source/nestedmod/mod2a.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/nestedmod/mod2a.rs rename to rustfmt-core/rustfmt-lib/tests/source/nestedmod/mod2a.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/nestedmod/mod2b.rs b/rustfmt-core/rustfmt-lib/tests/source/nestedmod/mod2b.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/nestedmod/mod2b.rs rename to rustfmt-core/rustfmt-lib/tests/source/nestedmod/mod2b.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/nestedmod/mod2c.rs b/rustfmt-core/rustfmt-lib/tests/source/nestedmod/mod2c.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/nestedmod/mod2c.rs rename to rustfmt-core/rustfmt-lib/tests/source/nestedmod/mod2c.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/nestedmod/mymod1/mod3a.rs b/rustfmt-core/rustfmt-lib/tests/source/nestedmod/mymod1/mod3a.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/nestedmod/mymod1/mod3a.rs rename to rustfmt-core/rustfmt-lib/tests/source/nestedmod/mymod1/mod3a.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/nestedmod/submod2/a.rs b/rustfmt-core/rustfmt-lib/tests/source/nestedmod/submod2/a.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/nestedmod/submod2/a.rs rename to rustfmt-core/rustfmt-lib/tests/source/nestedmod/submod2/a.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/nestedmod/submod2/mod.rs b/rustfmt-core/rustfmt-lib/tests/source/nestedmod/submod2/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/nestedmod/submod2/mod.rs rename to rustfmt-core/rustfmt-lib/tests/source/nestedmod/submod2/mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/no_arg_with_commnet.rs b/rustfmt-core/rustfmt-lib/tests/source/no_arg_with_commnet.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/no_arg_with_commnet.rs rename to rustfmt-core/rustfmt-lib/tests/source/no_arg_with_commnet.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/no_new_line_beginning.rs b/rustfmt-core/rustfmt-lib/tests/source/no_new_line_beginning.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/no_new_line_beginning.rs rename to rustfmt-core/rustfmt-lib/tests/source/no_new_line_beginning.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/normalize_doc_attributes_should_not_imply_format_doc_comments.rs b/rustfmt-core/rustfmt-lib/tests/source/normalize_doc_attributes_should_not_imply_format_doc_comments.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/normalize_doc_attributes_should_not_imply_format_doc_comments.rs rename to rustfmt-core/rustfmt-lib/tests/source/normalize_doc_attributes_should_not_imply_format_doc_comments.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/normalize_multiline_doc_attribute.rs b/rustfmt-core/rustfmt-lib/tests/source/normalize_multiline_doc_attribute.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/normalize_multiline_doc_attribute.rs rename to rustfmt-core/rustfmt-lib/tests/source/normalize_multiline_doc_attribute.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/one_line_if_v2.rs b/rustfmt-core/rustfmt-lib/tests/source/one_line_if_v2.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/one_line_if_v2.rs rename to rustfmt-core/rustfmt-lib/tests/source/one_line_if_v2.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/other.rs b/rustfmt-core/rustfmt-lib/tests/source/other.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/other.rs rename to rustfmt-core/rustfmt-lib/tests/source/other.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/paren.rs b/rustfmt-core/rustfmt-lib/tests/source/paren.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/paren.rs rename to rustfmt-core/rustfmt-lib/tests/source/paren.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/path_clarity/foo.rs b/rustfmt-core/rustfmt-lib/tests/source/path_clarity/foo.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/path_clarity/foo.rs rename to rustfmt-core/rustfmt-lib/tests/source/path_clarity/foo.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/path_clarity/foo/bar.rs b/rustfmt-core/rustfmt-lib/tests/source/path_clarity/foo/bar.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/path_clarity/foo/bar.rs rename to rustfmt-core/rustfmt-lib/tests/source/path_clarity/foo/bar.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/paths.rs b/rustfmt-core/rustfmt-lib/tests/source/paths.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/paths.rs rename to rustfmt-core/rustfmt-lib/tests/source/paths.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/pattern-condense-wildcards.rs b/rustfmt-core/rustfmt-lib/tests/source/pattern-condense-wildcards.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/pattern-condense-wildcards.rs rename to rustfmt-core/rustfmt-lib/tests/source/pattern-condense-wildcards.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/pattern.rs b/rustfmt-core/rustfmt-lib/tests/source/pattern.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/pattern.rs rename to rustfmt-core/rustfmt-lib/tests/source/pattern.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/preserves_carriage_return_for_unix.rs b/rustfmt-core/rustfmt-lib/tests/source/preserves_carriage_return_for_unix.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/preserves_carriage_return_for_unix.rs rename to rustfmt-core/rustfmt-lib/tests/source/preserves_carriage_return_for_unix.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/preserves_carriage_return_for_windows.rs b/rustfmt-core/rustfmt-lib/tests/source/preserves_carriage_return_for_windows.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/preserves_carriage_return_for_windows.rs rename to rustfmt-core/rustfmt-lib/tests/source/preserves_carriage_return_for_windows.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/pub-restricted.rs b/rustfmt-core/rustfmt-lib/tests/source/pub-restricted.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/pub-restricted.rs rename to rustfmt-core/rustfmt-lib/tests/source/pub-restricted.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/remove_blank_lines.rs b/rustfmt-core/rustfmt-lib/tests/source/remove_blank_lines.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/remove_blank_lines.rs rename to rustfmt-core/rustfmt-lib/tests/source/remove_blank_lines.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/reorder-impl-items.rs b/rustfmt-core/rustfmt-lib/tests/source/reorder-impl-items.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/reorder-impl-items.rs rename to rustfmt-core/rustfmt-lib/tests/source/reorder-impl-items.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/single-line-if-else.rs b/rustfmt-core/rustfmt-lib/tests/source/single-line-if-else.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/single-line-if-else.rs rename to rustfmt-core/rustfmt-lib/tests/source/single-line-if-else.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/single-line-macro/v2.rs b/rustfmt-core/rustfmt-lib/tests/source/single-line-macro/v2.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/single-line-macro/v2.rs rename to rustfmt-core/rustfmt-lib/tests/source/single-line-macro/v2.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/soft-wrapping.rs b/rustfmt-core/rustfmt-lib/tests/source/soft-wrapping.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/soft-wrapping.rs rename to rustfmt-core/rustfmt-lib/tests/source/soft-wrapping.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/space-not-before-newline.rs b/rustfmt-core/rustfmt-lib/tests/source/space-not-before-newline.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/space-not-before-newline.rs rename to rustfmt-core/rustfmt-lib/tests/source/space-not-before-newline.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/spaces-around-ranges.rs b/rustfmt-core/rustfmt-lib/tests/source/spaces-around-ranges.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/spaces-around-ranges.rs rename to rustfmt-core/rustfmt-lib/tests/source/spaces-around-ranges.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/static.rs b/rustfmt-core/rustfmt-lib/tests/source/static.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/static.rs rename to rustfmt-core/rustfmt-lib/tests/source/static.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/string-lit-2.rs b/rustfmt-core/rustfmt-lib/tests/source/string-lit-2.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/string-lit-2.rs rename to rustfmt-core/rustfmt-lib/tests/source/string-lit-2.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/string-lit.rs b/rustfmt-core/rustfmt-lib/tests/source/string-lit.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/string-lit.rs rename to rustfmt-core/rustfmt-lib/tests/source/string-lit.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/string_punctuation.rs b/rustfmt-core/rustfmt-lib/tests/source/string_punctuation.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/string_punctuation.rs rename to rustfmt-core/rustfmt-lib/tests/source/string_punctuation.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/struct-field-attributes.rs b/rustfmt-core/rustfmt-lib/tests/source/struct-field-attributes.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/struct-field-attributes.rs rename to rustfmt-core/rustfmt-lib/tests/source/struct-field-attributes.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/struct_lits.rs b/rustfmt-core/rustfmt-lib/tests/source/struct_lits.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/struct_lits.rs rename to rustfmt-core/rustfmt-lib/tests/source/struct_lits.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/struct_lits_multiline.rs b/rustfmt-core/rustfmt-lib/tests/source/struct_lits_multiline.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/struct_lits_multiline.rs rename to rustfmt-core/rustfmt-lib/tests/source/struct_lits_multiline.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/struct_lits_visual.rs b/rustfmt-core/rustfmt-lib/tests/source/struct_lits_visual.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/struct_lits_visual.rs rename to rustfmt-core/rustfmt-lib/tests/source/struct_lits_visual.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/struct_lits_visual_multiline.rs b/rustfmt-core/rustfmt-lib/tests/source/struct_lits_visual_multiline.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/struct_lits_visual_multiline.rs rename to rustfmt-core/rustfmt-lib/tests/source/struct_lits_visual_multiline.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/struct_tuple_visual.rs b/rustfmt-core/rustfmt-lib/tests/source/struct_tuple_visual.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/struct_tuple_visual.rs rename to rustfmt-core/rustfmt-lib/tests/source/struct_tuple_visual.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/structs.rs b/rustfmt-core/rustfmt-lib/tests/source/structs.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/structs.rs rename to rustfmt-core/rustfmt-lib/tests/source/structs.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/trailing-comma-never.rs b/rustfmt-core/rustfmt-lib/tests/source/trailing-comma-never.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/trailing-comma-never.rs rename to rustfmt-core/rustfmt-lib/tests/source/trailing-comma-never.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/trailing_commas.rs b/rustfmt-core/rustfmt-lib/tests/source/trailing_commas.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/trailing_commas.rs rename to rustfmt-core/rustfmt-lib/tests/source/trailing_commas.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/trailing_comments/hard_tabs.rs b/rustfmt-core/rustfmt-lib/tests/source/trailing_comments/hard_tabs.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/trailing_comments/hard_tabs.rs rename to rustfmt-core/rustfmt-lib/tests/source/trailing_comments/hard_tabs.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/trailing_comments/soft_tabs.rs b/rustfmt-core/rustfmt-lib/tests/source/trailing_comments/soft_tabs.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/trailing_comments/soft_tabs.rs rename to rustfmt-core/rustfmt-lib/tests/source/trailing_comments/soft_tabs.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/trait.rs b/rustfmt-core/rustfmt-lib/tests/source/trait.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/trait.rs rename to rustfmt-core/rustfmt-lib/tests/source/trait.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/trait_2015_edition.rs b/rustfmt-core/rustfmt-lib/tests/source/trait_2015_edition.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/trait_2015_edition.rs rename to rustfmt-core/rustfmt-lib/tests/source/trait_2015_edition.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/try-conversion.rs b/rustfmt-core/rustfmt-lib/tests/source/try-conversion.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/try-conversion.rs rename to rustfmt-core/rustfmt-lib/tests/source/try-conversion.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/tuple.rs b/rustfmt-core/rustfmt-lib/tests/source/tuple.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/tuple.rs rename to rustfmt-core/rustfmt-lib/tests/source/tuple.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/type-ascription.rs b/rustfmt-core/rustfmt-lib/tests/source/type-ascription.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/type-ascription.rs rename to rustfmt-core/rustfmt-lib/tests/source/type-ascription.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/type.rs b/rustfmt-core/rustfmt-lib/tests/source/type.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/type.rs rename to rustfmt-core/rustfmt-lib/tests/source/type.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/type_alias.rs b/rustfmt-core/rustfmt-lib/tests/source/type_alias.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/type_alias.rs rename to rustfmt-core/rustfmt-lib/tests/source/type_alias.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/unicode.rs b/rustfmt-core/rustfmt-lib/tests/source/unicode.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/unicode.rs rename to rustfmt-core/rustfmt-lib/tests/source/unicode.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/unions.rs b/rustfmt-core/rustfmt-lib/tests/source/unions.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/unions.rs rename to rustfmt-core/rustfmt-lib/tests/source/unions.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/visibility.rs b/rustfmt-core/rustfmt-lib/tests/source/visibility.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/visibility.rs rename to rustfmt-core/rustfmt-lib/tests/source/visibility.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/visual-fn-type.rs b/rustfmt-core/rustfmt-lib/tests/source/visual-fn-type.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/visual-fn-type.rs rename to rustfmt-core/rustfmt-lib/tests/source/visual-fn-type.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/where-clause-rfc.rs b/rustfmt-core/rustfmt-lib/tests/source/where-clause-rfc.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/where-clause-rfc.rs rename to rustfmt-core/rustfmt-lib/tests/source/where-clause-rfc.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/where-clause.rs b/rustfmt-core/rustfmt-lib/tests/source/where-clause.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/where-clause.rs rename to rustfmt-core/rustfmt-lib/tests/source/where-clause.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/width-heuristics.rs b/rustfmt-core/rustfmt-lib/tests/source/width-heuristics.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/width-heuristics.rs rename to rustfmt-core/rustfmt-lib/tests/source/width-heuristics.rs diff --git a/rustfmt-lib/rustfmt-core/tests/source/wrap_comments_should_not_imply_format_doc_comments.rs b/rustfmt-core/rustfmt-lib/tests/source/wrap_comments_should_not_imply_format_doc_comments.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/source/wrap_comments_should_not_imply_format_doc_comments.rs rename to rustfmt-core/rustfmt-lib/tests/source/wrap_comments_should_not_imply_format_doc_comments.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/alignment_2633/block_style.rs b/rustfmt-core/rustfmt-lib/tests/target/alignment_2633/block_style.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/alignment_2633/block_style.rs rename to rustfmt-core/rustfmt-lib/tests/target/alignment_2633/block_style.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/alignment_2633/horizontal_tactic.rs b/rustfmt-core/rustfmt-lib/tests/target/alignment_2633/horizontal_tactic.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/alignment_2633/horizontal_tactic.rs rename to rustfmt-core/rustfmt-lib/tests/target/alignment_2633/horizontal_tactic.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/alignment_2633/visual_style.rs b/rustfmt-core/rustfmt-lib/tests/target/alignment_2633/visual_style.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/alignment_2633/visual_style.rs rename to rustfmt-core/rustfmt-lib/tests/target/alignment_2633/visual_style.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/array_comment.rs b/rustfmt-core/rustfmt-lib/tests/target/array_comment.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/array_comment.rs rename to rustfmt-core/rustfmt-lib/tests/target/array_comment.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/assignment.rs b/rustfmt-core/rustfmt-lib/tests/target/assignment.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/assignment.rs rename to rustfmt-core/rustfmt-lib/tests/target/assignment.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/associated-items.rs b/rustfmt-core/rustfmt-lib/tests/target/associated-items.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/associated-items.rs rename to rustfmt-core/rustfmt-lib/tests/target/associated-items.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/associated-types-bounds-wrapping.rs b/rustfmt-core/rustfmt-lib/tests/target/associated-types-bounds-wrapping.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/associated-types-bounds-wrapping.rs rename to rustfmt-core/rustfmt-lib/tests/target/associated-types-bounds-wrapping.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/associated_type_bounds.rs b/rustfmt-core/rustfmt-lib/tests/target/associated_type_bounds.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/associated_type_bounds.rs rename to rustfmt-core/rustfmt-lib/tests/target/associated_type_bounds.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/associated_type_defaults.rs b/rustfmt-core/rustfmt-lib/tests/target/associated_type_defaults.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/associated_type_defaults.rs rename to rustfmt-core/rustfmt-lib/tests/target/associated_type_defaults.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/async_block.rs b/rustfmt-core/rustfmt-lib/tests/target/async_block.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/async_block.rs rename to rustfmt-core/rustfmt-lib/tests/target/async_block.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/async_closure.rs b/rustfmt-core/rustfmt-lib/tests/target/async_closure.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/async_closure.rs rename to rustfmt-core/rustfmt-lib/tests/target/async_closure.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/async_fn.rs b/rustfmt-core/rustfmt-lib/tests/target/async_fn.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/async_fn.rs rename to rustfmt-core/rustfmt-lib/tests/target/async_fn.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/attrib-block-expr.rs b/rustfmt-core/rustfmt-lib/tests/target/attrib-block-expr.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/attrib-block-expr.rs rename to rustfmt-core/rustfmt-lib/tests/target/attrib-block-expr.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/attrib-extern-crate.rs b/rustfmt-core/rustfmt-lib/tests/target/attrib-extern-crate.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/attrib-extern-crate.rs rename to rustfmt-core/rustfmt-lib/tests/target/attrib-extern-crate.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/attrib.rs b/rustfmt-core/rustfmt-lib/tests/target/attrib.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/attrib.rs rename to rustfmt-core/rustfmt-lib/tests/target/attrib.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/big-impl-block.rs b/rustfmt-core/rustfmt-lib/tests/target/big-impl-block.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/big-impl-block.rs rename to rustfmt-core/rustfmt-lib/tests/target/big-impl-block.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/big-impl-visual.rs b/rustfmt-core/rustfmt-lib/tests/target/big-impl-visual.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/big-impl-visual.rs rename to rustfmt-core/rustfmt-lib/tests/target/big-impl-visual.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/binary-expr.rs b/rustfmt-core/rustfmt-lib/tests/target/binary-expr.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/binary-expr.rs rename to rustfmt-core/rustfmt-lib/tests/target/binary-expr.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/break-and-continue.rs b/rustfmt-core/rustfmt-lib/tests/target/break-and-continue.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/break-and-continue.rs rename to rustfmt-core/rustfmt-lib/tests/target/break-and-continue.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/catch.rs b/rustfmt-core/rustfmt-lib/tests/target/catch.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/catch.rs rename to rustfmt-core/rustfmt-lib/tests/target/catch.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/aarch64.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/arch/aarch64.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/aarch64.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/arch/aarch64.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/arm.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/arch/arm.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/arm.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/arch/arm.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/mips.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/arch/mips.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/mips.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/arch/mips.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/mips64.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/arch/mips64.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/mips64.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/arch/mips64.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/powerpc.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/arch/powerpc.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/powerpc.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/arch/powerpc.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/powerpc64.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/arch/powerpc64.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/powerpc64.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/arch/powerpc64.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/x86.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/arch/x86.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/arch/x86.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/arch/x86.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/bit.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/bit.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/bit.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/bit.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/cache.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/cache.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/cache.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/cache.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/error_macros.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/error_macros.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/error_macros.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/error_macros.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/mod.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/mod.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/aarch64.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/aarch64.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/aarch64.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/aarch64.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/aarch64.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/freebsd/aarch64.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/aarch64.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/freebsd/aarch64.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/arm.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/freebsd/arm.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/arm.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/freebsd/arm.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/auxvec.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/freebsd/auxvec.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/auxvec.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/freebsd/auxvec.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/mod.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/freebsd/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/mod.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/freebsd/mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/powerpc.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/freebsd/powerpc.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/freebsd/powerpc.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/freebsd/powerpc.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/aarch64.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/linux/aarch64.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/aarch64.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/linux/aarch64.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/arm.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/linux/arm.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/arm.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/linux/arm.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/auxvec.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/linux/auxvec.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/auxvec.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/linux/auxvec.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/cpuinfo.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/linux/cpuinfo.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/cpuinfo.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/linux/cpuinfo.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/mips.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/linux/mips.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/mips.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/linux/mips.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/mod.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/linux/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/mod.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/linux/mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/powerpc.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/linux/powerpc.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/linux/powerpc.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/linux/powerpc.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/other.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/other.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/other.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/other.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/x86.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/x86.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/detect/os/x86.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/detect/os/x86.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/lib.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/lib.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/lib.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/lib.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_if/mod.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_if/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_if/mod.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_if/mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_mod/bar.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_mod/bar.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_mod/bar.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_mod/bar.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_mod/dir/dir1/dir2/wasm32.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_mod/dir/dir1/dir2/wasm32.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_mod/dir/dir1/dir2/wasm32.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_mod/dir/dir1/dir2/wasm32.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_mod/dir/dir1/dir3/wasm32.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_mod/dir/dir1/dir3/wasm32.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_mod/dir/dir1/dir3/wasm32.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_mod/dir/dir1/dir3/wasm32.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_mod/foo.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_mod/foo.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_mod/foo.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_mod/foo.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_mod/mod.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_mod/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_mod/mod.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_mod/mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_mod/other.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_mod/other.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_mod/other.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_mod/other.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/cfg_mod/wasm32.rs b/rustfmt-core/rustfmt-lib/tests/target/cfg_mod/wasm32.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/cfg_mod/wasm32.rs rename to rustfmt-core/rustfmt-lib/tests/target/cfg_mod/wasm32.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/chains-visual.rs b/rustfmt-core/rustfmt-lib/tests/target/chains-visual.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/chains-visual.rs rename to rustfmt-core/rustfmt-lib/tests/target/chains-visual.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/chains.rs b/rustfmt-core/rustfmt-lib/tests/target/chains.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/chains.rs rename to rustfmt-core/rustfmt-lib/tests/target/chains.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/chains_with_comment.rs b/rustfmt-core/rustfmt-lib/tests/target/chains_with_comment.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/chains_with_comment.rs rename to rustfmt-core/rustfmt-lib/tests/target/chains_with_comment.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/closure-block-inside-macro.rs b/rustfmt-core/rustfmt-lib/tests/target/closure-block-inside-macro.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/closure-block-inside-macro.rs rename to rustfmt-core/rustfmt-lib/tests/target/closure-block-inside-macro.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/closure_block_style.rs b/rustfmt-core/rustfmt-lib/tests/target/closure_block_style.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/closure_block_style.rs rename to rustfmt-core/rustfmt-lib/tests/target/closure_block_style.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/closure_block_style_no_comma.rs b/rustfmt-core/rustfmt-lib/tests/target/closure_block_style_no_comma.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/closure_block_style_no_comma.rs rename to rustfmt-core/rustfmt-lib/tests/target/closure_block_style_no_comma.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/closure_visual_style.rs b/rustfmt-core/rustfmt-lib/tests/target/closure_visual_style.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/closure_visual_style.rs rename to rustfmt-core/rustfmt-lib/tests/target/closure_visual_style.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/comment-inside-const.rs b/rustfmt-core/rustfmt-lib/tests/target/comment-inside-const.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/comment-inside-const.rs rename to rustfmt-core/rustfmt-lib/tests/target/comment-inside-const.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/comment-not-disappear.rs b/rustfmt-core/rustfmt-lib/tests/target/comment-not-disappear.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/comment-not-disappear.rs rename to rustfmt-core/rustfmt-lib/tests/target/comment-not-disappear.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/comment.rs b/rustfmt-core/rustfmt-lib/tests/target/comment.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/comment.rs rename to rustfmt-core/rustfmt-lib/tests/target/comment.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/comment2.rs b/rustfmt-core/rustfmt-lib/tests/target/comment2.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/comment2.rs rename to rustfmt-core/rustfmt-lib/tests/target/comment2.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/comment3.rs b/rustfmt-core/rustfmt-lib/tests/target/comment3.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/comment3.rs rename to rustfmt-core/rustfmt-lib/tests/target/comment3.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/comment4.rs b/rustfmt-core/rustfmt-lib/tests/target/comment4.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/comment4.rs rename to rustfmt-core/rustfmt-lib/tests/target/comment4.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/comment5.rs b/rustfmt-core/rustfmt-lib/tests/target/comment5.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/comment5.rs rename to rustfmt-core/rustfmt-lib/tests/target/comment5.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/comment6.rs b/rustfmt-core/rustfmt-lib/tests/target/comment6.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/comment6.rs rename to rustfmt-core/rustfmt-lib/tests/target/comment6.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/comment_crlf_newline.rs b/rustfmt-core/rustfmt-lib/tests/target/comment_crlf_newline.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/comment_crlf_newline.rs rename to rustfmt-core/rustfmt-lib/tests/target/comment_crlf_newline.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/comments-fn.rs b/rustfmt-core/rustfmt-lib/tests/target/comments-fn.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/comments-fn.rs rename to rustfmt-core/rustfmt-lib/tests/target/comments-fn.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/blank_lines_lower_bound/1.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/blank_lines_lower_bound/1.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/blank_lines_lower_bound/1.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/blank_lines_lower_bound/1.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/brace_style/fn_always_next_line.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/brace_style/fn_always_next_line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/brace_style/fn_always_next_line.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/brace_style/fn_always_next_line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/brace_style/fn_prefer_same_line.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/brace_style/fn_prefer_same_line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/brace_style/fn_prefer_same_line.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/brace_style/fn_prefer_same_line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/brace_style/fn_same_line_where.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/brace_style/fn_same_line_where.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/brace_style/fn_same_line_where.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/brace_style/fn_same_line_where.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/brace_style/item_always_next_line.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/brace_style/item_always_next_line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/brace_style/item_always_next_line.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/brace_style/item_always_next_line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/brace_style/item_prefer_same_line.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/brace_style/item_prefer_same_line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/brace_style/item_prefer_same_line.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/brace_style/item_prefer_same_line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/brace_style/item_same_line_where.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/brace_style/item_same_line_where.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/brace_style/item_same_line_where.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/brace_style/item_same_line_where.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/combine_control_expr/false.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/combine_control_expr/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/combine_control_expr/false.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/combine_control_expr/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/combine_control_expr/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/combine_control_expr/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/combine_control_expr/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/combine_control_expr/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/comment_width/above.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/comment_width/above.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/comment_width/above.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/comment_width/above.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/comment_width/below.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/comment_width/below.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/comment_width/below.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/comment_width/below.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/comment_width/ignore.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/comment_width/ignore.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/comment_width/ignore.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/comment_width/ignore.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/condense_wildcard_suffixes/false.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/condense_wildcard_suffixes/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/condense_wildcard_suffixes/false.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/condense_wildcard_suffixes/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/condense_wildcard_suffixes/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/condense_wildcard_suffixes/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/condense_wildcard_suffixes/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/condense_wildcard_suffixes/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/control_brace_style/always_next_line.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/control_brace_style/always_next_line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/control_brace_style/always_next_line.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/control_brace_style/always_next_line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/control_brace_style/always_same_line.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/control_brace_style/always_same_line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/control_brace_style/always_same_line.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/control_brace_style/always_same_line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/control_brace_style/closing_next_line.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/control_brace_style/closing_next_line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/control_brace_style/closing_next_line.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/control_brace_style/closing_next_line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/disable_all_formatting/false.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/disable_all_formatting/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/disable_all_formatting/false.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/disable_all_formatting/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/disable_all_formatting/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/disable_all_formatting/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/disable_all_formatting/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/disable_all_formatting/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/empty_item_single_line/false.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/empty_item_single_line/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/empty_item_single_line/false.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/empty_item_single_line/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/empty_item_single_line/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/empty_item_single_line/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/empty_item_single_line/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/empty_item_single_line/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/enum_discrim_align_threshold/40.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/enum_discrim_align_threshold/40.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/enum_discrim_align_threshold/40.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/enum_discrim_align_threshold/40.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/error_on_line_overflow/false.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/error_on_line_overflow/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/error_on_line_overflow/false.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/error_on_line_overflow/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/error_on_unformatted/false.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/error_on_unformatted/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/error_on_unformatted/false.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/error_on_unformatted/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/fn_args_layout/compressed.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/fn_args_layout/compressed.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/fn_args_layout/compressed.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/fn_args_layout/compressed.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/fn_args_layout/tall.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/fn_args_layout/tall.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/fn_args_layout/tall.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/fn_args_layout/tall.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/fn_args_layout/vertical.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/fn_args_layout/vertical.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/fn_args_layout/vertical.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/fn_args_layout/vertical.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/fn_single_line/false.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/fn_single_line/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/fn_single_line/false.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/fn_single_line/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/fn_single_line/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/fn_single_line/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/fn_single_line/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/fn_single_line/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/force_explicit_abi/false.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/force_explicit_abi/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/force_explicit_abi/false.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/force_explicit_abi/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/force_explicit_abi/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/force_explicit_abi/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/force_explicit_abi/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/force_explicit_abi/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/force_multiline_block/false.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/force_multiline_block/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/force_multiline_block/false.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/force_multiline_block/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/force_multiline_block/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/force_multiline_block/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/force_multiline_block/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/force_multiline_block/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/format_macro_bodies/false.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/format_macro_bodies/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/format_macro_bodies/false.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/format_macro_bodies/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/format_macro_bodies/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/format_macro_bodies/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/format_macro_bodies/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/format_macro_bodies/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/format_macro_matchers/false.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/format_macro_matchers/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/format_macro_matchers/false.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/format_macro_matchers/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/format_macro_matchers/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/format_macro_matchers/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/format_macro_matchers/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/format_macro_matchers/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/format_strings/false.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/format_strings/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/format_strings/false.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/format_strings/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/format_strings/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/format_strings/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/format_strings/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/format_strings/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/hard_tabs/false.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/hard_tabs/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/hard_tabs/false.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/hard_tabs/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/hard_tabs/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/hard_tabs/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/hard_tabs/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/hard_tabs/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/imports_indent/block.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/imports_indent/block.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/imports_indent/block.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/imports_indent/block.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/imports_layout/horizontal_vertical.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/imports_layout/horizontal_vertical.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/imports_layout/horizontal_vertical.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/imports_layout/horizontal_vertical.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/imports_layout/merge_mixed.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/imports_layout/merge_mixed.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/imports_layout/merge_mixed.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/imports_layout/merge_mixed.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/imports_layout/mixed.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/imports_layout/mixed.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/imports_layout/mixed.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/imports_layout/mixed.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_args.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/block_args.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_args.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/block_args.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_array.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/block_array.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_array.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/block_array.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_call.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/block_call.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_call.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/block_call.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_chain.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/block_chain.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_chain.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/block_chain.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_generic.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/block_generic.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_generic.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/block_generic.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_struct_lit.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/block_struct_lit.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_struct_lit.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/block_struct_lit.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_tab_spaces_call.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/block_tab_spaces_call.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_tab_spaces_call.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/block_tab_spaces_call.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_trailing_comma_call/two.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/block_trailing_comma_call/two.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_trailing_comma_call/two.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/block_trailing_comma_call/two.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_where_pred.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/block_where_pred.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/block_where_pred.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/block_where_pred.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/default.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/default.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/default.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/default.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/rfc_control.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/rfc_control.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/rfc_control.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/rfc_control.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/rfc_where.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/rfc_where.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/rfc_where.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/rfc_where.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_args.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/visual_args.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_args.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/visual_args.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_array.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/visual_array.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_array.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/visual_array.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_call.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/visual_call.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_call.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/visual_call.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_chain.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/visual_chain.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_chain.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/visual_chain.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_generics.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/visual_generics.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_generics.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/visual_generics.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_struct_lit.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/visual_struct_lit.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_struct_lit.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/visual_struct_lit.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_trailing_comma.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/visual_trailing_comma.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_trailing_comma.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/visual_trailing_comma.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_where_pred.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/visual_where_pred.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/indent_style/visual_where_pred.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/indent_style/visual_where_pred.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/match_arm_blocks/false.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/match_arm_blocks/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/match_arm_blocks/false.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/match_arm_blocks/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/match_arm_blocks/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/match_arm_blocks/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/match_arm_blocks/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/match_arm_blocks/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/match_block_trailing_comma/false.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/match_block_trailing_comma/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/match_block_trailing_comma/false.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/match_block_trailing_comma/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/match_block_trailing_comma/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/match_block_trailing_comma/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/match_block_trailing_comma/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/match_block_trailing_comma/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/merge_derives/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/merge_derives/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/merge_derives/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/merge_derives/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/normalize_comments/false.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/normalize_comments/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/normalize_comments/false.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/normalize_comments/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/normalize_comments/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/normalize_comments/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/normalize_comments/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/normalize_comments/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/normalize_doc_attributes/false.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/normalize_doc_attributes/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/normalize_doc_attributes/false.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/normalize_doc_attributes/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/normalize_doc_attributes/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/normalize_doc_attributes/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/normalize_doc_attributes/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/normalize_doc_attributes/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/recursive/disabled/foo.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/recursive/disabled/foo.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/recursive/disabled/foo.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/recursive/disabled/foo.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/recursive/disabled/lib.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/recursive/disabled/lib.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/recursive/disabled/lib.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/recursive/disabled/lib.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/recursive/enabled/foo.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/recursive/enabled/foo.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/recursive/enabled/foo.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/recursive/enabled/foo.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/recursive/enabled/lib.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/recursive/enabled/lib.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/recursive/enabled/lib.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/recursive/enabled/lib.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/remove_nested_parens/remove_nested_parens.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/remove_nested_parens/remove_nested_parens.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/remove_nested_parens/remove_nested_parens.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/remove_nested_parens/remove_nested_parens.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/reorder_impl_items/false.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/reorder_impl_items/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/reorder_impl_items/false.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/reorder_impl_items/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/reorder_impl_items/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/reorder_impl_items/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/reorder_impl_items/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/reorder_impl_items/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/reorder_imports/false.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/reorder_imports/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/reorder_imports/false.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/reorder_imports/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/reorder_imports/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/reorder_imports/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/reorder_imports/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/reorder_imports/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/reorder_modules/dolor/mod.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/reorder_modules/dolor/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/reorder_modules/dolor/mod.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/reorder_modules/dolor/mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/reorder_modules/false.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/reorder_modules/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/reorder_modules/false.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/reorder_modules/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/reorder_modules/ipsum/mod.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/reorder_modules/ipsum/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/reorder_modules/ipsum/mod.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/reorder_modules/ipsum/mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/reorder_modules/lorem/mod.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/reorder_modules/lorem/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/reorder_modules/lorem/mod.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/reorder_modules/lorem/mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/reorder_modules/sit/mod.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/reorder_modules/sit/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/reorder_modules/sit/mod.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/reorder_modules/sit/mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/reorder_modules/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/reorder_modules/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/reorder_modules/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/reorder_modules/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/skip_children/foo/mod.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/skip_children/foo/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/skip_children/foo/mod.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/skip_children/foo/mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/skip_children/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/skip_children/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/skip_children/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/skip_children/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/space_before_colon/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/space_before_colon/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/space_before_colon/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/space_before_colon/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/spaces_around_ranges/false.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/spaces_around_ranges/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/spaces_around_ranges/false.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/spaces_around_ranges/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/spaces_around_ranges/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/spaces_around_ranges/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/spaces_around_ranges/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/spaces_around_ranges/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/struct_field_align_threshold/20.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/struct_field_align_threshold/20.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/struct_field_align_threshold/20.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/struct_field_align_threshold/20.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/struct_lit_single_line/false.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/struct_lit_single_line/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/struct_lit_single_line/false.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/struct_lit_single_line/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/tab_spaces/2.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/tab_spaces/2.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/tab_spaces/2.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/tab_spaces/2.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/tab_spaces/4.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/tab_spaces/4.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/tab_spaces/4.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/tab_spaces/4.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/trailing_comma/always.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/trailing_comma/always.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/trailing_comma/always.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/trailing_comma/always.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/trailing_comma/never.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/trailing_comma/never.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/trailing_comma/never.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/trailing_comma/never.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/trailing_comma/vertical.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/trailing_comma/vertical.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/trailing_comma/vertical.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/trailing_comma/vertical.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/trailing_semicolon/false.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/trailing_semicolon/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/trailing_semicolon/false.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/trailing_semicolon/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/trailing_semicolon/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/trailing_semicolon/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/trailing_semicolon/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/trailing_semicolon/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/type_punctuation_density/compressed.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/type_punctuation_density/compressed.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/type_punctuation_density/compressed.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/type_punctuation_density/compressed.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/type_punctuation_density/wide.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/type_punctuation_density/wide.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/type_punctuation_density/wide.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/type_punctuation_density/wide.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/use_field_init_shorthand/false.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/use_field_init_shorthand/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/use_field_init_shorthand/false.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/use_field_init_shorthand/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/use_field_init_shorthand/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/use_field_init_shorthand/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/use_field_init_shorthand/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/use_field_init_shorthand/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/use_small_heuristics/max.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/use_small_heuristics/max.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/use_small_heuristics/max.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/use_small_heuristics/max.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/use_try_shorthand/false.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/use_try_shorthand/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/use_try_shorthand/false.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/use_try_shorthand/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/use_try_shorthand/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/use_try_shorthand/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/use_try_shorthand/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/use_try_shorthand/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/use_try_shorthand/true_2015_edition.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/use_try_shorthand/true_2015_edition.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/use_try_shorthand/true_2015_edition.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/use_try_shorthand/true_2015_edition.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/where_single_line/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/where_single_line/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/where_single_line/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/where_single_line/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/wrap_comments/false.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/wrap_comments/false.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/wrap_comments/false.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/wrap_comments/false.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/configs/wrap_comments/true.rs b/rustfmt-core/rustfmt-lib/tests/target/configs/wrap_comments/true.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/configs/wrap_comments/true.rs rename to rustfmt-core/rustfmt-lib/tests/target/configs/wrap_comments/true.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/const_generics.rs b/rustfmt-core/rustfmt-lib/tests/target/const_generics.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/const_generics.rs rename to rustfmt-core/rustfmt-lib/tests/target/const_generics.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/control-brace-style-always-next-line.rs b/rustfmt-core/rustfmt-lib/tests/target/control-brace-style-always-next-line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/control-brace-style-always-next-line.rs rename to rustfmt-core/rustfmt-lib/tests/target/control-brace-style-always-next-line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/control-brace-style-always-same-line.rs b/rustfmt-core/rustfmt-lib/tests/target/control-brace-style-always-same-line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/control-brace-style-always-same-line.rs rename to rustfmt-core/rustfmt-lib/tests/target/control-brace-style-always-same-line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/doc-attrib.rs b/rustfmt-core/rustfmt-lib/tests/target/doc-attrib.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/doc-attrib.rs rename to rustfmt-core/rustfmt-lib/tests/target/doc-attrib.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/doc-comment-with-example.rs b/rustfmt-core/rustfmt-lib/tests/target/doc-comment-with-example.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/doc-comment-with-example.rs rename to rustfmt-core/rustfmt-lib/tests/target/doc-comment-with-example.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/doc.rs b/rustfmt-core/rustfmt-lib/tests/target/doc.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/doc.rs rename to rustfmt-core/rustfmt-lib/tests/target/doc.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/dyn_trait.rs b/rustfmt-core/rustfmt-lib/tests/target/dyn_trait.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/dyn_trait.rs rename to rustfmt-core/rustfmt-lib/tests/target/dyn_trait.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/else-if-brace-style-always-next-line.rs b/rustfmt-core/rustfmt-lib/tests/target/else-if-brace-style-always-next-line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/else-if-brace-style-always-next-line.rs rename to rustfmt-core/rustfmt-lib/tests/target/else-if-brace-style-always-next-line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/else-if-brace-style-always-same-line.rs b/rustfmt-core/rustfmt-lib/tests/target/else-if-brace-style-always-same-line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/else-if-brace-style-always-same-line.rs rename to rustfmt-core/rustfmt-lib/tests/target/else-if-brace-style-always-same-line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/else-if-brace-style-closing-next-line.rs b/rustfmt-core/rustfmt-lib/tests/target/else-if-brace-style-closing-next-line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/else-if-brace-style-closing-next-line.rs rename to rustfmt-core/rustfmt-lib/tests/target/else-if-brace-style-closing-next-line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/empty-tuple-no-conversion-to-unit-struct.rs b/rustfmt-core/rustfmt-lib/tests/target/empty-tuple-no-conversion-to-unit-struct.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/empty-tuple-no-conversion-to-unit-struct.rs rename to rustfmt-core/rustfmt-lib/tests/target/empty-tuple-no-conversion-to-unit-struct.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/empty_file.rs b/rustfmt-core/rustfmt-lib/tests/target/empty_file.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/empty_file.rs rename to rustfmt-core/rustfmt-lib/tests/target/empty_file.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/enum.rs b/rustfmt-core/rustfmt-lib/tests/target/enum.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/enum.rs rename to rustfmt-core/rustfmt-lib/tests/target/enum.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/existential_type.rs b/rustfmt-core/rustfmt-lib/tests/target/existential_type.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/existential_type.rs rename to rustfmt-core/rustfmt-lib/tests/target/existential_type.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/expr-block.rs b/rustfmt-core/rustfmt-lib/tests/target/expr-block.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/expr-block.rs rename to rustfmt-core/rustfmt-lib/tests/target/expr-block.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/expr-overflow-delimited.rs b/rustfmt-core/rustfmt-lib/tests/target/expr-overflow-delimited.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/expr-overflow-delimited.rs rename to rustfmt-core/rustfmt-lib/tests/target/expr-overflow-delimited.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/expr.rs b/rustfmt-core/rustfmt-lib/tests/target/expr.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/expr.rs rename to rustfmt-core/rustfmt-lib/tests/target/expr.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/extern.rs b/rustfmt-core/rustfmt-lib/tests/target/extern.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/extern.rs rename to rustfmt-core/rustfmt-lib/tests/target/extern.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/extern_not_explicit.rs b/rustfmt-core/rustfmt-lib/tests/target/extern_not_explicit.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/extern_not_explicit.rs rename to rustfmt-core/rustfmt-lib/tests/target/extern_not_explicit.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/file-lines-1.rs b/rustfmt-core/rustfmt-lib/tests/target/file-lines-1.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/file-lines-1.rs rename to rustfmt-core/rustfmt-lib/tests/target/file-lines-1.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/file-lines-2.rs b/rustfmt-core/rustfmt-lib/tests/target/file-lines-2.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/file-lines-2.rs rename to rustfmt-core/rustfmt-lib/tests/target/file-lines-2.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/file-lines-3.rs b/rustfmt-core/rustfmt-lib/tests/target/file-lines-3.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/file-lines-3.rs rename to rustfmt-core/rustfmt-lib/tests/target/file-lines-3.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/file-lines-4.rs b/rustfmt-core/rustfmt-lib/tests/target/file-lines-4.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/file-lines-4.rs rename to rustfmt-core/rustfmt-lib/tests/target/file-lines-4.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/file-lines-5.rs b/rustfmt-core/rustfmt-lib/tests/target/file-lines-5.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/file-lines-5.rs rename to rustfmt-core/rustfmt-lib/tests/target/file-lines-5.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/file-lines-6.rs b/rustfmt-core/rustfmt-lib/tests/target/file-lines-6.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/file-lines-6.rs rename to rustfmt-core/rustfmt-lib/tests/target/file-lines-6.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/file-lines-7.rs b/rustfmt-core/rustfmt-lib/tests/target/file-lines-7.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/file-lines-7.rs rename to rustfmt-core/rustfmt-lib/tests/target/file-lines-7.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/file-lines-8.rs b/rustfmt-core/rustfmt-lib/tests/target/file-lines-8.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/file-lines-8.rs rename to rustfmt-core/rustfmt-lib/tests/target/file-lines-8.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/file-lines-item.rs b/rustfmt-core/rustfmt-lib/tests/target/file-lines-item.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/file-lines-item.rs rename to rustfmt-core/rustfmt-lib/tests/target/file-lines-item.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/fn-args-with-last-line-comment.rs b/rustfmt-core/rustfmt-lib/tests/target/fn-args-with-last-line-comment.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/fn-args-with-last-line-comment.rs rename to rustfmt-core/rustfmt-lib/tests/target/fn-args-with-last-line-comment.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/fn-custom-2.rs b/rustfmt-core/rustfmt-lib/tests/target/fn-custom-2.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/fn-custom-2.rs rename to rustfmt-core/rustfmt-lib/tests/target/fn-custom-2.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/fn-custom-3.rs b/rustfmt-core/rustfmt-lib/tests/target/fn-custom-3.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/fn-custom-3.rs rename to rustfmt-core/rustfmt-lib/tests/target/fn-custom-3.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/fn-custom-4.rs b/rustfmt-core/rustfmt-lib/tests/target/fn-custom-4.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/fn-custom-4.rs rename to rustfmt-core/rustfmt-lib/tests/target/fn-custom-4.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/fn-custom-6.rs b/rustfmt-core/rustfmt-lib/tests/target/fn-custom-6.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/fn-custom-6.rs rename to rustfmt-core/rustfmt-lib/tests/target/fn-custom-6.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/fn-custom-7.rs b/rustfmt-core/rustfmt-lib/tests/target/fn-custom-7.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/fn-custom-7.rs rename to rustfmt-core/rustfmt-lib/tests/target/fn-custom-7.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/fn-custom-8.rs b/rustfmt-core/rustfmt-lib/tests/target/fn-custom-8.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/fn-custom-8.rs rename to rustfmt-core/rustfmt-lib/tests/target/fn-custom-8.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/fn-custom.rs b/rustfmt-core/rustfmt-lib/tests/target/fn-custom.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/fn-custom.rs rename to rustfmt-core/rustfmt-lib/tests/target/fn-custom.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/fn-param-attributes.rs b/rustfmt-core/rustfmt-lib/tests/target/fn-param-attributes.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/fn-param-attributes.rs rename to rustfmt-core/rustfmt-lib/tests/target/fn-param-attributes.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/fn-simple.rs b/rustfmt-core/rustfmt-lib/tests/target/fn-simple.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/fn-simple.rs rename to rustfmt-core/rustfmt-lib/tests/target/fn-simple.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/fn-single-line/version_two.rs b/rustfmt-core/rustfmt-lib/tests/target/fn-single-line/version_two.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/fn-single-line/version_two.rs rename to rustfmt-core/rustfmt-lib/tests/target/fn-single-line/version_two.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/fn-ty.rs b/rustfmt-core/rustfmt-lib/tests/target/fn-ty.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/fn-ty.rs rename to rustfmt-core/rustfmt-lib/tests/target/fn-ty.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/fn.rs b/rustfmt-core/rustfmt-lib/tests/target/fn.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/fn.rs rename to rustfmt-core/rustfmt-lib/tests/target/fn.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/fn_args_indent-block.rs b/rustfmt-core/rustfmt-lib/tests/target/fn_args_indent-block.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/fn_args_indent-block.rs rename to rustfmt-core/rustfmt-lib/tests/target/fn_args_indent-block.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/fn_args_layout-vertical.rs b/rustfmt-core/rustfmt-lib/tests/target/fn_args_layout-vertical.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/fn_args_layout-vertical.rs rename to rustfmt-core/rustfmt-lib/tests/target/fn_args_layout-vertical.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/fn_once.rs b/rustfmt-core/rustfmt-lib/tests/target/fn_once.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/fn_once.rs rename to rustfmt-core/rustfmt-lib/tests/target/fn_once.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/format_strings/issue-202.rs b/rustfmt-core/rustfmt-lib/tests/target/format_strings/issue-202.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/format_strings/issue-202.rs rename to rustfmt-core/rustfmt-lib/tests/target/format_strings/issue-202.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/format_strings/issue-2833.rs b/rustfmt-core/rustfmt-lib/tests/target/format_strings/issue-2833.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/format_strings/issue-2833.rs rename to rustfmt-core/rustfmt-lib/tests/target/format_strings/issue-2833.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/format_strings/issue-3263.rs b/rustfmt-core/rustfmt-lib/tests/target/format_strings/issue-3263.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/format_strings/issue-3263.rs rename to rustfmt-core/rustfmt-lib/tests/target/format_strings/issue-3263.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/format_strings/issue-687.rs b/rustfmt-core/rustfmt-lib/tests/target/format_strings/issue-687.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/format_strings/issue-687.rs rename to rustfmt-core/rustfmt-lib/tests/target/format_strings/issue-687.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/format_strings/issue564.rs b/rustfmt-core/rustfmt-lib/tests/target/format_strings/issue564.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/format_strings/issue564.rs rename to rustfmt-core/rustfmt-lib/tests/target/format_strings/issue564.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/hard-tabs.rs b/rustfmt-core/rustfmt-lib/tests/target/hard-tabs.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/hard-tabs.rs rename to rustfmt-core/rustfmt-lib/tests/target/hard-tabs.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/hello.rs b/rustfmt-core/rustfmt-lib/tests/target/hello.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/hello.rs rename to rustfmt-core/rustfmt-lib/tests/target/hello.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/if_while_or_patterns.rs b/rustfmt-core/rustfmt-lib/tests/target/if_while_or_patterns.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/if_while_or_patterns.rs rename to rustfmt-core/rustfmt-lib/tests/target/if_while_or_patterns.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/immovable_generators.rs b/rustfmt-core/rustfmt-lib/tests/target/immovable_generators.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/immovable_generators.rs rename to rustfmt-core/rustfmt-lib/tests/target/immovable_generators.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/impl.rs b/rustfmt-core/rustfmt-lib/tests/target/impl.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/impl.rs rename to rustfmt-core/rustfmt-lib/tests/target/impl.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/impls.rs b/rustfmt-core/rustfmt-lib/tests/target/impls.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/impls.rs rename to rustfmt-core/rustfmt-lib/tests/target/impls.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/import-fencepost-length.rs b/rustfmt-core/rustfmt-lib/tests/target/import-fencepost-length.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/import-fencepost-length.rs rename to rustfmt-core/rustfmt-lib/tests/target/import-fencepost-length.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/imports-impl-only-use.rs b/rustfmt-core/rustfmt-lib/tests/target/imports-impl-only-use.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/imports-impl-only-use.rs rename to rustfmt-core/rustfmt-lib/tests/target/imports-impl-only-use.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/imports-reorder-lines-and-items.rs b/rustfmt-core/rustfmt-lib/tests/target/imports-reorder-lines-and-items.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/imports-reorder-lines-and-items.rs rename to rustfmt-core/rustfmt-lib/tests/target/imports-reorder-lines-and-items.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/imports-reorder-lines.rs b/rustfmt-core/rustfmt-lib/tests/target/imports-reorder-lines.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/imports-reorder-lines.rs rename to rustfmt-core/rustfmt-lib/tests/target/imports-reorder-lines.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/imports-reorder.rs b/rustfmt-core/rustfmt-lib/tests/target/imports-reorder.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/imports-reorder.rs rename to rustfmt-core/rustfmt-lib/tests/target/imports-reorder.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/imports.rs b/rustfmt-core/rustfmt-lib/tests/target/imports.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/imports.rs rename to rustfmt-core/rustfmt-lib/tests/target/imports.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/imports_2015_edition.rs b/rustfmt-core/rustfmt-lib/tests/target/imports_2015_edition.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/imports_2015_edition.rs rename to rustfmt-core/rustfmt-lib/tests/target/imports_2015_edition.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/imports_block_indent.rs b/rustfmt-core/rustfmt-lib/tests/target/imports_block_indent.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/imports_block_indent.rs rename to rustfmt-core/rustfmt-lib/tests/target/imports_block_indent.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/imports_raw_identifiers.rs b/rustfmt-core/rustfmt-lib/tests/target/imports_raw_identifiers.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/imports_raw_identifiers.rs rename to rustfmt-core/rustfmt-lib/tests/target/imports_raw_identifiers.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/indented-impl.rs b/rustfmt-core/rustfmt-lib/tests/target/indented-impl.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/indented-impl.rs rename to rustfmt-core/rustfmt-lib/tests/target/indented-impl.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/invalid-rust-code-in-doc-comment.rs b/rustfmt-core/rustfmt-lib/tests/target/invalid-rust-code-in-doc-comment.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/invalid-rust-code-in-doc-comment.rs rename to rustfmt-core/rustfmt-lib/tests/target/invalid-rust-code-in-doc-comment.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1021.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1021.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1021.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1021.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1049.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1049.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1049.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1049.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1055.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1055.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1055.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1055.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1096.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1096.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1096.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1096.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1111.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1111.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1111.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1111.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1113.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1113.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1113.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1113.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1120.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1120.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1120.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1120.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1124.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1124.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1124.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1124.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1127.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1127.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1127.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1127.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1158.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1158.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1158.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1158.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1177.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1177.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1177.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1177.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1192.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1192.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1192.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1192.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1210/a.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1210/a.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1210/a.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1210/a.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1210/b.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1210/b.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1210/b.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1210/b.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1210/c.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1210/c.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1210/c.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1210/c.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1210/d.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1210/d.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1210/d.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1210/d.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1210/e.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1210/e.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1210/e.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1210/e.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1211.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1211.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1211.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1211.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1214.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1214.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1214.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1214.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1216.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1216.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1216.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1216.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1239.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1239.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1239.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1239.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1247.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1247.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1247.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1247.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1255.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1255.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1255.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1255.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1278.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1278.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1278.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1278.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1350.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1350.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1350.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1350.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1366.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1366.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1366.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1366.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1397.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1397.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1397.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1397.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1468.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1468.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1468.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1468.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1598.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1598.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1598.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1598.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1624.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1624.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1624.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1624.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1681.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1681.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1681.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1681.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1693.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1693.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1693.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1693.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1703.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1703.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1703.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1703.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1800.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1800.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1800.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1800.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1802.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1802.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1802.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1802.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1824.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1824.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1824.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1824.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-1914.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-1914.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-1914.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-1914.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2025.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2025.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2025.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2025.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2103.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2103.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2103.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2103.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2111.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2111.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2111.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2111.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2123.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2123.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2123.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2123.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2164.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2164.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2164.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2164.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2179/two.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2179/two.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2179/two.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2179/two.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2197.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2197.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2197.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2197.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2256.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2256.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2256.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2256.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2324.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2324.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2324.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2324.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2329.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2329.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2329.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2329.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2342.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2342.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2342.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2342.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2346.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2346.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2346.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2346.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2401.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2401.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2401.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2401.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2445.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2445.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2445.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2445.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2446.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2446.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2446.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2446.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2479.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2479.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2479.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2479.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2482/a.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2482/a.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2482/a.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2482/a.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2482/b.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2482/b.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2482/b.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2482/b.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2482/c.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2482/c.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2482/c.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2482/c.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2496.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2496.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2496.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2496.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2520.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2520.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2520.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2520.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2523.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2523.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2523.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2523.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2526.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2526.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2526.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2526.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2551.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2551.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2551.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2551.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2554.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2554.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2554.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2554.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2582.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2582.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2582.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2582.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2641.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2641.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2641.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2641.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2644.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2644.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2644.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2644.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2673-nonmodrs-mods/foo.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2673-nonmodrs-mods/foo.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2673-nonmodrs-mods/foo.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2673-nonmodrs-mods/foo.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2673-nonmodrs-mods/foo/bar.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2673-nonmodrs-mods/foo/bar.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2673-nonmodrs-mods/foo/bar.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2673-nonmodrs-mods/foo/bar.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2673-nonmodrs-mods/lib.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2673-nonmodrs-mods/lib.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2673-nonmodrs-mods/lib.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2673-nonmodrs-mods/lib.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2728.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2728.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2728.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2728.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2759.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2759.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2759.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2759.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2761.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2761.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2761.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2761.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2794.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2794.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2794.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2794.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2810.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2810.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2810.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2810.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2835.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2835.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2835.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2835.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2863.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2863.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2863.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2863.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2869.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2869.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2869.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2869.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2896.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2896.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2896.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2896.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2916.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2916.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2916.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2916.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2917/minimal.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2917/minimal.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2917/minimal.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2917/minimal.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2917/packed_simd.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2917/packed_simd.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2917/packed_simd.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2917/packed_simd.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2922.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2922.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2922.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2922.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2927-2.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2927-2.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2927-2.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2927-2.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2927.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2927.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2927.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2927.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2930.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2930.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2930.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2930.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2936.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2936.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2936.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2936.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2941.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2941.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2941.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2941.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2955.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2955.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2955.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2955.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2973.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2973.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2973.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2973.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2976.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2976.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2976.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2976.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2977/block.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2977/block.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2977/block.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2977/block.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2977/impl.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2977/impl.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2977/impl.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2977/impl.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2977/item.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2977/item.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2977/item.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2977/item.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2977/trait.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2977/trait.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2977/trait.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2977/trait.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2985.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2985.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2985.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2985.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-2995.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-2995.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-2995.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-2995.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3029.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3029.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3029.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3029.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3032.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3032.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3032.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3032.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3038.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3038.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3038.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3038.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3043.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3043.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3043.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3043.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3049.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3049.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3049.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3049.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3055/backtick.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3055/backtick.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3055/backtick.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3055/backtick.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3055/empty-code-block.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3055/empty-code-block.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3055/empty-code-block.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3055/empty-code-block.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3055/original.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3055/original.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3055/original.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3055/original.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3059.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3059.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3059.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3059.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3066.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3066.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3066.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3066.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3105.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3105.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3105.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3105.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3118.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3118.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3118.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3118.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3124.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3124.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3124.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3124.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3131.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3131.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3131.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3131.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3132.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3132.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3132.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3132.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3153.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3153.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3153.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3153.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3170.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3170.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3170.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3170.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3182.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3182.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3182.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3182.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3184.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3184.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3184.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3184.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3194.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3194.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3194.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3194.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3198.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3198.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3198.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3198.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3213/version_two.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3213/version_two.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3213/version_two.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3213/version_two.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3217.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3217.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3217.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3217.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3224.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3224.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3224.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3224.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3227/two.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3227/two.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3227/two.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3227/two.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3234.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3234.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3234.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3234.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3241.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3241.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3241.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3241.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3253/bar.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3253/bar.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3253/bar.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3253/bar.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3253/foo.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3253/foo.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3253/foo.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3253/foo.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3253/lib.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3253/lib.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3253/lib.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3253/lib.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3253/paths/bar_foo.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3253/paths/bar_foo.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3253/paths/bar_foo.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3253/paths/bar_foo.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3253/paths/excluded.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3253/paths/excluded.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3253/paths/excluded.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3253/paths/excluded.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3253/paths/foo_bar.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3253/paths/foo_bar.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3253/paths/foo_bar.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3253/paths/foo_bar.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3265.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3265.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3265.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3265.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3270/two.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3270/two.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3270/two.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3270/two.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3270/wrap.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3270/wrap.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3270/wrap.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3270/wrap.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3272/v2.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3272/v2.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3272/v2.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3272/v2.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3278/version_two.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3278/version_two.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3278/version_two.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3278/version_two.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3295/two.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3295/two.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3295/two.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3295/two.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3302.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3302.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3302.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3302.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3304.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3304.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3304.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3304.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3314.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3314.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3314.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3314.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3343.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3343.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3343.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3343.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3423.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3423.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3423.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3423.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3434/lib.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3434/lib.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3434/lib.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3434/lib.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3434/no_entry.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3434/no_entry.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3434/no_entry.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3434/no_entry.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3434/not_skip_macro.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3434/not_skip_macro.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3434/not_skip_macro.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3434/not_skip_macro.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3442.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3442.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3442.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3442.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3465.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3465.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3465.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3465.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3494/crlf.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3494/crlf.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3494/crlf.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3494/crlf.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3494/lf.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3494/lf.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3494/lf.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3494/lf.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3499.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3499.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3499.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3499.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3508.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3508.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3508.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3508.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3515.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3515.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3515.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3515.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3532.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3532.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3532.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3532.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3539.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3539.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3539.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3539.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3554.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3554.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3554.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3554.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3567.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3567.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3567.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3567.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3568.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3568.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3568.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3568.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3585/extern_crate.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3585/extern_crate.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3585/extern_crate.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3585/extern_crate.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3585/reorder_imports_disabled.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3585/reorder_imports_disabled.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3585/reorder_imports_disabled.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3585/reorder_imports_disabled.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3585/reorder_imports_enabled.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3585/reorder_imports_enabled.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3585/reorder_imports_enabled.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3585/reorder_imports_enabled.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3585/use.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3585/use.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3585/use.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3585/use.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3592.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3592.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3592.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3592.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3595.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3595.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3595.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3595.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3601.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3601.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3601.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3601.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3614/version_two.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3614/version_two.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3614/version_two.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3614/version_two.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3636.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3636.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3636.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3636.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3639.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3639.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3639.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3639.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3645.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3645.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3645.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3645.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3651.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3651.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3651.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3651.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3665/lib.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3665/lib.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3665/lib.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3665/lib.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3665/not_skip_attribute.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3665/not_skip_attribute.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3665/not_skip_attribute.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3665/not_skip_attribute.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3665/sub_mod.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3665/sub_mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3665/sub_mod.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3665/sub_mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3672.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3672.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3672.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3672.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3675.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3675.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3675.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3675.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3701/two.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3701/two.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3701/two.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3701/two.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3709.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3709.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3709.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3709.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3711.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3711.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3711.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3711.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3717.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3717.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3717.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3717.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3718.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3718.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3718.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3718.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3740.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3740.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3740.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3740.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3741.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3741.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3741.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3741.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3750.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3750.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3750.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3750.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3751.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3751.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3751.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3751.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3759.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3759.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3759.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3759.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3779/ice.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3779/ice.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3779/ice.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3779/ice.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3779/lib.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3779/lib.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3779/lib.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3779/lib.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3786.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3786.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3786.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3786.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3787.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3787.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3787.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3787.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3815.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3815.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3815.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3815.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3840/version-two_hard-tabs.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3840/version-two_hard-tabs.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3840/version-two_hard-tabs.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3840/version-two_hard-tabs.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3840/version-two_soft-tabs.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3840/version-two_soft-tabs.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3840/version-two_soft-tabs.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3840/version-two_soft-tabs.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3845.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3845.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3845.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3845.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3851.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3851.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3851.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3851.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3882.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3882.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3882.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3882.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3904/two.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3904/two.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3904/two.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3904/two.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3908.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3908.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3908.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3908.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3923.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3923.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3923.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3923.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3929.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3929.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3929.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3929.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3933/imp-a.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3933/imp-a.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3933/imp-a.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3933/imp-a.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3933/imp-b.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3933/imp-b.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3933/imp-b.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3933/imp-b.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3933/lib.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3933/lib.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3933/lib.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3933/lib.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3933/utils.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3933/utils.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3933/utils.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3933/utils.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3934.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3934.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3934.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3934.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3956/graphics.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3956/graphics.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3956/graphics.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3956/graphics.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3956/graphics_emu.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3956/graphics_emu.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3956/graphics_emu.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3956/graphics_emu.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3956/lib.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3956/lib.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3956/lib.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3956/lib.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3974.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3974.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3974.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3974.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-3992.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-3992.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-3992.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-3992.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-447.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-447.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-447.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-447.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-510.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-510.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-510.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-510.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-539.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-539.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-539.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-539.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-64.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-64.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-64.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-64.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-683.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-683.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-683.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-683.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-691.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-691.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-691.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-691.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-770.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-770.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-770.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-770.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-811.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-811.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-811.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-811.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-831.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-831.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-831.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-831.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-850.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-850.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-850.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-850.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-855.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-855.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-855.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-855.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-913.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-913.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-913.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-913.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-945.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-945.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-945.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-945.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue-977.rs b/rustfmt-core/rustfmt-lib/tests/target/issue-977.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue-977.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue-977.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue_3839.rs b/rustfmt-core/rustfmt-lib/tests/target/issue_3839.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue_3839.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue_3839.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue_3844.rs b/rustfmt-core/rustfmt-lib/tests/target/issue_3844.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue_3844.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue_3844.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue_3853.rs b/rustfmt-core/rustfmt-lib/tests/target/issue_3853.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue_3853.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue_3853.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue_3854.rs b/rustfmt-core/rustfmt-lib/tests/target/issue_3854.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue_3854.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue_3854.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/issue_3868.rs b/rustfmt-core/rustfmt-lib/tests/target/issue_3868.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/issue_3868.rs rename to rustfmt-core/rustfmt-lib/tests/target/issue_3868.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/item-brace-style-always-next-line.rs b/rustfmt-core/rustfmt-lib/tests/target/item-brace-style-always-next-line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/item-brace-style-always-next-line.rs rename to rustfmt-core/rustfmt-lib/tests/target/item-brace-style-always-next-line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/item-brace-style-prefer-same-line.rs b/rustfmt-core/rustfmt-lib/tests/target/item-brace-style-prefer-same-line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/item-brace-style-prefer-same-line.rs rename to rustfmt-core/rustfmt-lib/tests/target/item-brace-style-prefer-same-line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/item-brace-style-same-line-where.rs b/rustfmt-core/rustfmt-lib/tests/target/item-brace-style-same-line-where.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/item-brace-style-same-line-where.rs rename to rustfmt-core/rustfmt-lib/tests/target/item-brace-style-same-line-where.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/itemized-blocks/no_wrap.rs b/rustfmt-core/rustfmt-lib/tests/target/itemized-blocks/no_wrap.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/itemized-blocks/no_wrap.rs rename to rustfmt-core/rustfmt-lib/tests/target/itemized-blocks/no_wrap.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/itemized-blocks/rewrite_fail.rs b/rustfmt-core/rustfmt-lib/tests/target/itemized-blocks/rewrite_fail.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/itemized-blocks/rewrite_fail.rs rename to rustfmt-core/rustfmt-lib/tests/target/itemized-blocks/rewrite_fail.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/itemized-blocks/urls.rs b/rustfmt-core/rustfmt-lib/tests/target/itemized-blocks/urls.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/itemized-blocks/urls.rs rename to rustfmt-core/rustfmt-lib/tests/target/itemized-blocks/urls.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/itemized-blocks/wrap.rs b/rustfmt-core/rustfmt-lib/tests/target/itemized-blocks/wrap.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/itemized-blocks/wrap.rs rename to rustfmt-core/rustfmt-lib/tests/target/itemized-blocks/wrap.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/label_break.rs b/rustfmt-core/rustfmt-lib/tests/target/label_break.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/label_break.rs rename to rustfmt-core/rustfmt-lib/tests/target/label_break.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/large-block.rs b/rustfmt-core/rustfmt-lib/tests/target/large-block.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/large-block.rs rename to rustfmt-core/rustfmt-lib/tests/target/large-block.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/large_vec.rs b/rustfmt-core/rustfmt-lib/tests/target/large_vec.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/large_vec.rs rename to rustfmt-core/rustfmt-lib/tests/target/large_vec.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/lazy_static.rs b/rustfmt-core/rustfmt-lib/tests/target/lazy_static.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/lazy_static.rs rename to rustfmt-core/rustfmt-lib/tests/target/lazy_static.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/license-templates/empty_license_path.rs b/rustfmt-core/rustfmt-lib/tests/target/license-templates/empty_license_path.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/license-templates/empty_license_path.rs rename to rustfmt-core/rustfmt-lib/tests/target/license-templates/empty_license_path.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/license-templates/license.rs b/rustfmt-core/rustfmt-lib/tests/target/license-templates/license.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/license-templates/license.rs rename to rustfmt-core/rustfmt-lib/tests/target/license-templates/license.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/long-fn-1/version_two.rs b/rustfmt-core/rustfmt-lib/tests/target/long-fn-1/version_two.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/long-fn-1/version_two.rs rename to rustfmt-core/rustfmt-lib/tests/target/long-fn-1/version_two.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/long-match-arms-brace-newline.rs b/rustfmt-core/rustfmt-lib/tests/target/long-match-arms-brace-newline.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/long-match-arms-brace-newline.rs rename to rustfmt-core/rustfmt-lib/tests/target/long-match-arms-brace-newline.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/long-use-statement-issue-3154.rs b/rustfmt-core/rustfmt-lib/tests/target/long-use-statement-issue-3154.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/long-use-statement-issue-3154.rs rename to rustfmt-core/rustfmt-lib/tests/target/long-use-statement-issue-3154.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/long_field_access.rs b/rustfmt-core/rustfmt-lib/tests/target/long_field_access.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/long_field_access.rs rename to rustfmt-core/rustfmt-lib/tests/target/long_field_access.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/loop.rs b/rustfmt-core/rustfmt-lib/tests/target/loop.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/loop.rs rename to rustfmt-core/rustfmt-lib/tests/target/loop.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/macro_not_expr.rs b/rustfmt-core/rustfmt-lib/tests/target/macro_not_expr.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/macro_not_expr.rs rename to rustfmt-core/rustfmt-lib/tests/target/macro_not_expr.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/macro_rules.rs b/rustfmt-core/rustfmt-lib/tests/target/macro_rules.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/macro_rules.rs rename to rustfmt-core/rustfmt-lib/tests/target/macro_rules.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/macros.rs b/rustfmt-core/rustfmt-lib/tests/target/macros.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/macros.rs rename to rustfmt-core/rustfmt-lib/tests/target/macros.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/markdown-comment-with-options.rs b/rustfmt-core/rustfmt-lib/tests/target/markdown-comment-with-options.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/markdown-comment-with-options.rs rename to rustfmt-core/rustfmt-lib/tests/target/markdown-comment-with-options.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/markdown-comment.rs b/rustfmt-core/rustfmt-lib/tests/target/markdown-comment.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/markdown-comment.rs rename to rustfmt-core/rustfmt-lib/tests/target/markdown-comment.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/match-block-trailing-comma.rs b/rustfmt-core/rustfmt-lib/tests/target/match-block-trailing-comma.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/match-block-trailing-comma.rs rename to rustfmt-core/rustfmt-lib/tests/target/match-block-trailing-comma.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/match-flattening.rs b/rustfmt-core/rustfmt-lib/tests/target/match-flattening.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/match-flattening.rs rename to rustfmt-core/rustfmt-lib/tests/target/match-flattening.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/match-nowrap-trailing-comma.rs b/rustfmt-core/rustfmt-lib/tests/target/match-nowrap-trailing-comma.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/match-nowrap-trailing-comma.rs rename to rustfmt-core/rustfmt-lib/tests/target/match-nowrap-trailing-comma.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/match-nowrap.rs b/rustfmt-core/rustfmt-lib/tests/target/match-nowrap.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/match-nowrap.rs rename to rustfmt-core/rustfmt-lib/tests/target/match-nowrap.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/match.rs b/rustfmt-core/rustfmt-lib/tests/target/match.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/match.rs rename to rustfmt-core/rustfmt-lib/tests/target/match.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/match_overflow_expr.rs b/rustfmt-core/rustfmt-lib/tests/target/match_overflow_expr.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/match_overflow_expr.rs rename to rustfmt-core/rustfmt-lib/tests/target/match_overflow_expr.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/max-line-length-in-chars.rs b/rustfmt-core/rustfmt-lib/tests/target/max-line-length-in-chars.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/max-line-length-in-chars.rs rename to rustfmt-core/rustfmt-lib/tests/target/max-line-length-in-chars.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/merge_imports.rs b/rustfmt-core/rustfmt-lib/tests/target/merge_imports.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/merge_imports.rs rename to rustfmt-core/rustfmt-lib/tests/target/merge_imports.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/mod-1.rs b/rustfmt-core/rustfmt-lib/tests/target/mod-1.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/mod-1.rs rename to rustfmt-core/rustfmt-lib/tests/target/mod-1.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/mod-2.rs b/rustfmt-core/rustfmt-lib/tests/target/mod-2.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/mod-2.rs rename to rustfmt-core/rustfmt-lib/tests/target/mod-2.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/mod_skip_child.rs b/rustfmt-core/rustfmt-lib/tests/target/mod_skip_child.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/mod_skip_child.rs rename to rustfmt-core/rustfmt-lib/tests/target/mod_skip_child.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/multi-file.rs b/rustfmt-core/rustfmt-lib/tests/target/multi-file.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/multi-file.rs rename to rustfmt-core/rustfmt-lib/tests/target/multi-file.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/multiline_string_in_macro_def.rs b/rustfmt-core/rustfmt-lib/tests/target/multiline_string_in_macro_def.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/multiline_string_in_macro_def.rs rename to rustfmt-core/rustfmt-lib/tests/target/multiline_string_in_macro_def.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/multiple.rs b/rustfmt-core/rustfmt-lib/tests/target/multiple.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/multiple.rs rename to rustfmt-core/rustfmt-lib/tests/target/multiple.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/nested-if-else.rs b/rustfmt-core/rustfmt-lib/tests/target/nested-if-else.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/nested-if-else.rs rename to rustfmt-core/rustfmt-lib/tests/target/nested-if-else.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/nested-visual-block.rs b/rustfmt-core/rustfmt-lib/tests/target/nested-visual-block.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/nested-visual-block.rs rename to rustfmt-core/rustfmt-lib/tests/target/nested-visual-block.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/nested_skipped/mod.rs b/rustfmt-core/rustfmt-lib/tests/target/nested_skipped/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/nested_skipped/mod.rs rename to rustfmt-core/rustfmt-lib/tests/target/nested_skipped/mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/nestedmod/mod.rs b/rustfmt-core/rustfmt-lib/tests/target/nestedmod/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/nestedmod/mod.rs rename to rustfmt-core/rustfmt-lib/tests/target/nestedmod/mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/nestedmod/mod2a.rs b/rustfmt-core/rustfmt-lib/tests/target/nestedmod/mod2a.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/nestedmod/mod2a.rs rename to rustfmt-core/rustfmt-lib/tests/target/nestedmod/mod2a.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/nestedmod/mod2b.rs b/rustfmt-core/rustfmt-lib/tests/target/nestedmod/mod2b.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/nestedmod/mod2b.rs rename to rustfmt-core/rustfmt-lib/tests/target/nestedmod/mod2b.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/nestedmod/mod2c.rs b/rustfmt-core/rustfmt-lib/tests/target/nestedmod/mod2c.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/nestedmod/mod2c.rs rename to rustfmt-core/rustfmt-lib/tests/target/nestedmod/mod2c.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/nestedmod/mymod1/mod3a.rs b/rustfmt-core/rustfmt-lib/tests/target/nestedmod/mymod1/mod3a.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/nestedmod/mymod1/mod3a.rs rename to rustfmt-core/rustfmt-lib/tests/target/nestedmod/mymod1/mod3a.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/nestedmod/submod2/a.rs b/rustfmt-core/rustfmt-lib/tests/target/nestedmod/submod2/a.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/nestedmod/submod2/a.rs rename to rustfmt-core/rustfmt-lib/tests/target/nestedmod/submod2/a.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/nestedmod/submod2/mod.rs b/rustfmt-core/rustfmt-lib/tests/target/nestedmod/submod2/mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/nestedmod/submod2/mod.rs rename to rustfmt-core/rustfmt-lib/tests/target/nestedmod/submod2/mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/no_arg_with_commnet.rs b/rustfmt-core/rustfmt-lib/tests/target/no_arg_with_commnet.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/no_arg_with_commnet.rs rename to rustfmt-core/rustfmt-lib/tests/target/no_arg_with_commnet.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/no_new_line_beginning.rs b/rustfmt-core/rustfmt-lib/tests/target/no_new_line_beginning.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/no_new_line_beginning.rs rename to rustfmt-core/rustfmt-lib/tests/target/no_new_line_beginning.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/normalize_doc_attributes_should_not_imply_format_doc_comments.rs b/rustfmt-core/rustfmt-lib/tests/target/normalize_doc_attributes_should_not_imply_format_doc_comments.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/normalize_doc_attributes_should_not_imply_format_doc_comments.rs rename to rustfmt-core/rustfmt-lib/tests/target/normalize_doc_attributes_should_not_imply_format_doc_comments.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/normalize_multiline_doc_attribute.rs b/rustfmt-core/rustfmt-lib/tests/target/normalize_multiline_doc_attribute.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/normalize_multiline_doc_attribute.rs rename to rustfmt-core/rustfmt-lib/tests/target/normalize_multiline_doc_attribute.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/obsolete_in_place.rs b/rustfmt-core/rustfmt-lib/tests/target/obsolete_in_place.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/obsolete_in_place.rs rename to rustfmt-core/rustfmt-lib/tests/target/obsolete_in_place.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/one_line_if_v2.rs b/rustfmt-core/rustfmt-lib/tests/target/one_line_if_v2.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/one_line_if_v2.rs rename to rustfmt-core/rustfmt-lib/tests/target/one_line_if_v2.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/other.rs b/rustfmt-core/rustfmt-lib/tests/target/other.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/other.rs rename to rustfmt-core/rustfmt-lib/tests/target/other.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/paren.rs b/rustfmt-core/rustfmt-lib/tests/target/paren.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/paren.rs rename to rustfmt-core/rustfmt-lib/tests/target/paren.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/path_clarity/foo.rs b/rustfmt-core/rustfmt-lib/tests/target/path_clarity/foo.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/path_clarity/foo.rs rename to rustfmt-core/rustfmt-lib/tests/target/path_clarity/foo.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/path_clarity/foo/bar.rs b/rustfmt-core/rustfmt-lib/tests/target/path_clarity/foo/bar.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/path_clarity/foo/bar.rs rename to rustfmt-core/rustfmt-lib/tests/target/path_clarity/foo/bar.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/paths.rs b/rustfmt-core/rustfmt-lib/tests/target/paths.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/paths.rs rename to rustfmt-core/rustfmt-lib/tests/target/paths.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/pattern-condense-wildcards.rs b/rustfmt-core/rustfmt-lib/tests/target/pattern-condense-wildcards.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/pattern-condense-wildcards.rs rename to rustfmt-core/rustfmt-lib/tests/target/pattern-condense-wildcards.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/pattern.rs b/rustfmt-core/rustfmt-lib/tests/target/pattern.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/pattern.rs rename to rustfmt-core/rustfmt-lib/tests/target/pattern.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/preserves_carriage_return_for_unix.rs b/rustfmt-core/rustfmt-lib/tests/target/preserves_carriage_return_for_unix.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/preserves_carriage_return_for_unix.rs rename to rustfmt-core/rustfmt-lib/tests/target/preserves_carriage_return_for_unix.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/preserves_carriage_return_for_windows.rs b/rustfmt-core/rustfmt-lib/tests/target/preserves_carriage_return_for_windows.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/preserves_carriage_return_for_windows.rs rename to rustfmt-core/rustfmt-lib/tests/target/preserves_carriage_return_for_windows.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/pub-restricted.rs b/rustfmt-core/rustfmt-lib/tests/target/pub-restricted.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/pub-restricted.rs rename to rustfmt-core/rustfmt-lib/tests/target/pub-restricted.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/raw_identifiers.rs b/rustfmt-core/rustfmt-lib/tests/target/raw_identifiers.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/raw_identifiers.rs rename to rustfmt-core/rustfmt-lib/tests/target/raw_identifiers.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/remove_blank_lines.rs b/rustfmt-core/rustfmt-lib/tests/target/remove_blank_lines.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/remove_blank_lines.rs rename to rustfmt-core/rustfmt-lib/tests/target/remove_blank_lines.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/reorder-impl-items.rs b/rustfmt-core/rustfmt-lib/tests/target/reorder-impl-items.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/reorder-impl-items.rs rename to rustfmt-core/rustfmt-lib/tests/target/reorder-impl-items.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/should_not_format_string_when_format_strings_is_not_set.rs b/rustfmt-core/rustfmt-lib/tests/target/should_not_format_string_when_format_strings_is_not_set.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/should_not_format_string_when_format_strings_is_not_set.rs rename to rustfmt-core/rustfmt-lib/tests/target/should_not_format_string_when_format_strings_is_not_set.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/single-line-if-else.rs b/rustfmt-core/rustfmt-lib/tests/target/single-line-if-else.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/single-line-if-else.rs rename to rustfmt-core/rustfmt-lib/tests/target/single-line-if-else.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/single-line-macro/v2.rs b/rustfmt-core/rustfmt-lib/tests/target/single-line-macro/v2.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/single-line-macro/v2.rs rename to rustfmt-core/rustfmt-lib/tests/target/single-line-macro/v2.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/skip.rs b/rustfmt-core/rustfmt-lib/tests/target/skip.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/skip.rs rename to rustfmt-core/rustfmt-lib/tests/target/skip.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/skip_mod.rs b/rustfmt-core/rustfmt-lib/tests/target/skip_mod.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/skip_mod.rs rename to rustfmt-core/rustfmt-lib/tests/target/skip_mod.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/soft-wrapping.rs b/rustfmt-core/rustfmt-lib/tests/target/soft-wrapping.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/soft-wrapping.rs rename to rustfmt-core/rustfmt-lib/tests/target/soft-wrapping.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/space-not-before-newline.rs b/rustfmt-core/rustfmt-lib/tests/target/space-not-before-newline.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/space-not-before-newline.rs rename to rustfmt-core/rustfmt-lib/tests/target/space-not-before-newline.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/spaces-around-ranges.rs b/rustfmt-core/rustfmt-lib/tests/target/spaces-around-ranges.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/spaces-around-ranges.rs rename to rustfmt-core/rustfmt-lib/tests/target/spaces-around-ranges.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/static.rs b/rustfmt-core/rustfmt-lib/tests/target/static.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/static.rs rename to rustfmt-core/rustfmt-lib/tests/target/static.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/string-lit-2.rs b/rustfmt-core/rustfmt-lib/tests/target/string-lit-2.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/string-lit-2.rs rename to rustfmt-core/rustfmt-lib/tests/target/string-lit-2.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/string-lit-custom.rs b/rustfmt-core/rustfmt-lib/tests/target/string-lit-custom.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/string-lit-custom.rs rename to rustfmt-core/rustfmt-lib/tests/target/string-lit-custom.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/string-lit.rs b/rustfmt-core/rustfmt-lib/tests/target/string-lit.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/string-lit.rs rename to rustfmt-core/rustfmt-lib/tests/target/string-lit.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/string_punctuation.rs b/rustfmt-core/rustfmt-lib/tests/target/string_punctuation.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/string_punctuation.rs rename to rustfmt-core/rustfmt-lib/tests/target/string_punctuation.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/struct-field-attributes.rs b/rustfmt-core/rustfmt-lib/tests/target/struct-field-attributes.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/struct-field-attributes.rs rename to rustfmt-core/rustfmt-lib/tests/target/struct-field-attributes.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/struct_lits.rs b/rustfmt-core/rustfmt-lib/tests/target/struct_lits.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/struct_lits.rs rename to rustfmt-core/rustfmt-lib/tests/target/struct_lits.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/struct_lits_multiline.rs b/rustfmt-core/rustfmt-lib/tests/target/struct_lits_multiline.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/struct_lits_multiline.rs rename to rustfmt-core/rustfmt-lib/tests/target/struct_lits_multiline.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/struct_lits_visual.rs b/rustfmt-core/rustfmt-lib/tests/target/struct_lits_visual.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/struct_lits_visual.rs rename to rustfmt-core/rustfmt-lib/tests/target/struct_lits_visual.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/struct_lits_visual_multiline.rs b/rustfmt-core/rustfmt-lib/tests/target/struct_lits_visual_multiline.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/struct_lits_visual_multiline.rs rename to rustfmt-core/rustfmt-lib/tests/target/struct_lits_visual_multiline.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/struct_tuple_visual.rs b/rustfmt-core/rustfmt-lib/tests/target/struct_tuple_visual.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/struct_tuple_visual.rs rename to rustfmt-core/rustfmt-lib/tests/target/struct_tuple_visual.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/structs.rs b/rustfmt-core/rustfmt-lib/tests/target/structs.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/structs.rs rename to rustfmt-core/rustfmt-lib/tests/target/structs.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/trailing-comma-never.rs b/rustfmt-core/rustfmt-lib/tests/target/trailing-comma-never.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/trailing-comma-never.rs rename to rustfmt-core/rustfmt-lib/tests/target/trailing-comma-never.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/trailing_commas.rs b/rustfmt-core/rustfmt-lib/tests/target/trailing_commas.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/trailing_commas.rs rename to rustfmt-core/rustfmt-lib/tests/target/trailing_commas.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/trailing_comments/hard_tabs.rs b/rustfmt-core/rustfmt-lib/tests/target/trailing_comments/hard_tabs.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/trailing_comments/hard_tabs.rs rename to rustfmt-core/rustfmt-lib/tests/target/trailing_comments/hard_tabs.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/trailing_comments/soft_tabs.rs b/rustfmt-core/rustfmt-lib/tests/target/trailing_comments/soft_tabs.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/trailing_comments/soft_tabs.rs rename to rustfmt-core/rustfmt-lib/tests/target/trailing_comments/soft_tabs.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/trait.rs b/rustfmt-core/rustfmt-lib/tests/target/trait.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/trait.rs rename to rustfmt-core/rustfmt-lib/tests/target/trait.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/trait_2015_edition.rs b/rustfmt-core/rustfmt-lib/tests/target/trait_2015_edition.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/trait_2015_edition.rs rename to rustfmt-core/rustfmt-lib/tests/target/trait_2015_edition.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/try-conversion.rs b/rustfmt-core/rustfmt-lib/tests/target/try-conversion.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/try-conversion.rs rename to rustfmt-core/rustfmt-lib/tests/target/try-conversion.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/tuple.rs b/rustfmt-core/rustfmt-lib/tests/target/tuple.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/tuple.rs rename to rustfmt-core/rustfmt-lib/tests/target/tuple.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/type-ascription.rs b/rustfmt-core/rustfmt-lib/tests/target/type-ascription.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/type-ascription.rs rename to rustfmt-core/rustfmt-lib/tests/target/type-ascription.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/type.rs b/rustfmt-core/rustfmt-lib/tests/target/type.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/type.rs rename to rustfmt-core/rustfmt-lib/tests/target/type.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/type_alias.rs b/rustfmt-core/rustfmt-lib/tests/target/type_alias.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/type_alias.rs rename to rustfmt-core/rustfmt-lib/tests/target/type_alias.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/unicode.rs b/rustfmt-core/rustfmt-lib/tests/target/unicode.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/unicode.rs rename to rustfmt-core/rustfmt-lib/tests/target/unicode.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/unindent_if_else_cond_comment.rs b/rustfmt-core/rustfmt-lib/tests/target/unindent_if_else_cond_comment.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/unindent_if_else_cond_comment.rs rename to rustfmt-core/rustfmt-lib/tests/target/unindent_if_else_cond_comment.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/unions.rs b/rustfmt-core/rustfmt-lib/tests/target/unions.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/unions.rs rename to rustfmt-core/rustfmt-lib/tests/target/unions.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/visibility.rs b/rustfmt-core/rustfmt-lib/tests/target/visibility.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/visibility.rs rename to rustfmt-core/rustfmt-lib/tests/target/visibility.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/visual-fn-type.rs b/rustfmt-core/rustfmt-lib/tests/target/visual-fn-type.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/visual-fn-type.rs rename to rustfmt-core/rustfmt-lib/tests/target/visual-fn-type.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/where-clause-rfc.rs b/rustfmt-core/rustfmt-lib/tests/target/where-clause-rfc.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/where-clause-rfc.rs rename to rustfmt-core/rustfmt-lib/tests/target/where-clause-rfc.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/where-clause.rs b/rustfmt-core/rustfmt-lib/tests/target/where-clause.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/where-clause.rs rename to rustfmt-core/rustfmt-lib/tests/target/where-clause.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/width-heuristics.rs b/rustfmt-core/rustfmt-lib/tests/target/width-heuristics.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/width-heuristics.rs rename to rustfmt-core/rustfmt-lib/tests/target/width-heuristics.rs diff --git a/rustfmt-lib/rustfmt-core/tests/target/wrap_comments_should_not_imply_format_doc_comments.rs b/rustfmt-core/rustfmt-lib/tests/target/wrap_comments_should_not_imply_format_doc_comments.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/target/wrap_comments_should_not_imply_format_doc_comments.rs rename to rustfmt-core/rustfmt-lib/tests/target/wrap_comments_should_not_imply_format_doc_comments.rs diff --git a/rustfmt-lib/rustfmt-core/tests/writemode/source/fn-single-line.rs b/rustfmt-core/rustfmt-lib/tests/writemode/source/fn-single-line.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/writemode/source/fn-single-line.rs rename to rustfmt-core/rustfmt-lib/tests/writemode/source/fn-single-line.rs diff --git a/rustfmt-lib/rustfmt-core/tests/writemode/source/json.rs b/rustfmt-core/rustfmt-lib/tests/writemode/source/json.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/writemode/source/json.rs rename to rustfmt-core/rustfmt-lib/tests/writemode/source/json.rs diff --git a/rustfmt-lib/rustfmt-core/tests/writemode/source/modified.rs b/rustfmt-core/rustfmt-lib/tests/writemode/source/modified.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/writemode/source/modified.rs rename to rustfmt-core/rustfmt-lib/tests/writemode/source/modified.rs diff --git a/rustfmt-lib/rustfmt-core/tests/writemode/source/stdin.rs b/rustfmt-core/rustfmt-lib/tests/writemode/source/stdin.rs similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/writemode/source/stdin.rs rename to rustfmt-core/rustfmt-lib/tests/writemode/source/stdin.rs diff --git a/rustfmt-lib/rustfmt-core/tests/writemode/target/checkstyle.xml b/rustfmt-core/rustfmt-lib/tests/writemode/target/checkstyle.xml similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/writemode/target/checkstyle.xml rename to rustfmt-core/rustfmt-lib/tests/writemode/target/checkstyle.xml diff --git a/rustfmt-lib/rustfmt-core/tests/writemode/target/modified.txt b/rustfmt-core/rustfmt-lib/tests/writemode/target/modified.txt similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/writemode/target/modified.txt rename to rustfmt-core/rustfmt-lib/tests/writemode/target/modified.txt diff --git a/rustfmt-lib/rustfmt-core/tests/writemode/target/output.json b/rustfmt-core/rustfmt-lib/tests/writemode/target/output.json similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/writemode/target/output.json rename to rustfmt-core/rustfmt-lib/tests/writemode/target/output.json diff --git a/rustfmt-lib/rustfmt-core/tests/writemode/target/stdin.json b/rustfmt-core/rustfmt-lib/tests/writemode/target/stdin.json similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/writemode/target/stdin.json rename to rustfmt-core/rustfmt-lib/tests/writemode/target/stdin.json diff --git a/rustfmt-lib/rustfmt-core/tests/writemode/target/stdin.xml b/rustfmt-core/rustfmt-lib/tests/writemode/target/stdin.xml similarity index 100% rename from rustfmt-lib/rustfmt-core/tests/writemode/target/stdin.xml rename to rustfmt-core/rustfmt-lib/tests/writemode/target/stdin.xml diff --git a/src/bin/main.rs b/src/bin/main.rs index 1f55b4d650f..2d4536384f7 100644 --- a/src/bin/main.rs +++ b/src/bin/main.rs @@ -9,7 +9,7 @@ use anyhow::{format_err, Result}; use getopts::{Matches, Options}; use thiserror::Error; -use rustfmt_core::{ +use rustfmt_lib::{ load_config, CliOptions, Color, Config, Edition, EmitMode, FileLines, FileName, FormatReportFormatterBuilder, Input, Session, Verbosity, }; diff --git a/src/git-rustfmt/main.rs b/src/git-rustfmt/main.rs index 30d8c37dc76..50ba77982cd 100644 --- a/src/git-rustfmt/main.rs +++ b/src/git-rustfmt/main.rs @@ -9,7 +9,7 @@ use std::str::FromStr; use getopts::{Matches, Options}; -use rustfmt_core::{load_config, CliOptions, FormatReportFormatterBuilder, Input, Session}; +use rustfmt_lib::{load_config, CliOptions, FormatReportFormatterBuilder, Input, Session}; fn prune_files(files: Vec<&str>) -> Vec<&str> { let prefixes: Vec<_> = files @@ -77,7 +77,7 @@ fn fmt_files(files: &[&str]) -> i32 { struct NullOptions; impl CliOptions for NullOptions { - fn apply_to(self, _: &mut rustfmt_core::Config) { + fn apply_to(self, _: &mut rustfmt_lib::Config) { unreachable!(); } fn config_path(&self) -> Option<&Path> { From c51a44d9db78777546e6c27ea9e70f6bcef1673e Mon Sep 17 00:00:00 2001 From: topecongiro Date: Sun, 5 Jan 2020 00:41:08 +0900 Subject: [PATCH 17/18] Fix CI --- .github/workflows/windows.yml | 6 ++++++ .travis.yml | 2 +- appveyor.yml | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a0d0fe60817..a1d1ea62de0 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -62,3 +62,9 @@ jobs: - name: 'test ignored' run: cargo test -- --ignored shell: cmd + - name: 'test rustfmt-core' + run: cargo test --manifest-path rustfmt-core/Cargo.toml + shell: cmd + - name: 'test rustfmt-core ignored' + run: cargo test --manifest-path rustfmt-core/Cargo.toml -- --ignored + shell: cmd diff --git a/.travis.yml b/.travis.yml index 8d0e7a88ad2..05c7e4306ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,7 @@ matrix: script: - | if [ -z ${INTEGRATION} ]; then - cargo build && cargo test && cargo test -- --ignored + cargo build && cargo test && cargo test -- --ignored && cargo test --manifest-path rustfmt-core/Cargo.toml && cargo test --manifest-path rustfmt-core/Cargo.toml -- --ignored else ./ci/integration.sh fi diff --git a/appveyor.yml b/appveyor.yml index e59e69086f0..7520fbecd04 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -51,3 +51,5 @@ test_script: - cargo build --verbose - cargo test - cargo test -- --ignored + - cargo test --manifest-path rustfmt-core/Cargo.toml + - cargo test --manifest-path rustfmt-core/Cargo.toml -- --ignored From 50376e67867b4d6b00e9d99aa902ec3d280b2b7a Mon Sep 17 00:00:00 2001 From: topecongiro Date: Sun, 5 Jan 2020 12:55:14 +0900 Subject: [PATCH 18/18] Remove auto-generated comment from Cargo.toml --- rustfmt-core/rustfmt-config/Cargo.toml | 2 -- rustfmt-core/rustfmt-emitter/Cargo.toml | 2 -- rustfmt-core/rustfmt-lib/Cargo.toml | 2 -- 3 files changed, 6 deletions(-) diff --git a/rustfmt-core/rustfmt-config/Cargo.toml b/rustfmt-core/rustfmt-config/Cargo.toml index ebf9063a9cf..afb773ef5c7 100644 --- a/rustfmt-core/rustfmt-config/Cargo.toml +++ b/rustfmt-core/rustfmt-config/Cargo.toml @@ -7,8 +7,6 @@ description = "Rustfmt configuration library" license = "Apache-2.0/MIT" repository = "https://github.com/rust-lang/rustfmt" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] ansi_term = "0.12" dirs = "2.0" diff --git a/rustfmt-core/rustfmt-emitter/Cargo.toml b/rustfmt-core/rustfmt-emitter/Cargo.toml index 75ffe123cd7..4fd60e2c1aa 100644 --- a/rustfmt-core/rustfmt-emitter/Cargo.toml +++ b/rustfmt-core/rustfmt-emitter/Cargo.toml @@ -7,8 +7,6 @@ description = "Rustfmt emitter library" license = "Apache-2.0/MIT" repository = "https://github.com/rust-lang/rustfmt" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] diff = "0.1" rustfmt_configuration = { path = "../rustfmt-config", version = "1.0" } diff --git a/rustfmt-core/rustfmt-lib/Cargo.toml b/rustfmt-core/rustfmt-lib/Cargo.toml index 76b4135d53f..8089bda96fc 100644 --- a/rustfmt-core/rustfmt-lib/Cargo.toml +++ b/rustfmt-core/rustfmt-lib/Cargo.toml @@ -7,8 +7,6 @@ description = "Rustfmt as a library" license = "Apache-2.0/MIT" repository = "https://github.com/rust-lang/rustfmt" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [features] generic-simd = ["bytecount/generic-simd"]