Tune lints for 1.78 Rust

codegen/src/lib.rs

@@ -64,6 +64,7 @@
     clippy::large_stack_frames,
     clippy::let_underscore_untyped,
     clippy::lossy_float_literal,
+    clippy::manual_c_str_literals,
     clippy::manual_clamp,
     clippy::map_err_ignore,
     clippy::mem_forget,
@@ -87,6 +88,7 @@
     clippy::print_stderr,
     clippy::print_stdout,
     clippy::pub_without_shorthand,
+    clippy::ref_as_ptr,
     clippy::rc_buffer,
     clippy::rc_mutex,
     clippy::read_zero_byte_vec,

src/lib.rs

@@ -65,6 +65,7 @@
     clippy::large_stack_frames,
     clippy::let_underscore_untyped,
     clippy::lossy_float_literal,
+    clippy::manual_c_str_literals,
     clippy::manual_clamp,
     clippy::map_err_ignore,
     clippy::mem_forget,
@@ -88,6 +89,7 @@
     clippy::print_stderr,
     clippy::print_stdout,
     clippy::pub_without_shorthand,
+    clippy::ref_as_ptr,
     clippy::rc_buffer,
     clippy::rc_mutex,
     clippy::read_zero_byte_vec,

src/runner/basic.rs

@@ -2275,14 +2275,7 @@ impl Features {
             }
         }
 
-        if without_retries.get(&ScenarioType::Serial).is_none() {
-            // If there are no Serial Scenarios, we just extend already existing
-            // Concurrent Scenarios.
-            #[allow(clippy::iter_over_hash_type)] // order doesn't matter here
-            for (which, values) in without_retries {
-                storage.entry(which).or_default().extend(values);
-            }
-        } else {
+        if without_retries.contains_key(&ScenarioType::Serial) {
             // If there are Serial Scenarios we insert all Serial and Concurrent
             // Scenarios in front.
             // This is done to execute them closely to one another, so the
@@ -2293,6 +2286,13 @@ impl Features {
                 values.extend(old);
                 storage.entry(which).or_default().extend(values);
             }
+        } else {
+            // If there are no Serial Scenarios, we just extend already existing
+            // Concurrent Scenarios.
+            #[allow(clippy::iter_over_hash_type)] // order doesn't matter here
+            for (which, values) in without_retries {
+                storage.entry(which).or_default().extend(values);
+            }
         }
     }
 

src/writer/json.rs

@@ -82,7 +82,7 @@ impl<W: World + Debug, Out: io::Write> Writer<W> for Json<Out> {
     ) {
         use event::{Cucumber, Rule};
 
-        match event.map(event::Event::split) {
+        match event.map(Event::split) {
             Err(parser::Error::Parsing(e)) => {
                 let feature = Feature::parsing_err(&e);
                 self.features.push(feature);

src/writer/libtest.rs

@@ -266,8 +266,8 @@ impl<W: Debug + World> Libtest<W, io::Stdout> {
     pub fn or<AnotherWriter: Writer<W>>(
         writer: AnotherWriter,
     ) -> Or<W, AnotherWriter> {
-        writer::Or::new(writer, Self::stdout(), |_, cli| {
-            !matches!(cli.right.format, Some(writer::libtest::Format::Json))
+        Or::new(writer, Self::stdout(), |_, cli| {
+            !matches!(cli.right.format, Some(Format::Json))
         })
     }