Fix: nitpicks found by cargo clippy

These all seem to make sense to me.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/steps.rs b/src/steps.rs
index fd13253..3a41a4c 100644
--- a/src/steps.rs
+++ b/src/steps.rs
@@ -20,7 +20,7 @@ impl ScenarioStep {
     /// Construct a new step.
     pub fn new(kind: StepKind, text: &str) -> ScenarioStep {
         ScenarioStep {
-            kind: kind,
+            kind,
             text: text.to_owned(),
         }
     }
@@ -36,14 +36,14 @@ impl ScenarioStep {
     }
 
     /// Construct a step from a line in a scenario.
-    pub fn from_str(text: &str) -> Result<ScenarioStep> {
+    pub fn new_from_str(text: &str) -> Result<ScenarioStep> {
         let mut words = text.split_whitespace();
 
         let kind = match words.next() {
             Some("given") => StepKind::Given,
             Some("when") => StepKind::When,
             Some("then") => StepKind::Then,
-            _ => Err(Error::UnknownStepKind)?,
+            _ => return Err(Error::UnknownStepKind),
         };
 
         let mut joined = String::new();
@@ -76,28 +76,28 @@ mod test {
 
     #[test]
     fn parses_given() {
-        let step = ScenarioStep::from_str("given I am Tomjon").unwrap();
+        let step = ScenarioStep::new_from_str("given I am Tomjon").unwrap();
         assert_eq!(step.kind(), StepKind::Given);
         assert_eq!(step.text(), "I am Tomjon");
     }
 
     #[test]
     fn parses_given_with_extra_spaces() {
-        let step = ScenarioStep::from_str("   given     I   am   Tomjon   ").unwrap();
+        let step = ScenarioStep::new_from_str("   given     I   am   Tomjon   ").unwrap();
         assert_eq!(step.kind(), StepKind::Given);
         assert_eq!(step.text(), "I am Tomjon");
     }
 
     #[test]
     fn parses_when() {
-        let step = ScenarioStep::from_str("when I declare myself king").unwrap();
+        let step = ScenarioStep::new_from_str("when I declare myself king").unwrap();
         assert_eq!(step.kind(), StepKind::When);
         assert_eq!(step.text(), "I declare myself king");
     }
 
     #[test]
     fn parses_then() {
-        let step = ScenarioStep::from_str("then everyone accepts it").unwrap();
+        let step = ScenarioStep::new_from_str("then everyone accepts it").unwrap();
         assert_eq!(step.kind(), StepKind::Then);
         assert_eq!(step.text(), "everyone accepts it");
     }