Skip to content

Commit 391b47b

Browse files
authored
Remove deprecated rustfmt configuration options (use-ink#1309)
1 parent 97f41b5 commit 391b47b

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

.gitlab-ci.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ fmt:
102102
script:
103103
- cargo fmt --verbose --all -- --check
104104
# For the UI tests we need to disable the license check
105-
- cargo fmt --verbose --all -- --check --config=license_template_path="" ./crates/lang/tests/ui/contract/{pass,fail}/*.rs
106-
- cargo fmt --verbose --all -- --check --config=license_template_path="" ./crates/lang/tests/ui/trait_def/{pass,fail}/*.rs
105+
- cargo fmt --verbose --all -- --check ./crates/lang/tests/ui/contract/{pass,fail}/*.rs
106+
- cargo fmt --verbose --all -- --check ./crates/lang/tests/ui/trait_def/{pass,fail}/*.rs
107107
allow_failure: true
108108

109109
examples-fmt:
@@ -114,15 +114,15 @@ examples-fmt:
114114
# Note that we disable the license header check for the examples, since they are unlicensed.
115115
- for example in examples/*/; do
116116
if [ "$example" = "examples/upgradeable-contracts/" ]; then continue; fi;
117-
cargo fmt --verbose --manifest-path ${example}/Cargo.toml -- --check --config=license_template_path="";
117+
cargo fmt --verbose --manifest-path ${example}/Cargo.toml -- --check;
118118
done
119119
- for contract in ${DELEGATOR_SUBCONTRACTS}; do
120-
cargo fmt --verbose --manifest-path ./examples/delegator/${contract}/Cargo.toml -- --check --config=license_template_path="";
120+
cargo fmt --verbose --manifest-path ./examples/delegator/${contract}/Cargo.toml -- --check;
121121
done
122122
- for contract in ${UPGRADEABLE_CONTRACTS}; do
123-
cargo fmt --verbose --manifest-path ./examples/upgradeable-contracts/${contract}/Cargo.toml -- --check --config=license_template_path="";
123+
cargo fmt --verbose --manifest-path ./examples/upgradeable-contracts/${contract}/Cargo.toml -- --check;
124124
done
125-
- cargo fmt --verbose --manifest-path ./examples/upgradeable-contracts/delegate-calls/upgradeable-flipper/Cargo.toml -- --check --config=license_template_path=""
125+
- cargo fmt --verbose --manifest-path ./examples/upgradeable-contracts/delegate-calls/upgradeable-flipper/Cargo.toml -- --check
126126
allow_failure: true
127127

128128
clippy-std:

.rustfmt.toml

-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ format_code_in_doc_comments = false
99
comment_width = 80
1010
normalize_comments = true # changed
1111
normalize_doc_attributes = false
12-
license_template_path = "FILE_HEADER" # changed
1312
format_strings = false
1413
format_macro_matchers = false
1514
format_macro_bodies = true
@@ -57,8 +56,6 @@ skip_children = false
5756
hide_parse_errors = false
5857
error_on_line_overflow = false
5958
error_on_unformatted = false
60-
report_todo = "Always"
61-
report_fixme = "Always"
6259
ignore = []
6360

6461
# Below are `rustfmt` internal settings

0 commit comments

Comments
 (0)