Skip to content

Commit

Permalink
chore: Enable additional lints
Browse files Browse the repository at this point in the history
  • Loading branch information
VorpalBlade committed Sep 8, 2024
1 parent b1bb1f8 commit 90bf74f
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 4 deletions.
26 changes: 25 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -80,22 +80,46 @@ pretty_assertions = { version = "1.4.0", default-features = false, features = [
tempfile = { version = "3.12.0", default-features = false }

[lints.rust]
rust-2018-idioms = "warn"
elided_lifetimes_in_paths = "warn"
keyword_idents = "warn"
macro_use_extern_crate = "warn"
meta_variable_misuse = "warn"
redundant_lifetimes = "warn"
rust_2018_idioms = "warn"
trivial_casts = "warn"
trivial_numeric_casts = "warn"
unit_bindings = "warn"
unreachable_pub = "warn"
unused_qualifications = "warn"
variant_size_differences = "warn"

[lints.clippy]
assigning_clones = "warn"
cast_lossless = "warn"
cloned_instead_of_copied = "warn"
derive_partial_eq_without_eq = "warn"
doc_markdown = "warn"
equatable_if_let = "warn"
explicit_iter_loop = "warn"
flat_map_option = "warn"
format_push_string = "warn"
ignored_unit_patterns = "warn"
manual_assert = "warn"
manual_let_else = "warn"
manual_string_new = "warn"
needless_pass_by_value = "warn"
or_fun_call = "warn"
ptr_as_ptr = "warn"
redundant_clone = "warn"
redundant_closure_for_method_calls = "warn"
redundant_else = "warn"
semicolon_if_nothing_returned = "warn"
type_repetition_in_bounds = "warn"
undocumented_unsafe_blocks = "warn"
uninlined_format_args = "warn"
unnecessary_box_returns = "warn"
unnecessary_safety_doc = "warn"
unnested_or_patterns = "warn"
unwrap_used = "warn"
use_self = "warn"
wildcard_imports = "warn"
4 changes: 2 additions & 2 deletions src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ pub(crate) fn parse_for_merge(src: &str) -> anyhow::Result<Config<Mutations>> {
}

Ok(Config {
source: source.ok_or(anyhow!("No source directive found"))?,
source: source.ok_or_else(|| anyhow!("No source directive found"))?,
mutations: builder.build()?,
})
}
Expand Down Expand Up @@ -225,7 +225,7 @@ pub(crate) fn parse_for_add(src: &str) -> Result<Config<FilterActions>, anyhow::
}

Ok(Config {
source: source.ok_or(anyhow!("No source directive found"))?,
source: source.ok_or_else(|| anyhow!("No source directive found"))?,
mutations: builder.build()?,
})
}
Expand Down
2 changes: 1 addition & 1 deletion src/doctor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ fn chezmoi_version_override_check(
fn check_has_ignore() -> Result<(CheckResult, String), Box<dyn std::error::Error + Send + Sync>> {
if which::which("chezmoi").is_ok() {
let src_path = RealChezmoi::default().source_root()?;
let mut src_path = src_path.ok_or(anyhow!("No chezmoi source root found"))?;
let mut src_path = src_path.ok_or_else(|| anyhow!("No chezmoi source root found"))?;
src_path.push(".chezmoiignore");
let file = File::open(src_path)?;
let mut reader = BufReader::new(file);
Expand Down

0 comments on commit 90bf74f

Please sign in to comment.