update rust 1.63 & remove clippy TODO

language/documentation/examples/diem-framework/crates/crypto/src/test_utils.rs

@@ -140,7 +140,7 @@ impl ::core::clone::Clone for TestDiemCryptoHasher {
     fn clone(&self) -> TestDiemCryptoHasher {
         match *self {
             TestDiemCryptoHasher(ref __self_0_0) => {
-                TestDiemCryptoHasher(::core::clone::Clone::clone(&(*__self_0_0)))
+                TestDiemCryptoHasher(::core::clone::Clone::clone(__self_0_0))
             }
         }
     }

language/evm/move-to-yul/src/storage.rs

@@ -379,16 +379,16 @@ impl Generator {
         );
 
         // Skip the existence flag and create a pointer.
-        let make_ptr = self.call_builtin_str(
+
+        self.call_builtin_str(
             ctx,
             YulFunction::MakePtr,
             vec![
                 "true".to_string(),
                 format!("add({}, ${{RESOURCE_EXISTS_FLAG_SIZE}})", base_offset),
             ]
             .into_iter(),
-        );
-        make_ptr
+        )
     }
 
     /// Returns an expression for checking whether a resource exists.

language/move-analyzer/src/symbols.rs

@@ -265,7 +265,7 @@ impl fmt::Display for IdentType {
             }
             Self::FunctionType(mod_ident, name, type_args, arg_names, arg_types, ret, acquires) => {
                 let type_args_str = if !type_args.is_empty() {
-                    let mut s = "<".to_string();
+                    let mut s = '<'.to_string();
                     s.push_str(&type_list_to_ide_string(type_args));
                     s.push('>');
                     s

language/move-borrow-graph/src/graph.rs

@@ -12,7 +12,7 @@ use std::collections::{BTreeMap, BTreeSet};
 // Definitions
 //**************************************************************************************************
 
-#[derive(Clone, Debug, Default, PartialEq)]
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
 pub struct BorrowGraph<Loc: Copy, Lbl: Clone + Ord>(BTreeMap<RefID, Ref<Loc, Lbl>>);
 
 //**************************************************************************************************

language/move-bytecode-verifier/src/dependencies.rs

@@ -551,7 +551,7 @@ fn verify_script_visibility_usage(
             }
             _ => continue,
         };
-        match (current_is_entry, script_functions.contains(&fhandle_idx)) {
+        match (current_is_entry, script_functions.contains(fhandle_idx)) {
             (true, true) => (),
             (_, true) => {
                 return Err(PartialVMError::new(

language/move-bytecode-verifier/src/reference_safety/abstract_state.rs

@@ -69,7 +69,7 @@ impl std::fmt::Display for Label {
 }
 
 /// AbstractState is the analysis state over which abstract interpretation is performed.
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub(crate) struct AbstractState {
     current_function: Option<FunctionDefinitionIndex>,
     locals: BTreeMap<LocalIndex, AbstractValue>,

language/move-bytecode-verifier/src/verifier.rs

@@ -16,19 +16,11 @@ use move_binary_format::{
     file_format::{CompiledModule, CompiledScript},
 };
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Default)]
 pub struct VerifierConfig {
     pub max_loop_depth: Option<usize>,
 }
 
-impl Default for VerifierConfig {
-    fn default() -> Self {
-        Self {
-            max_loop_depth: None,
-        }
-    }
-}
-
 /// Helper for a "canonical" verification of a module.
 ///
 /// Clients that rely on verification should call the proper passes

language/move-command-line-common/src/parser.rs

@@ -211,7 +211,7 @@ impl<'a, I: Iterator<Item = (ValueToken, &'a str)>> Parser<'a, ValueToken, I> {
                 let contents = contents
                     .strip_prefix("b\"")
                     .unwrap()
-                    .strip_suffix("\"")
+                    .strip_suffix('\"')
                     .unwrap();
                 ParsedValue::Vector(
                     contents
@@ -226,7 +226,7 @@ impl<'a, I: Iterator<Item = (ValueToken, &'a str)>> Parser<'a, ValueToken, I> {
                 let contents = contents
                     .strip_prefix("x\"")
                     .unwrap()
-                    .strip_suffix("\"")
+                    .strip_suffix('\"')
                     .unwrap()
                     .to_ascii_lowercase();
                 ParsedValue::Vector(

language/move-compiler/src/attr_derivation/mod.rs

@@ -75,7 +75,7 @@ pub fn attr_params(attr: &Attribute) -> Vec<&Attribute> {
 pub fn attr_value(attr: &Attribute) -> Option<(&Name, Option<&AttributeValue>)> {
     match &attr.value {
         Attribute_::Name(n) => Some((n, None)),
-        Attribute_::Assigned(n, v) => Some((n, Some(&*v))),
+        Attribute_::Assigned(n, v) => Some((n, Some(v))),
         _ => None,
     }
 }

language/move-compiler/src/cfgir/ast.rs

@@ -64,7 +64,7 @@ pub struct ModuleDefinition {
 // Constants
 //**************************************************************************************************
 
-#[derive(PartialEq, Debug, Clone)]
+#[derive(PartialEq, Eq, Debug, Clone)]
 pub struct Constant {
     pub attributes: Attributes,
     pub loc: Loc,

language/move-compiler/src/cfgir/borrows/state.rs

@@ -41,7 +41,7 @@ pub enum Value {
 }
 pub type Values = Vec<Value>;
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct BorrowState {
     locals: UniqueMap<Var, Value>,
     acquired_resources: BTreeMap<StructName, Loc>,

language/move-compiler/src/expansion/ast.rs

@@ -144,7 +144,7 @@ pub enum Neighbor {
 
 pub type Fields<T> = UniqueMap<Field, (usize, T)>;
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct StructTypeParameter {
     pub is_phantom: bool,
     pub name: Name,
@@ -170,7 +170,7 @@ pub enum StructFields {
 // Functions
 //**************************************************************************************************
 
-#[derive(PartialEq, Debug, Clone)]
+#[derive(PartialEq, Eq, Debug, Clone)]
 pub enum Visibility {
     Public(Loc),
     Friend(Loc),
@@ -286,7 +286,7 @@ pub enum SpecBlockMember_ {
 }
 pub type SpecBlockMember = Spanned<SpecBlockMember_>;
 
-#[derive(PartialEq, Clone, Debug)]
+#[derive(PartialEq, Eq, Clone, Debug)]
 pub enum SpecConditionKind_ {
     Assert,
     Assume,
@@ -304,14 +304,14 @@ pub enum SpecConditionKind_ {
 }
 pub type SpecConditionKind = Spanned<SpecConditionKind_>;
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct PragmaProperty_ {
     pub name: Name,
     pub value: Option<PragmaValue>,
 }
 pub type PragmaProperty = Spanned<PragmaProperty_>;
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum PragmaValue {
     Literal(Value),
     Ident(ModuleAccess),

language/move-compiler/src/hlir/ast.rs

@@ -66,15 +66,15 @@ pub struct ModuleDefinition {
 // Structs
 //**************************************************************************************************
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub struct StructDefinition {
     pub attributes: Attributes,
     pub abilities: AbilitySet,
     pub type_parameters: Vec<StructTypeParameter>,
     pub fields: StructFields,
 }
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub enum StructFields {
     Defined(Vec<(Field, BaseType)>),
     Native(Loc),
@@ -96,7 +96,7 @@ pub struct Constant {
 // Functions
 //**************************************************************************************************
 
-#[derive(PartialEq, Debug, Clone)]
+#[derive(PartialEq, Eq, Debug, Clone)]
 pub struct FunctionSignature {
     pub type_parameters: Vec<TParam>,
     pub parameters: Vec<(Var, SingleType)>,
@@ -145,14 +145,14 @@ pub enum BaseType_ {
 }
 pub type BaseType = Spanned<BaseType_>;
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub enum SingleType_ {
     Base(BaseType),
     Ref(bool, BaseType),
 }
 pub type SingleType = Spanned<SingleType_>;
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 #[allow(clippy::large_enum_variant)]
 pub enum Type_ {
     Unit,
@@ -238,7 +238,7 @@ pub type LValue = Spanned<LValue_>;
 // Expressions
 //**************************************************************************************************
 
-#[derive(Debug, PartialEq, Clone, Copy)]
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
 pub enum UnitCase {
     Trailing,
     Implicit,
@@ -254,7 +254,7 @@ pub struct ModuleCall {
     pub acquires: BTreeMap<StructName, Loc>,
 }
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub enum BuiltinFunction_ {
     MoveTo(BaseType),
     MoveFrom(BaseType),
@@ -281,7 +281,7 @@ pub enum Value_ {
 }
 pub type Value = Spanned<Value_>;
 
-#[derive(Debug, PartialEq, Clone, Copy)]
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
 pub enum MoveOpAnnotation {
     // 'move' annotated by the user
     FromUser,

language/move-compiler/src/naming/ast.rs

@@ -68,21 +68,21 @@ pub struct ModuleDefinition {
 // Structs
 //**************************************************************************************************
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub struct StructDefinition {
     pub attributes: Attributes,
     pub abilities: AbilitySet,
     pub type_parameters: Vec<StructTypeParameter>,
     pub fields: StructFields,
 }
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub struct StructTypeParameter {
     pub param: TParam,
     pub is_phantom: bool,
 }
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub enum StructFields {
     Defined(Fields<Type>),
     Native(Loc),
@@ -92,7 +92,7 @@ pub enum StructFields {
 // Functions
 //**************************************************************************************************
 
-#[derive(PartialEq, Debug, Clone)]
+#[derive(PartialEq, Eq, Debug, Clone)]
 pub struct FunctionSignature {
     pub type_parameters: Vec<TParam>,
     pub parameters: Vec<(Var, Type)>,
@@ -209,7 +209,7 @@ pub enum ExpDotted_ {
 }
 pub type ExpDotted = Spanned<ExpDotted_>;
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 #[allow(clippy::large_enum_variant)]
 pub enum BuiltinFunction_ {
     MoveTo(Option<Type>),
@@ -1030,7 +1030,7 @@ impl AstDebug for Exp_ {
                 e.ast_debug(w);
             }
             E::DerefBorrow(ed) => {
-                w.write("(&*)");
+                w.write("()");
                 ed.ast_debug(w)
             }
             E::Cast(e, ty) => {

language/move-compiler/src/parser/ast.rs

@@ -201,7 +201,7 @@ new_name!(StructName);
 
 pub type ResourceLoc = Option<Loc>;
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub struct StructTypeParameter {
     pub is_phantom: bool,
     pub name: Name,
@@ -240,7 +240,7 @@ pub struct FunctionSignature {
     pub return_type: Type,
 }
 
-#[derive(PartialEq, Debug, Clone)]
+#[derive(PartialEq, Eq, Debug, Clone)]
 pub enum Visibility {
     Public(Loc),
     Script(Loc),
@@ -312,21 +312,21 @@ pub enum SpecBlockTarget_ {
 
 pub type SpecBlockTarget = Spanned<SpecBlockTarget_>;
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct PragmaProperty_ {
     pub name: Name,
     pub value: Option<PragmaValue>,
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum PragmaValue {
     Literal(Value),
     Ident(NameAccessChain),
 }
 
 pub type PragmaProperty = Spanned<PragmaProperty_>;
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct SpecApplyPattern_ {
     pub visibility: Option<Visibility>,
     pub name_pattern: Vec<SpecApplyFragment>,
@@ -335,7 +335,7 @@ pub struct SpecApplyPattern_ {
 
 pub type SpecApplyPattern = Spanned<SpecApplyPattern_>;
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum SpecApplyFragment_ {
     Wildcard,
     NamePart(Name),
@@ -391,7 +391,7 @@ pub enum SpecBlockMember_ {
 pub type SpecBlockMember = Spanned<SpecBlockMember_>;
 
 // Specification condition kind.
-#[derive(PartialEq, Clone, Debug)]
+#[derive(PartialEq, Eq, Clone, Debug)]
 pub enum SpecConditionKind_ {
     Assert,
     Assume,
@@ -489,14 +489,14 @@ pub enum Value_ {
 }
 pub type Value = Spanned<Value_>;
 
-#[derive(Debug, PartialEq, Copy, Clone)]
+#[derive(Debug, PartialEq, Eq, Copy, Clone)]
 pub enum UnaryOp_ {
     // !
     Not,
 }
 pub type UnaryOp = Spanned<UnaryOp_>;
 
-#[derive(Debug, PartialEq, Copy, Clone)]
+#[derive(Debug, PartialEq, Eq, Copy, Clone)]
 pub enum BinOp_ {
     // Int ops
     // +
@@ -548,7 +548,7 @@ pub enum BinOp_ {
 }
 pub type BinOp = Spanned<BinOp_>;
 
-#[derive(Debug, PartialEq, Copy, Clone)]
+#[derive(Debug, PartialEq, Eq, Copy, Clone)]
 pub enum QuantKind_ {
     Forall,
     Exists,