diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fff72b0..6181713 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -36,19 +36,12 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} - name: Cargo fmt - uses: LoliGothick/rustfmt-check@v0.4.2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - flags: --all - toolchain: 'stable' - args: --config-path=./server/rustfmt.toml - working-directory: ./server + run: cargo fmt --all -- --check + working-directory: ./server - name: Cargo clippy - uses: LoliGothick/clippy-check@v0.3.2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - working-directory: ./server + run: cargo clippy --all-features -- -D warnings + working-directory: ./server - name: Cargo test run: cargo test --all-features diff --git a/server/rustfmt.toml b/server/rustfmt.toml deleted file mode 100644 index 897391a..0000000 --- a/server/rustfmt.toml +++ /dev/null @@ -1,79 +0,0 @@ -max_width = 100 -hard_tabs = false -tab_spaces = 4 -newline_style = "Auto" -indent_style = "Block" -use_small_heuristics = "Default" -fn_call_width = 60 -attr_fn_like_width = 70 -struct_lit_width = 18 -struct_variant_width = 35 -array_width = 60 -chain_width = 60 -single_line_if_else_max_width = 50 -single_line_let_else_max_width = 50 -wrap_comments = false -format_code_in_doc_comments = false -doc_comment_code_block_width = 100 -comment_width = 80 -normalize_comments = false -normalize_doc_attributes = false -format_strings = false -format_macro_matchers = false -format_macro_bodies = true -skip_macro_invocations = [] -hex_literal_case = "Preserve" -empty_item_single_line = true -struct_lit_single_line = true -fn_single_line = false -where_single_line = false -imports_indent = "Block" -imports_layout = "Mixed" -imports_granularity = "Preserve" -group_imports = "Preserve" -reorder_imports = true -reorder_modules = true -reorder_impl_items = false -type_punctuation_density = "Wide" -space_before_colon = false -space_after_colon = true -spaces_around_ranges = false -binop_separator = "Front" -remove_nested_parens = true -combine_control_expr = true -short_array_element_width_threshold = 10 -overflow_delimited_expr = false -struct_field_align_threshold = 0 -enum_discrim_align_threshold = 0 -match_arm_blocks = true -match_arm_leading_pipes = "Never" -force_multiline_blocks = false -fn_params_layout = "Tall" -brace_style = "SameLineWhere" -control_brace_style = "AlwaysSameLine" -trailing_semicolon = true -trailing_comma = "Vertical" -match_block_trailing_comma = false -blank_lines_upper_bound = 1 -blank_lines_lower_bound = 0 -edition = "2015" -version = "One" -inline_attribute_width = 0 -format_generated_files = true -generated_marker_line_search_limit = 5 -merge_derives = true -use_try_shorthand = false -use_field_init_shorthand = false -force_explicit_abi = true -condense_wildcard_suffixes = false -color = "Auto" -required_version = "1.7.1" -unstable_features = true -disable_all_formatting = false -skip_children = false -show_parse_errors = true -error_on_line_overflow = false -error_on_unformatted = false -ignore = [] -emit_mode = "Files" -make_backup = false