chore: clean compiler warnings

And some clippy warnings as well...
eigerco · Jan 15, 2024 · 4a048ee · 4a048ee
1 parent 9ec76b5
commit 4a048ee
Show file tree

Hide file tree

Showing 20 changed files with 27 additions and 29 deletions.
diff --git a/language/evm/move-to-yul/src/lib.rs b/language/evm/move-to-yul/src/lib.rs
@@ -89,8 +89,8 @@ pub fn run_to_yul<W: WriteColor>(error_writer: &mut W, mut options: Options) ->
         if let Some(i) = options.output.rfind('.') {
             options.abi_output = format!("{}.abi.json", &options.output[..i]);
         }
-        fs::write(options.output, &content)?;
-        fs::write(options.abi_output, &abi_content)?;
+        fs::write(options.output, content)?;
+        fs::write(options.abi_output, abi_content)?;
     }
     Ok(())
 }

diff --git a/language/move-analyzer/src/symbols.rs b/language/move-analyzer/src/symbols.rs
@@ -523,7 +523,7 @@ impl UseDef {
 
         references
             .entry(def_loc)
-            .or_insert_with(BTreeSet::new)
+            .or_default()
             .insert(use_loc);
         Self {
             col_start: use_start.character,
@@ -560,7 +560,7 @@ impl UseDefMap {
     }
 
     fn insert(&mut self, key: u32, val: UseDef) {
-        self.0.entry(key).or_insert_with(BTreeSet::new).insert(val);
+        self.0.entry(key).or_default().insert(val);
     }
 
     fn get(&self, key: u32) -> Option<BTreeSet<UseDef>> {
@@ -595,7 +595,7 @@ impl Symbols {
         for (k, v) in other.references {
             self.references
                 .entry(k)
-                .or_insert_with(BTreeSet::new)
+                .or_default()
                 .extend(v);
         }
         self.file_use_defs.extend(other.file_use_defs);

diff --git a/language/move-borrow-graph/src/graph.rs b/language/move-borrow-graph/src/graph.rs
@@ -70,7 +70,7 @@ impl<Loc: Copy, Lbl: Clone + Ord> BorrowGraph<Loc, Lbl> {
                     None => full_borrows.insert(borrower, edge.loc),
                     Some(f) => field_borrows
                         .entry(f.clone())
-                        .or_insert_with(BTreeMap::new)
+                        .or_default()
                         .insert(borrower, edge.loc),
                 };
             }

diff --git a/language/move-borrow-graph/src/references.rs b/language/move-borrow-graph/src/references.rs
@@ -212,7 +212,7 @@ impl<Loc: Copy, Lbl: Clone + Ord> Eq for BorrowEdge<Loc, Lbl> {}
 
 impl<Loc: Copy, Lbl: Clone + Ord> PartialOrd for BorrowEdge<Loc, Lbl> {
     fn partial_cmp(&self, other: &BorrowEdge<Loc, Lbl>) -> Option<Ordering> {
-        BorrowEdgeNoLoc::new(self).partial_cmp(&BorrowEdgeNoLoc::new(other))
+        Some(self.cmp(other))
     }
 }
 

diff --git a/language/move-compiler/src/expansion/translate.rs b/language/move-compiler/src/expansion/translate.rs
@@ -414,7 +414,6 @@ fn module_(
             .add_diag(diag!(Declarations::InvalidName, (name.loc(), msg)));
     }
 
-    let name = name;
     let name_loc = name.0.loc;
     let current_module = sp(name_loc, ModuleIdent_::new(*context.cur_address(), name));
 

diff --git a/language/move-compiler/src/parser/lexer.rs b/language/move-compiler/src/parser/lexer.rs
@@ -83,7 +83,7 @@ pub enum Tok {
 }
 
 impl fmt::Display for Tok {
-    fn fmt<'f>(&self, formatter: &mut fmt::Formatter<'f>) -> Result<(), fmt::Error> {
+    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
         use Tok::*;
         let s = match *self {
             EOF => "[end-of-file]",

diff --git a/language/move-compiler/src/shared/unique_set.rs b/language/move-compiler/src/shared/unique_set.rs
@@ -119,7 +119,7 @@ impl<T: TName> Eq for UniqueSet<T> {}
 
 impl<T: TName> PartialOrd for UniqueSet<T> {
     fn partial_cmp(&self, other: &UniqueSet<T>) -> Option<Ordering> {
-        (self.0).0.keys().partial_cmp((other.0).0.keys())
+        Some(self.cmp(other))
     }
 }
 

diff --git a/language/move-compiler/src/typing/recursive_structs.rs b/language/move-compiler/src/typing/recursive_structs.rs
@@ -36,7 +36,7 @@ impl Context {
         }
         self.struct_neighbors
             .entry(self.current_struct.unwrap())
-            .or_insert_with(BTreeMap::new)
+            .or_default()
             .insert(*sname, loc);
     }
 

diff --git a/language/move-core/types/src/gas_algebra.rs b/language/move-core/types/src/gas_algebra.rs
@@ -127,7 +127,7 @@ impl<U> From<GasQuantity<U>> for u64 {
  **************************************************************************************************/
 impl<U> Clone for GasQuantity<U> {
     fn clone(&self) -> Self {
-        Self::new(self.val)
+        *self
     }
 }
 
@@ -169,7 +169,7 @@ impl<U> Eq for GasQuantity<U> {}
 
 impl<U> PartialOrd for GasQuantity<U> {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp_impl(other))
+        Some(self.cmp(other))
     }
 }
 

diff --git a/language/move-model/src/builder/exp_translator.rs b/language/move-model/src/builder/exp_translator.rs
@@ -87,7 +87,7 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
             node_counter_start,
             accessed_locals: BTreeSet::new(),
             outer_context_scopes: 0,
-            /// Following flags used to translate pure Move functions.
+            // Following flags are used to translate pure Move functions.
             translating_fun_as_spec_fun: false,
             errors_generated: RefCell::new(false),
             called_spec_funs: BTreeSet::new(),

diff --git a/language/move-prover/boogie-backend/src/boogie_wrapper.rs b/language/move-prover/boogie-backend/src/boogie_wrapper.rs
@@ -867,7 +867,7 @@ fn create_domain_map(
     let mut default_domain = None;
 
     let mut insert_map = |elems: &Vec<ModelValue>, val: &ModelValue| -> Option<()> {
-        map.entry(elems[0].clone()).or_insert_with(BTreeMap::new);
+        map.entry(elems[0].clone()).or_default();
         map.get_mut(&elems[0])
             .unwrap()
             .insert(elems[1].extract_number()?, extract_bool(val)?);

diff --git a/language/move-prover/bytecode/src/verification_analysis.rs b/language/move-prover/bytecode/src/verification_analysis.rs
@@ -371,7 +371,7 @@ impl VerificationAnalysisProcessor {
         targets: &mut FunctionTargetsHolder,
     ) {
         // TODO(mengxu): re-check the treatment of fixedpoint here
-        let mut info = data
+        let info = data
             .annotations
             .get_or_default_mut::<VerificationInfo>(true);
         if !info.verified {

diff --git a/language/move-prover/bytecode/src/verification_analysis_v2.rs b/language/move-prover/bytecode/src/verification_analysis_v2.rs
@@ -738,7 +738,7 @@ fn mark_verified(
     // The user can override with `pragma verify = false`, so respect this.
     let options = ProverOptions::get(fun_env.module_env.env);
     if !actual_env.is_explicitly_not_verified(&options.verify_scope) {
-        let mut info = targets
+        let info = targets
             .get_data_mut(&actual_env.get_qualified_id(), &variant)
             .expect("function data available")
             .annotations

diff --git a/language/move-prover/interpreter/src/concrete/value.rs b/language/move-prover/interpreter/src/concrete/value.rs
@@ -1181,7 +1181,7 @@ impl GlobalState {
         self.touched_addresses.insert(addr);
         self.accounts
             .entry(addr)
-            .or_insert_with(AccountState::default)
+            .or_default()
             .put_resource(&key, object.val)
             .map(|val| TypedValue {
                 ty: Type::mk_struct(key),
@@ -1202,7 +1202,7 @@ impl GlobalState {
         let res = self
             .events
             .entry(guid)
-            .or_insert_with(BTreeMap::new)
+            .or_default()
             .insert(seq, msg);
         if cfg!(debug_assertions) {
             assert!(res.is_none());
@@ -1308,7 +1308,7 @@ impl EvalState {
         self.saved_memory
             .entry(label)
             .and_modify(|per_label_map| per_label_map.clear())
-            .or_insert_with(BTreeMap::new)
+            .or_default()
             .insert(partial_inst.ident, per_struct_map);
     }
 

diff --git a/language/move-stdlib/src/main.rs b/language/move-stdlib/src/main.rs
@@ -8,18 +8,18 @@ fn main() {
     // Generate documentation
     {
         time_it("Generating stdlib documentation", || {
-            std::fs::remove_dir_all(&move_stdlib::doc::move_stdlib_docs_full_path()).unwrap_or(());
+            std::fs::remove_dir_all(move_stdlib::doc::move_stdlib_docs_full_path()).unwrap_or(());
             //std::fs::create_dir_all(&move_stdlib::move_stdlib_docs_full_path()).unwrap();
             move_stdlib::doc::build_stdlib_doc(&move_stdlib::doc::move_stdlib_docs_full_path());
         });
 
         time_it("Generating nursery documentation", || {
-            std::fs::remove_dir_all(&move_stdlib::doc::move_nursery_docs_full_path()).unwrap_or(());
+            std::fs::remove_dir_all(move_stdlib::doc::move_nursery_docs_full_path()).unwrap_or(());
             move_stdlib::doc::build_nursery_doc(&move_stdlib::doc::move_nursery_docs_full_path());
         });
 
         time_it("Generating error explanations", || {
-            std::fs::remove_file(&move_stdlib::doc::move_stdlib_errmap_full_path()).unwrap_or(());
+            std::fs::remove_file(move_stdlib::doc::move_stdlib_errmap_full_path()).unwrap_or(());
             move_stdlib::doc::build_error_code_map(
                 &move_stdlib::doc::move_stdlib_errmap_full_path(),
             );

diff --git a/language/move-stdlib/src/natives/debug.rs b/language/move-stdlib/src/natives/debug.rs
@@ -444,7 +444,7 @@ mod testing {
                 // If this is a vector<u8> we print it in hex (as most users would expect us to)
                 if is_non_empty_vector_u8(&vec) {
                     let bytes = MoveValue::vec_to_vec_u8(vec).map_err(to_vec_u8_type_err)?;
-                    write!(out, "0x{}", hex::encode(&bytes))
+                    write!(out, "0x{}", hex::encode(bytes))
                         .map_err(fmt_error_to_partial_vm_error)?;
                 } else {
                     let is_complex_inner_type =

diff --git a/language/tools/move-cli/src/lib.rs b/language/tools/move-cli/src/lib.rs
@@ -125,10 +125,10 @@ pub fn run_cli(
             natives,
             cost_table,
             error_descriptions,
-            &move_args,
+            move_args,
             &storage_dir,
         ),
-        Command::Experimental { storage_dir, cmd } => cmd.handle_command(&move_args, &storage_dir),
+        Command::Experimental { storage_dir, cmd } => cmd.handle_command(move_args, &storage_dir),
     }
 }
 

diff --git a/language/tools/move-cli/src/sandbox/utils/mod.rs b/language/tools/move-cli/src/sandbox/utils/mod.rs
@@ -2,7 +2,6 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::sandbox::utils::on_disk_state_view::OnDiskStateView;
 use anyhow::{bail, Result};
 use colored::Colorize;
 use difference::{Changeset, Difference};

diff --git a/language/tools/move-cli/src/sandbox/utils/on_disk_state_view.rs b/language/tools/move-cli/src/sandbox/utils/on_disk_state_view.rs
@@ -321,7 +321,7 @@ impl OnDiskStateView {
             event_type,
             event_data,
         ));
-        Ok(fs::write(path, &bcs::to_bytes(&event_log)?)?)
+        Ok(fs::write(path, bcs::to_bytes(&event_log)?)?)
     }
 
     /// Save `module` on disk under the path `module.address()`/`module.name()`

diff --git a/language/tools/move-unit-test/src/lib.rs b/language/tools/move-unit-test/src/lib.rs
@@ -210,7 +210,7 @@ impl UnitTestingConfig {
 
         let mut test_plan = self.compile_to_test_plan(self.source_files.clone(), deps)?;
         test_plan.module_info.extend(module_info.into_iter());
-        test_plan.files.extend(files.into_iter());
+        test_plan.files.extend(files);
         Some(test_plan)
     }