Skip to content

Commit 6c53db7

Browse files
committed
adrg
1 parent 3c69406 commit 6c53db7

File tree

6 files changed

+71
-36
lines changed

6 files changed

+71
-36
lines changed

.github/workflows/format.yml

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,32 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v2
17+
- uses: actions-rs/toolchain@v1
18+
with:
19+
toolchain: stable
20+
override: true
21+
- uses: davidB/rust-cargo-make@v1
1722
- name: Check Formatting
18-
run: cargo fmt -- --verbose --check --color auto
19-
23+
run: cargo make rust-fmt-check
24+
check_format_markdown:
25+
name: 🖋 Check markdown files
26+
runs-on: ubuntu-latest
27+
steps:
28+
- name: Check out code
29+
uses: actions/checkout@v2
30+
- name: Markdown Linting Action
31+
uses: avto-dev/markdown-lint@v1.5.0
32+
with:
33+
args: "*.md"
34+
check_format_toml:
35+
name: 🪦 Check markdown files
36+
runs-on: ubuntu-latest
37+
steps:
38+
- name: Check out code
39+
uses: actions/checkout@v2
40+
- uses: actions-rs/toolchain@v1
41+
with:
42+
toolchain: stable
43+
override: true
44+
- uses: davidB/rust-cargo-make@v1
45+
- run: cargo make toml-fmt-check

.github/workflows/lint.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
name: 🖋 Check lintig
2+
name: 🖋 Check linting
33

44
on:
55
pull_request:
@@ -15,6 +15,11 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- uses: actions/checkout@v2
18+
- uses: actions-rs/toolchain@v1
19+
with:
20+
toolchain: stable
21+
override: true
22+
- uses: davidB/rust-cargo-make@v1
1823
- name: Check linting
1924
run: |
2025
rustup component add clippy

.rustfmt.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
max_width = 88
2-
ignore = ["."] # rustfmt does a poor job, and I don't want it ruining well-formatted code

LICENSE

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2121
SOFTWARE.
22-

Makefile.toml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@ install_crate = "rustfmt"
66
command = "cargo"
77
args = ["fmt", "--", "--emit=files"]
88

9+
[tasks.rust-fmt-check]
10+
install_crate = "rustfmt"
11+
command = "cargo"
12+
args = ["fmt", "--", "--verbose", "--color", "auto"]
13+
14+
[tasks.toml-fmt-check]
15+
install_crate = "taplo-cli"
16+
command = "taplo"
17+
args = ["fmt", "--check", "*.toml"]
18+
919
[tasks.clean]
1020
command = "cargo"
1121
args = ["clean"]
@@ -28,4 +38,4 @@ dependencies = ["clean"]
2838
[tasks.doc]
2939
command = "cargo"
3040
args = ["doc"]
31-
dependencies = ["clean"]
41+
dependencies = ["clean"]

deny.yml renamed to deny.toml

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
# dependencies not shared by any other crates, would be ignored, as the target
1919
# list here is effectively saying which targets you are building for.
2020
targets = [
21-
# The triple can be any string, but only the target triples built in to
22-
# rustc (as of 1.40) can be checked against actual config expressions
23-
#{ triple = "x86_64-unknown-linux-musl" },
24-
# You can also specify which target_features you promise are enabled for a
25-
# particular target. target_features are currently not validated against
26-
# the actual valid features supported by the target architecture.
27-
#{ triple = "wasm32-unknown-unknown", features = ["atomics"] },
21+
# The triple can be any string, but only the target triples built in to
22+
# rustc (as of 1.40) can be checked against actual config expressions
23+
#{ triple = "x86_64-unknown-linux-musl" },
24+
# You can also specify which target_features you promise are enabled for a
25+
# particular target. target_features are currently not validated against
26+
# the actual valid features supported by the target architecture.
27+
#{ triple = "wasm32-unknown-unknown", features = ["atomics"] },
2828
]
2929

3030
# This section is considered when running `cargo deny check advisories`
@@ -48,7 +48,7 @@ notice = "warn"
4848
# A list of advisory IDs to ignore. Note that ignored advisories will still
4949
# output a note when they are encountered.
5050
ignore = [
51-
#"RUSTSEC-0000-0000",
51+
#"RUSTSEC-0000-0000",
5252
]
5353
# Threshold for security vulnerabilities, any vulnerability with a CVSS score
5454
# lower than the range specified will be ignored. Note that ignored advisories
@@ -69,16 +69,12 @@ unlicensed = "warn"
6969
# List of explicitly allowed licenses
7070
# See https://spdx.org/licenses/ for list of possible licenses
7171
# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
72-
allow = [
73-
"MIT",
74-
"Apache-2.0",
75-
"Apache-2.0 WITH LLVM-exception",
76-
]
72+
allow = ["MIT", "Apache-2.0", "Apache-2.0 WITH LLVM-exception"]
7773
# List of explicitly disallowed licenses
7874
# See https://spdx.org/licenses/ for list of possible licenses
7975
# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
8076
deny = [
81-
#"Nokia",
77+
#"Nokia",
8278
]
8379
# Lint level for licenses considered copyleft
8480
copyleft = "warn"
@@ -102,9 +98,9 @@ confidence-threshold = 0.8
10298
# Allow 1 or more licenses on a per-crate basis, so that particular licenses
10399
# aren't accepted for every possible crate as with the normal allow list
104100
exceptions = [
105-
# Each entry is the crate and version constraint, and its specific allow
106-
# list
107-
#{ allow = ["Zlib"], name = "adler32", version = "*" },
101+
# Each entry is the crate and version constraint, and its specific allow
102+
# list
103+
#{ allow = ["Zlib"], name = "adler32", version = "*" },
108104
]
109105

110106
# Some crates don't have (easily) machine readable licensing information,
@@ -123,8 +119,8 @@ exceptions = [
123119
# and the crate will be checked normally, which may produce warnings or errors
124120
# depending on the rest of your configuration
125121
#license-files = [
126-
# Each entry is a crate relative path, and the (opaque) hash of its contents
127-
#{ path = "LICENSE", hash = 0xbd0eed23 }
122+
# Each entry is a crate relative path, and the (opaque) hash of its contents
123+
#{ path = "LICENSE", hash = 0xbd0eed23 }
128124
#]
129125

130126
[licenses.private]
@@ -137,7 +133,7 @@ ignore = false
137133
# is only published to private registries, and ignore is true, the crate will
138134
# not have its license(s) checked
139135
registries = [
140-
#"https://sekretz.com/registry
136+
#"https://sekretz.com/registry
141137
]
142138

143139
# This section is considered when running `cargo deny check bans`.
@@ -156,28 +152,28 @@ wildcards = "allow"
156152
highlight = "all"
157153
# List of crates that are allowed. Use with care!
158154
allow = [
159-
#{ name = "ansi_term", version = "=0.11.0" },
155+
#{ name = "ansi_term", version = "=0.11.0" },
160156
]
161157
# List of crates to deny
162158
deny = [
163-
# Each entry the name of a crate and a version range. If version is
164-
# not specified, all versions will be matched.
165-
#{ name = "ansi_term", version = "=0.11.0" },
166-
#
167-
# Wrapper crates can optionally be specified to allow the crate when it
168-
# is a direct dependency of the otherwise banned crate
169-
#{ name = "ansi_term", version = "=0.11.0", wrappers = [] },
159+
# Each entry the name of a crate and a version range. If version is
160+
# not specified, all versions will be matched.
161+
#{ name = "ansi_term", version = "=0.11.0" },
162+
#
163+
# Wrapper crates can optionally be specified to allow the crate when it
164+
# is a direct dependency of the otherwise banned crate
165+
#{ name = "ansi_term", version = "=0.11.0", wrappers = [] },
170166
]
171167
# Certain crates/versions that will be skipped when doing duplicate detection.
172168
skip = [
173-
#{ name = "ansi_term", version = "=0.11.0" },
169+
#{ name = "ansi_term", version = "=0.11.0" },
174170
]
175171
# Similarly to `skip` allows you to skip certain crates during duplicate
176172
# detection. Unlike skip, it also includes the entire tree of transitive
177173
# dependencies starting at the specified crate, up to a certain depth, which is
178174
# by default infinite
179175
skip-tree = [
180-
#{ name = "ansi_term", version = "=0.11.0", depth = 20 },
176+
#{ name = "ansi_term", version = "=0.11.0", depth = 20 },
181177
]
182178

183179
# This section is considered when running `cargo deny check sources`.

0 commit comments

Comments
 (0)