Skip to content

Commit

Permalink
Merge #1058: Fix vairous issues in the ci.
Browse files Browse the repository at this point in the history
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 #1057)
  - [x] Removed unneeded dependency: [trace](https://crates.io/crates/trace)

ACKs for top commit:
  josecelano:
    ACK f95aac2

Tree-SHA512: 6a07e79f7998b26c4d6dec13367f941ec267ff1c21daeae179eebfc78bc8963c2641413b28d4a84c309f8a823084e7f25ce2d53c6760c36a6082d9bb7507c02d
  • Loading branch information
josecelano committed Oct 3, 2024
2 parents b65f25a + f95aac2 commit ab9f6e0
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 36 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ jobs:
needs: test
runs-on: ubuntu-latest

strategy:
matrix:
toolchain: [stable]

steps:
- id: checkout
name: Checkout Repository
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:

- id: lint
name: Run Lint Checks
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
run: cargo clippy --tests --benches --examples --workspace --all-targets --all-features

- id: docs
name: Lint Documentation
Expand Down
30 changes: 8 additions & 22 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,20 @@
"[rust]": {
"editor.formatOnSave": true
},
"[ignore]": { "rust-analyzer.cargo.extraEnv" : {
"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",
"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",
"CARGO_INCREMENTAL": "0",
"RUST_BACKTRACE": "1"
}},
"[ignore]": {
"rust-analyzer.cargo.extraEnv": {
"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",
"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",
"CARGO_INCREMENTAL": "0",
"RUST_BACKTRACE": "1"
}
},
"rust-analyzer.checkOnSave": true,
"rust-analyzer.check.command": "clippy",
"rust-analyzer.check.allTargets": true,
"rust-analyzer.check.extraArgs": [
"--",
"-D",
"clippy::correctness",
"-D",
"clippy::suspicious",
"-W",
"clippy::complexity",
"-W",
"clippy::perf",
"-W",
"clippy::style",
"-W",
"clippy::pedantic"
],
"evenBetterToml.formatter.allowedBlankLines": 1,
"evenBetterToml.formatter.columnWidth": 130,
"evenBetterToml.formatter.trailingNewline": true,
"evenBetterToml.formatter.reorderKeys": true,
"evenBetterToml.formatter.reorderArrays": true,

}
12 changes: 0 additions & 12 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 11 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ torrust-tracker-primitives = { version = "3.0.0-develop", path = "packages/primi
torrust-tracker-torrent-repository = { version = "3.0.0-develop", path = "packages/torrent-repository" }
tower = { version = "0", features = ["timeout"] }
tower-http = { version = "0", features = ["compression-full", "cors", "propagate-header", "request-id", "trace"] }
trace = "0"
tracing = "0"
tracing-subscriber = { version = "0", features = ["json"] }
url = { version = "2", features = ["serde"] }
Expand Down Expand Up @@ -115,3 +114,14 @@ opt-level = 3
[profile.release-debug]
debug = true
inherits = "release"

[lints.clippy]
complexity = { level = "deny", priority = -1 }
correctness = { level = "deny", priority = -1 }
pedantic = { level = "deny", priority = -1 }
perf = { level = "deny", priority = -1 }
style = { level = "deny", priority = -1 }
suspicious = { level = "deny", priority = -1 }

# temp allow this lint
needless_return = "allow"

0 comments on commit ab9f6e0

Please sign in to comment.