From 4f45f6b9044527ac6f0542c2fc412b1b7eb7ae02 Mon Sep 17 00:00:00 2001 From: tyranron Date: Mon, 21 Oct 2024 15:50:49 +0200 Subject: [PATCH] Tune lints for 1.82 Rust --- CHANGELOG.md | 4 ++-- codegen/CHANGELOG.md | 4 ++-- codegen/src/lib.rs | 3 +++ src/lib.rs | 3 +++ src/parser/basic.rs | 3 +-- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d308d403..f9e52dad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,10 +13,10 @@ All user visible changes to `cucumber` crate will be documented in this file. Th ### BC Breaks -- Bumped up [MSRV] to 1.81 to get rid of `once_cell` crate and for `#[expect]` attribute usage. ([4010c1ad], [todo]) +- Bumped up [MSRV] to 1.81 to get rid of `once_cell` crate and for `#[expect]` attribute usage. ([4010c1ad], [f1307038]) [4010c1ad]: /../../commit/4010c1ad6a53d6b7f0b28cefea73c8c13e880e9f -[todo]: /../../commit/todo-full +[f1307038]: /../../commit/f1307038cb6b1e38c1cc259a0e09fb583033d0cf diff --git a/codegen/CHANGELOG.md b/codegen/CHANGELOG.md index b398fbde..741ed862 100644 --- a/codegen/CHANGELOG.md +++ b/codegen/CHANGELOG.md @@ -13,10 +13,10 @@ All user visible changes to `cucumber-codegen` crate will be documented in this ### BC Breaks -- Bumped up [MSRV] to 1.81 to get rid of `once_cell` crate and for `#[expect]` attribute usage. ([4010c1ad], [todo]) +- Bumped up [MSRV] to 1.81 to get rid of `once_cell` crate and for `#[expect]` attribute usage. ([4010c1ad], [f1307038]) [4010c1ad]: /../../commit/4010c1ad6a53d6b7f0b28cefea73c8c13e880e9f -[todo]: /../../commit/todo-full +[f1307038]: /../../commit/f1307038cb6b1e38c1cc259a0e09fb583033d0cf diff --git a/codegen/src/lib.rs b/codegen/src/lib.rs index bc16f632..101b9842 100644 --- a/codegen/src/lib.rs +++ b/codegen/src/lib.rs @@ -86,6 +86,7 @@ clippy::or_fun_call, clippy::panic_in_result_fn, clippy::partial_pub_fields, + clippy::pathbuf_init_then_push, clippy::pedantic, clippy::print_stderr, clippy::print_stdout, @@ -116,6 +117,7 @@ clippy::suspicious_xor_used_as_pow, clippy::tests_outside_test_module, clippy::todo, + clippy::too_long_first_doc_paragraph, clippy::trailing_empty_array, clippy::transmute_undefined_repr, clippy::trivial_regex, @@ -129,6 +131,7 @@ clippy::unnecessary_struct_initialization, clippy::unneeded_field_pattern, clippy::unused_peekable, + clippy::unused_result_ok, clippy::unwrap_in_result, clippy::unwrap_used, clippy::use_debug, diff --git a/src/lib.rs b/src/lib.rs index abe4da1b..5dcf0e24 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -87,6 +87,7 @@ clippy::or_fun_call, clippy::panic_in_result_fn, clippy::partial_pub_fields, + clippy::pathbuf_init_then_push, clippy::pedantic, clippy::print_stderr, clippy::print_stdout, @@ -117,6 +118,7 @@ clippy::suspicious_xor_used_as_pow, clippy::tests_outside_test_module, clippy::todo, + clippy::too_long_first_doc_paragraph, clippy::trailing_empty_array, clippy::transmute_undefined_repr, clippy::trivial_regex, @@ -130,6 +132,7 @@ clippy::unnecessary_struct_initialization, clippy::unneeded_field_pattern, clippy::unused_peekable, + clippy::unused_result_ok, clippy::unwrap_in_result, clippy::unwrap_used, clippy::use_debug, diff --git a/src/parser/basic.rs b/src/parser/basic.rs index c88f14c6..ebbdb6f9 100644 --- a/src/parser/basic.rs +++ b/src/parser/basic.rs @@ -81,8 +81,7 @@ impl> Parser for Basic { let path = input.as_ref(); path.canonicalize() .or_else(|_| { - let mut buf = PathBuf::from(env!("CARGO_MANIFEST_DIR")); - buf.push( + let buf = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join( path.strip_prefix("/") .or_else(|_| path.strip_prefix("./")) .unwrap_or(path),