Skip to content

Commit

Permalink
Fix build for rust 1.80
Browse files Browse the repository at this point in the history
Upgrade "time" (and its dependency chain rooted at "plist"), the previous
version did not build with 1.80.

Tell the new 'unexpected_cfgs' lint that 'tarpaulin_include' is okay

Mark one clippy lint as a false positive
  • Loading branch information
th1000s authored and dandavison committed Aug 2, 2024
1 parent e027486 commit f441d4d
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 26 deletions.
44 changes: 18 additions & 26 deletions Cargo.lock

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

3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ version = "0.29.0"
default-features = false
features = []

[lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tarpaulin_include)'] }

[dev-dependencies]
insta = { version = "1.*", features = ["colors", "filters"] }

Expand Down
1 change: 1 addition & 0 deletions src/utils/path.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ pub fn absolute_path(relative_path: &str, config: &Config) -> Option<PathBuf> {
.map(normalize_path)
}

#[allow(clippy::needless_borrows_for_generic_args)] // Lint has known problems, &path != path
/// Relativize `path` if delta `config` demands that and paths are not already relativized by git.
pub fn relativize_path_maybe(path: &mut String, config: &Config) {
let mut inner_relativize = || -> Option<()> {
Expand Down

0 comments on commit f441d4d

Please sign in to comment.