Skip to content

Commit ab9f6e0

Browse files
committed
Merge torrust#1058: Fix vairous issues in the ci.
f95aac2 cargo: remove unused trace dependancy (Cameron Garnham) 7dda918 vscode: update clippy to include lints from cargo manifest (Cameron Garnham) 8eacbe3 ci: fix toolchain bug with release (Cameron Garnham) 9341f2c ci: temp allow clipply lint: needless_return (Cameron Garnham) Pull request description: - [x] Fix Temporary Bug With Clipply (`needless_return = "allow"`) - [x] Fix Bug in Release Workflow (closes torrust#1057) - [x] Removed unneeded dependency: [trace](https://crates.io/crates/trace) ACKs for top commit: josecelano: ACK f95aac2 Tree-SHA512: 6a07e79f7998b26c4d6dec13367f941ec267ff1c21daeae179eebfc78bc8963c2641413b28d4a84c309f8a823084e7f25ce2d53c6760c36a6082d9bb7507c02d
2 parents b65f25a + f95aac2 commit ab9f6e0

File tree

5 files changed

+24
-36
lines changed

5 files changed

+24
-36
lines changed

.github/workflows/deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ jobs:
3535
needs: test
3636
runs-on: ubuntu-latest
3737

38+
strategy:
39+
matrix:
40+
toolchain: [stable]
41+
3842
steps:
3943
- id: checkout
4044
name: Checkout Repository

.github/workflows/testing.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969

7070
- id: lint
7171
name: Run Lint Checks
72-
run: cargo clippy --tests --benches --examples --workspace --all-targets --all-features -- -D clippy::correctness -D clippy::suspicious -D clippy::complexity -D clippy::perf -D clippy::style -D clippy::pedantic
72+
run: cargo clippy --tests --benches --examples --workspace --all-targets --all-features
7373

7474
- id: docs
7575
name: Lint Documentation

.vscode/settings.json

+8-22
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,20 @@
22
"[rust]": {
33
"editor.formatOnSave": true
44
},
5-
"[ignore]": { "rust-analyzer.cargo.extraEnv" : {
6-
"RUSTFLAGS": "-Z profile -C codegen-units=1 -C inline-threshold=0 -C link-dead-code -C overflow-checks=off -C panic=abort -Z panic_abort_tests",
7-
"RUSTDOCFLAGS": "-Z profile -C codegen-units=1 -C inline-threshold=0 -C link-dead-code -C overflow-checks=off -C panic=abort -Z panic_abort_tests",
8-
"CARGO_INCREMENTAL": "0",
9-
"RUST_BACKTRACE": "1"
10-
}},
5+
"[ignore]": {
6+
"rust-analyzer.cargo.extraEnv": {
7+
"RUSTFLAGS": "-Z profile -C codegen-units=1 -C inline-threshold=0 -C link-dead-code -C overflow-checks=off -C panic=abort -Z panic_abort_tests",
8+
"RUSTDOCFLAGS": "-Z profile -C codegen-units=1 -C inline-threshold=0 -C link-dead-code -C overflow-checks=off -C panic=abort -Z panic_abort_tests",
9+
"CARGO_INCREMENTAL": "0",
10+
"RUST_BACKTRACE": "1"
11+
}
12+
},
1113
"rust-analyzer.checkOnSave": true,
1214
"rust-analyzer.check.command": "clippy",
1315
"rust-analyzer.check.allTargets": true,
14-
"rust-analyzer.check.extraArgs": [
15-
"--",
16-
"-D",
17-
"clippy::correctness",
18-
"-D",
19-
"clippy::suspicious",
20-
"-W",
21-
"clippy::complexity",
22-
"-W",
23-
"clippy::perf",
24-
"-W",
25-
"clippy::style",
26-
"-W",
27-
"clippy::pedantic"
28-
],
2916
"evenBetterToml.formatter.allowedBlankLines": 1,
3017
"evenBetterToml.formatter.columnWidth": 130,
3118
"evenBetterToml.formatter.trailingNewline": true,
3219
"evenBetterToml.formatter.reorderKeys": true,
3320
"evenBetterToml.formatter.reorderArrays": true,
34-
3521
}

Cargo.lock

-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+11-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ torrust-tracker-primitives = { version = "3.0.0-develop", path = "packages/primi
7777
torrust-tracker-torrent-repository = { version = "3.0.0-develop", path = "packages/torrent-repository" }
7878
tower = { version = "0", features = ["timeout"] }
7979
tower-http = { version = "0", features = ["compression-full", "cors", "propagate-header", "request-id", "trace"] }
80-
trace = "0"
8180
tracing = "0"
8281
tracing-subscriber = { version = "0", features = ["json"] }
8382
url = { version = "2", features = ["serde"] }
@@ -115,3 +114,14 @@ opt-level = 3
115114
[profile.release-debug]
116115
debug = true
117116
inherits = "release"
117+
118+
[lints.clippy]
119+
complexity = { level = "deny", priority = -1 }
120+
correctness = { level = "deny", priority = -1 }
121+
pedantic = { level = "deny", priority = -1 }
122+
perf = { level = "deny", priority = -1 }
123+
style = { level = "deny", priority = -1 }
124+
suspicious = { level = "deny", priority = -1 }
125+
126+
# temp allow this lint
127+
needless_return = "allow"

0 commit comments

Comments
 (0)