Skip to content

Commit

Permalink
Update the project control files
Browse files Browse the repository at this point in the history
  • Loading branch information
myrrlyn committed Oct 27, 2021
1 parent 4f4f56b commit 6dd6b27
Show file tree
Hide file tree
Showing 7 changed files with 108 additions and 84 deletions.
2 changes: 1 addition & 1 deletion Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ doc: check
cargo doc --document-private-items --all-features

format:
cargo +nightly fmt -- --config-path rustfmt-nightly.toml
cargo +nightly fmt

# Runs a Justfile recipe on every change to the workspace.
loop action:
Expand Down
1 change: 0 additions & 1 deletion rust-toolchain

This file was deleted.

2 changes: 2 additions & 0 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[toolchain]
channel = "stable"
77 changes: 0 additions & 77 deletions rustfmt-nightly.toml

This file was deleted.

23 changes: 23 additions & 0 deletions rustfmt-stable.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
################################################################################
# Rust Style Configuration #
# #
# This file controls the operation of `rustfmt` and `cargo fmt`. As the #
# `rustfmt` tool is still unstable, this file only contains the configurations #
# that are stable as of the pinned Rust version in `rust-toolchain`. The file #
# `rustfmt-nightly.toml` contains the configurations that are available as of #
# the nightly Rust release when that file was last touched. #
################################################################################

edition = "2018"
hard_tabs = true
force_explicit_abi = true
max_width = 81
merge_derives = true
newline_style = "Unix"
remove_nested_parens = true
reorder_imports = true
reorder_modules = true
tab_spaces = 4
use_field_init_shorthand = true
use_small_heuristics = "Default"
use_try_shorthand = true
64 changes: 59 additions & 5 deletions rustfmt.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,76 @@
# Rust Style Configuration #
# #
# This file controls the operation of `rustfmt` and `cargo fmt`. As the #
# `rustfmt` tool is still unstable, this file only contains the configurations #
# that are stable as of the pinned Rust version in `rust-toolchain`. The file #
# `rustfmt-nightly.toml` contains the configurations that are available as of #
# the nightly Rust release when that file was last touched. #
# `rustfmt` tool is still unstable, this file is only usable by the nightly #
# release of Rust at least as of the date this file was last touched. #
# #
# See https://github.com/rust-lang/rustfmt/blob/master/Configurations.md for a #
# list of all configuration options. #
################################################################################

# Stable as of current nightly
edition = "2018"
hard_tabs = true
fn_args_layout = "Tall"
force_explicit_abi = true
hard_tabs = true
max_width = 81
merge_derives = true
newline_style = "Unix"
print_misformatted_file_names = false
remove_nested_parens = true
reorder_imports = true
reorder_modules = true
tab_spaces = 4
use_field_init_shorthand = true
use_small_heuristics = "Default"
use_try_shorthand = true

# Still unstable
binop_separator = "Front"
blank_lines_lower_bound = 0
blank_lines_upper_bound = 1
brace_style = "SameLineWhere"
color = "Auto"
combine_control_expr = true
comment_width = 80
condense_wildcard_suffixes = true
control_brace_style = "ClosingNextLine"
disable_all_formatting = false
empty_item_single_line = false
enum_discrim_align_threshold = 40
error_on_line_overflow = false
error_on_unformatted = false
fn_single_line = false
force_multiline_blocks = false
format_code_in_doc_comments = false
format_macro_matchers = true
format_macro_bodies = true
format_strings = true
hide_parse_errors = false
ignore = []
imports_indent = "Block"
imports_layout = "Vertical"
indent_style = "Block"
inline_attribute_width = 0
license_template_path = ""
match_arm_blocks = true
match_block_trailing_comma = true
merge_imports = true
normalize_comments = false
normalize_doc_attributes = true
overflow_delimited_expr = true
reorder_impl_items = true
report_fixme = "Unnumbered"
report_todo = "Unnumbered"
space_after_colon = true
space_before_colon = false
spaces_around_ranges = true
struct_field_align_threshold = 0
struct_lit_single_line = true
trailing_comma = "Vertical"
trailing_semicolon = true
type_punctuation_density = "Wide"
unstable_features = true
version = "Two"
where_single_line = true
wrap_comments = true
23 changes: 23 additions & 0 deletions tarpaulin.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
########################################################################
# Coverage Configuration #
# #
# This file controls the behavior of `cargo-tarpaulin`, which produces #
# test coverage reports for the project. #
########################################################################

[coverage]
all-features = true
count = true
ignore-panics = true
ignore-tests = true
run-types = [
"Tests",
]

[report]
out = [
"Html",
"Lcov",
"Xml",
]
output-dir = "target/tarpaulin"

0 comments on commit 6dd6b27

Please sign in to comment.