Skip to content

Commit

Permalink
specify dylint version
Browse files Browse the repository at this point in the history
  • Loading branch information
lucarlig committed Aug 23, 2024
1 parent 9506a69 commit 8182e42
Show file tree
Hide file tree
Showing 6 changed files with 108 additions and 36 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Install dylint
run: |
if ! command -v cargo-dylint &> /dev/null || ! command -v dylint-link &> /dev/null; then
cargo install cargo-dylint dylint-link
cargo +stable install cargo-dylint@3.0.0 dylint-link@3.0.0
fi
- name: cargo fmt --check
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
- name: Install dylint
run: |
if ! command -v cargo-dylint &> /dev/null || ! command -v dylint-link &> /dev/null; then
cargo install cargo-dylint dylint-link
cargo +stable install cargo-dylint@3.0.0 dylint-link@3.0.0
fi
- name: cargo clippy
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
- name: Install dylint
run: |
if ! command -v cargo-dylint &> /dev/null || ! command -v dylint-link &> /dev/null; then
cargo install cargo-dylint dylint-link
cargo +stable install cargo-dylint@3.0.0 dylint-link@3.0.0
fi
- name: cargo test
Expand Down
127 changes: 99 additions & 28 deletions Cargo.lock

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

5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ par_fold = { path = "lints/par_fold", features = ["rlib"] }
par_iter = { path = "lints/par_iter", features = ["rlib"] }
rayon_imports = { path = "lints/rayon_imports", features = ["rlib"] }

dylint_linting = { version = "3.0.0" }
dylint_linting = { version = "3.1.2" }

[package.metadata.rust-analyzer]
rustc_private = true
Expand All @@ -42,7 +42,7 @@ members = [
]

[dev-dependencies]
dylint_testing = "3.0.0"
dylint_testing = "3.1.2"

[workspace.dependencies]
clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "aa2c94e416d346341fe3a875160a7d064596f4d3" }
Expand All @@ -62,6 +62,7 @@ complexity = { level = "forbid", priority = -4 }
# INDIVIDUAL LINTS
semicolon_if_nothing_returned = { level = "allow", priority = 0 }
similar_names = { level = "allow", priority = 0 }
too_many_lines = { level = "allow", priority = 0 }
alloc_instead_of_core = { level = "warn", priority = 0 }
as_conversions = { level = "warn", priority = 0 }
as_underscore = { level = "warn", priority = 0 }
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ prerequisites: - rustup - latest version of rust stable if not run `rustup updat
1. Install `cargo-dylint` and `dylint-link`:

```sh
cargo install [email protected] [email protected]
cargo +stable install [email protected] [email protected]
```

2. Add the following to the workspace's `Cargo.toml` file:
Expand Down
2 changes: 1 addition & 1 deletion lints/par_iter/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ impl<'tcx> LateLintPass<'tcx> for ParIter {
.into_iter()
.collect();
for into_par_iter_trait in par_iter_traits {
allowed_methods.extend(get_all_methods(cx, into_par_iter_trait, *recv));
allowed_methods.extend(get_all_methods(cx, into_par_iter_trait, recv));
}

let mut top_expr = *recv;
Expand Down
2 changes: 1 addition & 1 deletion scripts/prepare_repo.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

if ! command -v cargo-dylint &> /dev/null || ! command -v dylint-link &> /dev/null; then
cargo install cargo-dylint dylint-link
cargo +stable install cargo-dylint@3.0.0 dylint-link@3.0.0
fi

CARGO_TOML="Cargo.toml"
Expand Down

0 comments on commit 8182e42

Please sign in to comment.