Fix clippy and update dependencies (#180)

* Fix clippy warnings
* Update dependencies

Author: barafael

mutagen-core/Cargo.toml

@@ -6,15 +6,15 @@ edition = "2018"
 license = "Apache-2.0/MIT"
 
 [dependencies]
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-failure = "0.1"
-json = "0.12"
-lazy_static = "1.3.0"
+serde = { version = "1.0.130", features = ["derive"] }
+serde_json = "1.0.68"
+failure = "0.1.8"
+json = "0.12.4"
+lazy_static = "1.4.0"
 
-quote = "1.0.2"
-proc-macro2 = { version = "1.0.1", features = ["span-locations"] }
-syn = { version = "1.0.3", features = ["full", "extra-traits", "fold"] }
+quote = "1.0.9"
+proc-macro2 = { version = "1.0.29", features = ["span-locations"] }
+syn = { version = "1.0.76", features = ["full", "extra-traits", "fold"] }
 
 
 [features]

mutagen-core/src/comm/coverage.rs

@@ -61,11 +61,9 @@ impl CoverageCollection {
 
         for c in coverages {
             for m_id in 1..=num_mutations {
-                if c.is_covered(m_id) {
-                    if !coverage[m_id] {
-                        num_covered += 1;
-                        coverage[m_id] = true;
-                    }
+                if c.is_covered(m_id) && !coverage[m_id] {
+                    num_covered += 1;
+                    coverage[m_id] = true;
                 }
             }
         }

mutagen-core/src/comm/mutation.rs

@@ -107,7 +107,7 @@ impl BakedMutation {
 
     pub fn fn_name(&self) -> Option<&str> {
         // TODO: use Option::deref instead
-        self.mutation.fn_name.as_ref().map(String::deref)
+        self.mutation.fn_name.as_deref()
     }
 
     pub fn original_code(&self) -> &str {

mutagen-core/src/comm/report.rs

@@ -40,10 +40,12 @@ impl MutagenReport {
         let mut map = BTreeMap::new();
         // collect mutations by source file
         for (m, s) in &self.mutant_results {
-            map.entry(m.source_file()).or_insert(vec![]).push((m, *s));
+            map.entry(m.source_file())
+                .or_insert_with(Vec::new)
+                .push((m, *s));
         }
         // sort list of mutations per source file by id
-        for (_, ms) in &mut map {
+        for ms in map.values_mut() {
             ms.sort_unstable_by_key(|(m, _)| m.id());
         }
         map

mutagen-core/src/mutator/mutator_binop_bit.rs

@@ -129,7 +129,7 @@ impl MutationBinopBit {
 
     fn to_mutation(self, original_expr: &ExprBinopBit, context: &TransformContext) -> Mutation {
         Mutation::new_spanned(
-            &context,
+            context,
             "binop_bit".to_owned(),
             format!("{}", original_expr.op),
             format!("{}", self.op),

mutagen-core/src/mutator/mutator_binop_bool.rs

@@ -81,7 +81,7 @@ impl MutationBinopBool {
 
     fn to_mutation(self, original_op: &ExprBinopBool, context: &TransformContext) -> Mutation {
         Mutation::new_spanned(
-            &context,
+            context,
             "binop_bool".to_owned(),
             format!("{}", original_op),
             format!("{}", self.op),

mutagen-core/src/mutator/mutator_binop_cmp.rs

@@ -83,7 +83,7 @@ impl MutationBinopCmp {
 
     fn to_mutation(self, original_op: &ExprBinopCmp, context: &TransformContext) -> Mutation {
         Mutation::new_spanned(
-            &context,
+            context,
             "binop_cmp".to_owned(),
             format!("{}", original_op.op),
             format!("{}", self.op),

mutagen-core/src/mutator/mutator_binop_eq.rs

@@ -83,7 +83,7 @@ impl MutationBinopEq {
 
     fn to_mutation(self, original_op: &ExprBinopEq, context: &TransformContext) -> Mutation {
         Mutation::new_spanned(
-            &context,
+            context,
             "binop_eq".to_owned(),
             format!("{}", original_op.op),
             format!("{}", self.op),

mutagen-core/src/mutator/mutator_binop_num.rs

@@ -127,7 +127,7 @@ impl MutationBinopNum {
 
     fn to_mutation(self, original_expr: &ExprBinopNum, context: &TransformContext) -> Mutation {
         Mutation::new_spanned(
-            &context,
+            context,
             "binop_num".to_owned(),
             format!("{}", original_expr.op),
             format!("{}", self.op),

mutagen-core/src/mutator/mutator_lit_bool.rs

@@ -37,7 +37,7 @@ pub fn transform(
     };
 
     let mutator_id = transform_info.add_mutation(Mutation::new_spanned(
-        &context,
+        context,
         "lit_bool".to_owned(),
         format!("{:?}", e.value),
         format!("{:?}", !e.value),

mutagen-core/src/mutator/mutator_lit_int.rs

@@ -79,7 +79,7 @@ impl MutationLitInt {
 
     fn to_mutation(self, original_lit: &ExprLitInt, context: &TransformContext) -> Mutation {
         Mutation::new_spanned(
-            &context,
+            context,
             "lit_int".to_owned(),
             format!("{}", original_lit.value),
             format!("{}", self.mutate::<u128>(original_lit.value)),

mutagen-core/src/mutator/mutator_stmt_call.rs

@@ -32,16 +32,13 @@ pub fn transform(
     };
 
     let mutator_id = transform_info.add_mutation(Mutation::new_spanned(
-        &context,
+        context,
         "stmt_call".to_owned(),
-        format!(
-            "{}",
-            context
-                .original_stmt
-                .to_token_stream()
-                .to_string()
-                .replace("\n", " ")
-        ),
+        context
+            .original_stmt
+            .to_token_stream()
+            .to_string()
+            .replace("\n", " "),
         "".to_owned(),
         s.span,
     ));
@@ -80,7 +77,7 @@ impl TryFrom<Stmt> for StmtCall {
                 span: call.span(),
                 call: call.into_token_stream(),
             }),
-            _ => return Err(stmt),
+            _ => Err(stmt),
         }
     }
 }
@@ -104,7 +101,7 @@ impl<T> StmtCallToNone for T {
 }
 
 impl StmtCallToNone for () {
-    fn stmt_call_to_none() -> () {}
+    fn stmt_call_to_none() {}
 }
 
 pub fn stmt_call_to_none<T: StmtCallToNone>() -> T {

mutagen-core/src/mutator/mutator_unop_not.rs

@@ -39,7 +39,7 @@ pub fn transform(
     };
 
     let mutator_id = transform_info.add_mutation(Mutation::new_spanned(
-        &context,
+        context,
         "unop_not".to_owned(),
         "!".to_owned(),
         "".to_owned(),

mutagen-core/src/runtime_config.rs

@@ -65,7 +65,9 @@ impl MutagenRuntimeConfig {
     #[cfg_attr(any(test, feature = "self_test"), allow(dead_code))]
     // private fn `from_env` is not used when during test (cfg-switch in RUNTIME_CONFIG)
     fn from_env() -> Self {
-        let mode = std::env::var("MUTAGEN_MODE").ok().unwrap_or("".to_owned());
+        let mode = std::env::var("MUTAGEN_MODE")
+            .ok()
+            .unwrap_or_else(|| "".to_owned());
         match &*mode {
             "coverage" => {
                 let num_mutations = std::env::var("MUTAGEN_NUM_MUTATIONS")
@@ -201,18 +203,18 @@ mod test_tools {
         /// sets the global `mutation_id` correctly before running the test and runs tests sequentially.
         ///
         /// The lock is required to ensure that set `mutation_id` is valid for the complete duration of the test case.
-        fn test_with_runtime<F: FnOnce() -> ()>(self, testcase: F) {
+        fn test_with_runtime<F: FnOnce()>(self, testcase: F) {
             let lock = TEST_LOCK.lock();
             *RUNTIME_CONFIG.write().unwrap() = self;
             testcase();
             drop(lock); // drop here to show the extended lifetime of lock guard
         }
 
-        pub fn test_without_mutation<F: FnOnce() -> ()>(testcase: F) {
+        pub fn test_without_mutation<F: FnOnce()>(testcase: F) {
             Self::test_with_runtime(Self::without_mutation(), testcase)
         }
 
-        pub fn test_with_mutation_id<F: FnOnce() -> ()>(mutation_id: usize, testcase: F) {
+        pub fn test_with_mutation_id<F: FnOnce()>(mutation_id: usize, testcase: F) {
             Self::test_with_runtime(Self::with_mutation_id(mutation_id), testcase)
         }
 

mutagen-core/src/transformer.rs

@@ -14,9 +14,9 @@ use transform_info::SharedTransformInfo;
 pub fn do_transform_item(args: TokenStream, input: TokenStream) -> TokenStream {
     let input = match syn::parse2::<syn::Item>(input) {
         Ok(ast) => ast,
-        Err(e) => return TokenStream::from(e.to_compile_error()),
+        Err(e) => return e.to_compile_error(),
     };
-    MutagenTransformerBundle::setup_from_attr(args.into()).mutagen_process_item(input)
+    MutagenTransformerBundle::setup_from_attr(args).mutagen_process_item(input)
 }
 
 pub enum MutagenTransformer {

mutagen-core/src/transformer/arg_ast.rs

@@ -81,7 +81,7 @@ impl ArgAst {
         tt_iter: &mut impl Iterator<Item = TokenTree>,
     ) -> Result<Self, ()> {
         match tt_iter.next() {
-            None => return Ok(Self::new_fn(name, ArgAstList(vec![]))),
+            None => Ok(Self::new_fn(name, ArgAstList(vec![]))),
 
             // parse fn-variant
             Some(TokenTree::Group(g)) => {
@@ -90,7 +90,7 @@ impl ArgAst {
                 }
                 let args = ArgAstList::parse_list(g.stream())?;
                 tt_expect_comma_or_end(tt_iter)?;
-                return Ok(Self::new_fn(name, args));
+                Ok(Self::new_fn(name, args))
             }
 
             // parse eq-variant
@@ -113,9 +113,9 @@ impl ArgAst {
 
                 // parse value, only allow ArgFn values.
                 let val = Self::parse_single(next, tt_iter)?.expect_fn()?;
-                return Ok(Self::new_eq(name, val));
+                Ok(Self::new_eq(name, val))
             }
-            _ => return Err(()),
+            _ => Err(()),
         }
     }
 

mutagen-core/src/transformer/mutate_args.rs

@@ -49,7 +49,7 @@ impl ArgOptions {
 
         let ast = ArgAstList::parse_list(args)?;
         if let Some(conf) = ast.find_named_arg("conf")? {
-            options.conf = Conf::parse(&conf)?;
+            options.conf = Conf::parse(conf)?;
         }
         if let Some(transformers_arg) = ast.find_named_arg("mutators")? {
             match &*transformers_arg.name {

mutagen-runner/Cargo.toml

@@ -6,14 +6,14 @@ edition = "2018"
 license = "Apache-2.0/MIT"
 
 [dependencies]
-json = "0.12"
-failure = "0.1"
+json = "0.12.4"
+failure = "0.1.8"
 wait-timeout = "0.2.0"
-serde_json = "1.0"
+serde_json = "1.0.68"
 mutagen-core = { path = "../mutagen-core"}
-console = "0.14.0"
-humantime = "2.0.0"
-structopt = "0.3"
+console = "0.14.1"
+humantime = "2.1.0"
+structopt = "0.3.23"
 
 [badges]
 travis-ci = { repository = "llogiq/mutagen", branch = "master" }

mutagen-runner/src/main.rs

@@ -70,7 +70,7 @@ fn run() -> Fallible<()> {
     let test_bins = test_bins
         .iter()
         .enumerate()
-        .map(|(i, e)| TestBin::new(&e, i))
+        .map(|(i, e)| TestBin::new(e, i))
         .filter_map(|bin| {
             bin.run_test(&mut progress, &mutations)
                 .map(|bin| Some(bin).filter(|bin| bin.coveres_any_mutation()))

mutagen-runner/src/progress.rs

@@ -133,7 +133,7 @@ impl Progress {
             let bar = ProgressBarState {
                 action: "Test Mutants",
                 current: self.tested_mutations,
-                action_details: action_details,
+                action_details,
             };
             self.bar.set_state(bar)?;
         }

mutagen-runner/src/progress_bar.rs

@@ -109,7 +109,7 @@ impl ProgressBar {
 
     /// clears the progress bar
     pub fn clear_bar(&mut self) -> Fallible<()> {
-        if let Some(_) = self.current_bar_state.take() {
+        if self.current_bar_state.take().is_some() {
             self.term.clear_line()?;
         }
         Ok(())

mutagen-runner/src/test_bin.rs

@@ -40,7 +40,7 @@ impl<'a> TestBin<'a> {
         let num_mutations = mutations.len();
         let test_start = Instant::now();
 
-        progress.start_testsuite_unmutated(&self.bin_path, self.id)?;
+        progress.start_testsuite_unmutated(self.bin_path, self.id)?;
 
         ::std::io::stdout().flush()?;
 
@@ -71,7 +71,7 @@ impl<'a> TestBin<'a> {
                 // delete coverage file after the execution of this testsuite
                 fs::remove_file(coverage_file)?;
 
-                CoverageCollection::from_coverage_hits(num_mutations, &coverage_hits, &mutations)
+                CoverageCollection::from_coverage_hits(num_mutations, &coverage_hits, mutations)
             }
         };
 

mutagen-transform/Cargo.toml

@@ -7,7 +7,7 @@ license = "Apache-2.0/MIT"
 
 [dependencies]
 mutagen-core = { path = "../mutagen-core" }
-proc-macro2 = "1.0.1"
+proc-macro2 = "1.0.29"
 
 [lib]
 proc_macro = true