Skip to content

Commit

Permalink
Fix clippy warnings with newer Rust (#853)
Browse files Browse the repository at this point in the history
* Fix clippy warning

Similar to:

- https://github.com/heroku/buildpacks-python/blob/bb0264c8bb0c8b429951c97bf9fdfb894bb78878/Cargo.toml#L15-L16
- heroku/buildpacks-ruby@87c5302

```
$ cargo clippy --all-targets --all-features -- --deny warnings
    Checking num-rational v0.4.2
   Compiling libcnb-proc-macros v0.22.0 (/Users/rschneeman/Documents/projects/work/libcnb.rs/libcnb-proc-macros)
    Checking libcnb-common v0.22.0 (/Users/rschneeman/Documents/projects/work/libcnb.rs/libcnb-common)
    Checking time v0.3.30
    Checking ahash v0.8.11
    Checking opentelemetry_sdk v0.21.2
error: lint group `pedantic` has the same priority (0) as a lint
  --> Cargo.toml:33:1
   |
33 | pedantic = "warn"
   | ^^^^^^^^   ------ has an implicit priority of 0
34 | unwrap_used = "warn"
   | ----------- has the same priority as this lint
   |
   = note: the order of the lints in the table is ignored by Cargo
   = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#lint_groups_priority
   = note: `#[deny(clippy::lint_groups_priority)]` on by default
help: to have lints override the group set `pedantic` to a lower priority
   |
33 | pedantic = { level = "warn", priority = -1 }
   |            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
```

* Fix clippy lint

```
error: the borrowed expression implements the required traits
  --> libcnb-package/src/package.rs:67:24
   |
67 |         .manifest_path(&buildpack_directory.join("Cargo.toml"))
   |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: change this to: `buildpack_directory.join("Cargo.toml")`
   |
   = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#needless_borrows_for_generic_args
   = note: `-D clippy::needless-borrows-for-generic-args` implied by `-D warnings`
   = help: to override `-D warnings` add `#[allow(clippy::needless_borrows_for_generic_args)]`

error: could not compile `libcnb-package` (lib) due to 1 previous error
warning: build failed, waiting for other jobs to finish...
Error: Process completed with exit code 101.
```
  • Loading branch information
schneems authored Aug 27, 2024
1 parent 3fa2c6c commit 64eeb1c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ unused_crate_dependencies = "warn"

[workspace.lints.clippy]
panic_in_result_fn = "warn"
pedantic = "warn"
# The explicit priority is required due to https://github.com/rust-lang/cargo/issues/13565.
pedantic = { level = "warn", priority = -1 }
unwrap_used = "warn"
# In most cases adding error docs provides little value.
missing_errors_doc = "allow"
Expand Down
2 changes: 1 addition & 1 deletion libcnb-package/src/package.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ fn package_libcnb_buildpack(
destination: &Path,
) -> Result<(), PackageLibcnbBuildpackError> {
let cargo_metadata = MetadataCommand::new()
.manifest_path(&buildpack_directory.join("Cargo.toml"))
.manifest_path(buildpack_directory.join("Cargo.toml"))
.exec()
.map_err(PackageLibcnbBuildpackError::CargoMetadataError)?;

Expand Down

0 comments on commit 64eeb1c

Please sign in to comment.